diff options
| author | U-Fish-PC\Daniel <corrnondacqb@yahoo.com> | 2014-05-19 10:38:20 -0400 |
|---|---|---|
| committer | U-Fish-PC\Daniel <corrnondacqb@yahoo.com> | 2014-05-19 16:05:19 -0400 |
| commit | 1a0992a2f16ba2026c7fbf9fcfd1576a0f81c329 (patch) | |
| tree | 0981af81f93d33b07cbfe47674d87ae4aa2d46b0 /scripts/halloffameroom.asm | |
| parent | 82ffb336a975fe8cf9c3953fc380339feaae65b3 (diff) | |
| parent | d218d1972a9be5b9d0025a17842239e1fbf5b622 (diff) | |
Merge branch 'master' of https://github.com/huderlem/pokered into pull-data
Conflicts:
main.asm
text.asm
text/maps/route_22.asm
Diffstat (limited to 'scripts/halloffameroom.asm')
| -rwxr-xr-x | scripts/halloffameroom.asm | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/scripts/halloffameroom.asm b/scripts/halloffameroom.asm index 25a59a36..962fa643 100755 --- a/scripts/halloffameroom.asm +++ b/scripts/halloffameroom.asm @@ -48,14 +48,12 @@ HallofFameRoomScript2: ; 5a4bb (16:64bb) ld [hl], a xor a ld [W_HALLOFFAMEROOMCURSCRIPT], a - ld a, $0 - ld [$d719], a - ld b, BANK(SaveSAVtoSRAM) - ld hl, SaveSAVtoSRAM - call Bankswitch - ld b, $5 + ld a, PALLET_TOWN + ld [wLastBlackoutMap], a + callba SaveSAVtoSRAM + ld b, 5 .asm_5a4ff - ld c, $78 + ld c, 600 / 5 call DelayFrames dec b jr nz, .asm_5a4ff ; 0x5a505 $f8 |