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/pokedex.asm | 2 | ||||
| -rwxr-xr-x | engine/menu/start_menu.asm | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/engine/menu/main_menu.asm b/engine/menu/main_menu.asm index 2ab7d35e..49ed67f6 100755 --- a/engine/menu/main_menu.asm +++ b/engine/menu/main_menu.asm @@ -100,7 +100,7 @@ MainMenu: ; 5af2 (1:5af2) ld [hJoyPressed],a ld [hJoyReleased],a ld [hJoyHeld],a - call GetJoypadState + call Joypad ld a,[hJoyHeld] bit 0,a jr nz,.next5 @@ -483,7 +483,7 @@ DisplayOptionMenu: ; 5e8a (1:5e8a) call PlaceMenuCursor call SetOptionsFromCursorPositions .getJoypadStateLoop - call GetJoypadStateLowSensitivity + call JoypadLowSensitivity ld a,[$ffb5] ld b,a and a,%11111011 ; any key besides select pressed? diff --git a/engine/menu/naming_screen.asm b/engine/menu/naming_screen.asm index b62d8a94..b4e7ff92 100755 --- a/engine/menu/naming_screen.asm +++ b/engine/menu/naming_screen.asm @@ -133,7 +133,7 @@ DisplayNamingScreen: ; 6596 (1:6596) callba AnimatePartyMon_ForceSpeed1 pop af ld [wCurrentMenuItem], a ; $cc26 - call GetJoypadStateLowSensitivity + call JoypadLowSensitivity ld a, [hJoyPressed] and a jr z, .asm_65ff diff --git a/engine/menu/pokedex.asm b/engine/menu/pokedex.asm index dbb9f57f..2b56726a 100755 --- a/engine/menu/pokedex.asm +++ b/engine/menu/pokedex.asm @@ -584,7 +584,7 @@ ShowPokedexDataInternal: ; 402e2 (10:42e2) xor a ld [$fff4],a .waitForButtonPress - call GetJoypadStateLowSensitivity + call JoypadLowSensitivity ld a,[$ffb5] and a,%00000011 ; A button and B button jr z,.waitForButtonPress diff --git a/engine/menu/start_menu.asm b/engine/menu/start_menu.asm index be0e851d..87e08daf 100755 --- a/engine/menu/start_menu.asm +++ b/engine/menu/start_menu.asm @@ -80,7 +80,7 @@ RedisplayStartMenu:: ; 2adf (0:2adf) ; EXIT falls through to here CloseStartMenu:: ; 2b70 (0:2b70) - call GetJoypadState + call Joypad ld a,[hJoyPressed] bit 0,a ; was A button newly pressed? jr nz,CloseStartMenu |