diff options
| author | yenatch <yenatch@gmail.com> | 2014-09-20 00:57:27 -0400 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2014-09-20 00:57:27 -0400 |
| commit | dff0cdeb5a2f901dc8d1a05847d09d7faf1654ad (patch) | |
| tree | 3618582f76f4183b6bc22c5d4743b6d171d11128 /engine/HoF_room_pc.asm | |
| parent | 1185d69819af3493fe8ace9f576fee4b420db55e (diff) | |
| parent | 2ed65d9c3e3ba60939ebe2928ffddc06a90b1876 (diff) | |
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
Diffstat (limited to 'engine/HoF_room_pc.asm')
| -rwxr-xr-x | engine/HoF_room_pc.asm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/engine/HoF_room_pc.asm b/engine/HoF_room_pc.asm index 16a3c3f9..4eec7377 100755 --- a/engine/HoF_room_pc.asm +++ b/engine/HoF_room_pc.asm @@ -92,7 +92,7 @@ DisplayCreditsMon: ; 740cb (1d:40cb) dec c jr nz,.next2 xor a - ld [$FFB0],a + ld [hVBlankWY],a ld a,$C0 ld [$FF47],a ret |