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
This commit is contained in:
yenatch 2014-09-20 00:57:27 -04:00
commit dff0cdeb5a
224 changed files with 15213 additions and 4665 deletions

View file

@ -5,11 +5,11 @@ FarCopyData::
push af
ld a, [wBuffer]
ld [H_LOADEDROMBANK], a
ld [MBC3RomBank], a
ld [MBC1RomBank], a
call CopyData
pop af
ld [H_LOADEDROMBANK], a
ld [MBC3RomBank], a
ld [MBC1RomBank], a
ret
CopyData::