diff options
Diffstat (limited to 'engine/menu')
| -rw-r--r-- | engine/menu/link_menu.asm | 2 | ||||
| -rwxr-xr-x | engine/menu/main_menu.asm | 8 | ||||
| -rwxr-xr-x | engine/menu/naming_screen.asm | 2 | ||||
| -rwxr-xr-x | engine/menu/start_sub_menus.asm | 6 |
4 files changed, 9 insertions, 9 deletions
diff --git a/engine/menu/link_menu.asm b/engine/menu/link_menu.asm index becefd47..4d0beb7e 100644 --- a/engine/menu/link_menu.asm +++ b/engine/menu/link_menu.asm @@ -776,7 +776,7 @@ LinkMenu: ; f580c (3d:580c) call DelayFrames ld hl, wd732 res 1, [hl] - ld a, [wAnimationID] + ld a, [wDefaultMap] ld [wDestinationMap], a callab SpecialWarpIn ld c, 20 diff --git a/engine/menu/main_menu.asm b/engine/menu/main_menu.asm index 94504ffb..f7c92326 100755 --- a/engine/menu/main_menu.asm +++ b/engine/menu/main_menu.asm @@ -20,7 +20,7 @@ MainMenu: ; 5ba6 (1:5ba6) ld [hli],a ld [hli],a ld [hl],a - ld [wAnimationID],a + ld [wDefaultMap],a ld hl,wd72e res 6,[hl] call ClearScreen @@ -88,7 +88,7 @@ MainMenu: ; 5ba6 (1:5ba6) jp .mainMenuLoop .choseContinue call DisplayContinueGameInfo - ld hl,wd126 + ld hl,wCurrentMapScriptFlags set 5,[hl] .inputLoop xor a @@ -247,12 +247,12 @@ PrintNumOwnedMons: ; 5daa (1:5daa) jp PrintNumber PrintPlayTime: ; 5dbd (1:5dbd) - ld de, wPlayTimeHours + 1 + ld de, wPlayTimeHours lb bc, 1, 3 call PrintNumber ld [hl], $6d inc hl - ld de, wPlayTimeMinutes + 1 + ld de, wPlayTimeMinutes lb bc, LEADING_ZEROES | 1, 2 jp PrintNumber diff --git a/engine/menu/naming_screen.asm b/engine/menu/naming_screen.asm index de0c696c..0eacc8f6 100755 --- a/engine/menu/naming_screen.asm +++ b/engine/menu/naming_screen.asm @@ -164,7 +164,7 @@ DisplayNamingScreen: ; 6307 (1:6307) call RunDefaultPaletteCommand call GBPalNormal xor a - ld [wSubAnimTransform], a + ld [wAnimCounter], a ld hl, wd730 res 6, [hl] ld a, [wIsInBattle] diff --git a/engine/menu/start_sub_menus.asm b/engine/menu/start_sub_menus.asm index e2491253..792903b7 100755 --- a/engine/menu/start_sub_menus.asm +++ b/engine/menu/start_sub_menus.asm @@ -163,7 +163,7 @@ StartMenu_Pokemon: ; 11c36 (4:5c36) .surf ; 11d66 (4:5d66) bit 4,a ; does the player have the Soul Badge? jp z,.newBadgeRequired - callba CheckForForcedBikeSurf + callba IsSurfingAllowed ld hl,wd728 bit 1,[hl] res 1,[hl] @@ -618,12 +618,12 @@ DrawTrainerInfo: ; 1204c (4:604c) ld c,$e3 call PrintBCDNumber coord hl, 9, 6 - ld de,wPlayTimeHours + 1 ; hours + ld de,wPlayTimeHours ; hours lb bc, LEFT_ALIGN | 1, 3 call PrintNumber ld [hl],$d6 ; colon tile ID inc hl - ld de,wPlayTimeMinutes + 1 ; minutes + ld de,wPlayTimeMinutes ; minutes lb bc, LEADING_ZEROES | 1, 2 jp PrintNumber |