diff options
Diffstat (limited to 'engine/menu')
| -rwxr-xr-x | engine/menu/main_menu.asm | 4 | ||||
| -rwxr-xr-x | engine/menu/naming_screen.asm | 2 | ||||
| -rwxr-xr-x | engine/menu/start_sub_menus.asm | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/engine/menu/main_menu.asm b/engine/menu/main_menu.asm index 6c109cec..78830093 100755 --- a/engine/menu/main_menu.asm +++ b/engine/menu/main_menu.asm @@ -20,7 +20,7 @@ MainMenu: ; 5af2 (1:5af2) ld [hli],a ld [hli],a ld [hl],a - ld [W_ANIMATIONID],a + ld [wDefaultMap],a ld hl,wd72e res 6,[hl] call ClearScreen @@ -269,7 +269,7 @@ LinkMenu: ; 5c0a (1:5c0a) call DelayFrames ld hl, wd732 res 1, [hl] - ld a, [W_ANIMATIONID] + ld a, [wDefaultMap] ld [wDestinationMap], a call SpecialWarpIn ld c, 20 diff --git a/engine/menu/naming_screen.asm b/engine/menu/naming_screen.asm index 978216c8..703d570a 100755 --- a/engine/menu/naming_screen.asm +++ b/engine/menu/naming_screen.asm @@ -166,7 +166,7 @@ DisplayNamingScreen: ; 6596 (1:6596) call RunDefaultPaletteCommand call GBPalNormal xor a - ld [W_SUBANIMTRANSFORM], a + ld [wAnimCounter], a ld hl, wd730 res 6, [hl] ld a, [W_ISINBATTLE] diff --git a/engine/menu/start_sub_menus.asm b/engine/menu/start_sub_menus.asm index ab8c8756..678877ef 100755 --- a/engine/menu/start_sub_menus.asm +++ b/engine/menu/start_sub_menus.asm @@ -160,7 +160,7 @@ StartMenu_Pokemon: ; 130a9 (4:70a9) .surf 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] |