diff options
Diffstat (limited to 'engine/menus/intro_menu.asm')
| -rw-r--r-- | engine/menus/intro_menu.asm | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/engine/menus/intro_menu.asm b/engine/menus/intro_menu.asm index 2155bdc3..9b744f72 100644 --- a/engine/menus/intro_menu.asm +++ b/engine/menus/intro_menu.asm @@ -87,12 +87,13 @@ _ResetWRAM: ld [wRoamMon2MapNumber], a ld [wRoamMon3MapNumber], a - ld a, BANK(sMysteryGiftItem) + ld a, BANK(sMysteryGiftItem) ; aka BANK(sMysteryGiftUnlocked) call OpenSRAM ld hl, sMysteryGiftItem xor a ld [hli], a - dec a + assert sMysteryGiftItem + 1 == sMysteryGiftUnlocked + dec a ; -1 ld [hl], a call CloseSRAM @@ -280,7 +281,7 @@ Continue: ld c, 20 call DelayFrames farcall JumpRoamMons - farcall MysteryGift_CopyReceivedDecosToPC + farcall CopyMysteryGiftReceivedDecorationsToPC farcall ClockContinue ld a, [wSpawnAfterChampion] cp SPAWN_LANCE @@ -343,8 +344,8 @@ FinishContinueFunction: .loop xor a ld [wDontPlayMapMusicOnReload], a - ld hl, wGameTimerPause - set GAMETIMERPAUSE_TIMER_PAUSED_F, [hl] + ld hl, wGameTimerPaused + set GAME_TIMER_PAUSED_F, [hl] farcall OverworldLoop ld a, [wSpawnAfterChampion] cp SPAWN_RED |