diff options
Diffstat (limited to 'engine/menu')
| -rwxr-xr-x | engine/menu/league_pc.asm | 2 | ||||
| -rwxr-xr-x | engine/menu/main_menu.asm | 12 | ||||
| -rwxr-xr-x | engine/menu/naming_screen.asm | 2 | ||||
| -rwxr-xr-x | engine/menu/start_menu.asm | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/engine/menu/league_pc.asm b/engine/menu/league_pc.asm index 5e4e3436..c7877cd9 100755 --- a/engine/menu/league_pc.asm +++ b/engine/menu/league_pc.asm @@ -54,7 +54,7 @@ Func_765e5: ; 765e5 (1d:65e5) push bc call Func_76610 call WaitForTextScrollButtonPress - ld a, [H_CURRENTPRESSEDBUTTONS] + ld a, [hJoyHeld] bit 1, a jr nz, .fifth ld hl, $CC6B diff --git a/engine/menu/main_menu.asm b/engine/menu/main_menu.asm index 7e34feca..2ab7d35e 100755 --- a/engine/menu/main_menu.asm +++ b/engine/menu/main_menu.asm @@ -97,11 +97,11 @@ MainMenu: ; 5af2 (1:5af2) set 5,[hl] .next6 xor a - ld [H_NEWLYPRESSEDBUTTONS],a - ld [H_NEWLYRELEASEDBUTTONS],a - ld [H_CURRENTPRESSEDBUTTONS],a + ld [hJoyPressed],a + ld [hJoyReleased],a + ld [hJoyHeld],a call GetJoypadState - ld a,[H_CURRENTPRESSEDBUTTONS] + ld a,[hJoyHeld] bit 0,a jr nz,.next5 bit 1,a @@ -315,8 +315,8 @@ Func_5d52: ; 5d52 (1:5d52) Func_5d5f: ; 5d5f (1:5d5f) xor a - ld [H_NEWLYPRESSEDBUTTONS], a - ld [H_CURRENTPRESSEDBUTTONS], a + ld [hJoyPressed], a + ld [hJoyHeld], a ld [$ffb5], a ld [$d72d], a ld hl, $d732 diff --git a/engine/menu/naming_screen.asm b/engine/menu/naming_screen.asm index 36aba5eb..b62d8a94 100755 --- a/engine/menu/naming_screen.asm +++ b/engine/menu/naming_screen.asm @@ -134,7 +134,7 @@ DisplayNamingScreen: ; 6596 (1:6596) pop af ld [wCurrentMenuItem], a ; $cc26 call GetJoypadStateLowSensitivity - ld a, [H_NEWLYPRESSEDBUTTONS] + ld a, [hJoyPressed] and a jr z, .asm_65ff ld hl, .unknownPointerTable_665e ; $665e diff --git a/engine/menu/start_menu.asm b/engine/menu/start_menu.asm index 774f604d..be0e851d 100755 --- a/engine/menu/start_menu.asm +++ b/engine/menu/start_menu.asm @@ -81,7 +81,7 @@ RedisplayStartMenu:: ; 2adf (0:2adf) ; EXIT falls through to here CloseStartMenu:: ; 2b70 (0:2b70) call GetJoypadState - ld a,[H_NEWLYPRESSEDBUTTONS] + ld a,[hJoyPressed] bit 0,a ; was A button newly pressed? jr nz,CloseStartMenu call LoadTextBoxTilePatterns |