Commit graph

2 commits

Author SHA1 Message Date
yenatch dff0cdeb5a Merge remote-tracking branch 'YamaArashi/master'
Conflicts:
	constants/misc_constants.asm
	engine/battle/core.asm
	engine/menu/pokedex.asm
	engine/town_map.asm
	home.asm
	hram.asm
2014-09-20 00:57:27 -04:00
yenatch cf399a8c86 Split copy and serial functions out of home.asm. 2014-08-12 00:01:04 -07:00