diff options
Diffstat (limited to 'engine')
| -rwxr-xr-x | engine/cable_club.asm | 2 | ||||
| -rwxr-xr-x | engine/evolution.asm | 2 | ||||
| -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 | ||||
| -rwxr-xr-x | engine/slot_machine.asm | 2 | ||||
| -rwxr-xr-x | engine/town_map.asm | 4 |
8 files changed, 10 insertions, 10 deletions
diff --git a/engine/cable_club.asm b/engine/cable_club.asm index 73f0dada..be3184aa 100755 --- a/engine/cable_club.asm +++ b/engine/cable_club.asm @@ -540,7 +540,7 @@ TradeCenter_SelectMon: ld a, $ed ld [$c4e1], a .asm_574a - call GetJoypadStateLowSensitivity + call JoypadLowSensitivity ld a, [$ffb5] and a jr z, .asm_574a ; 0x5750 $f8 diff --git a/engine/evolution.asm b/engine/evolution.asm index 664aaa5e..12f7e5c5 100755 --- a/engine/evolution.asm +++ b/engine/evolution.asm @@ -141,7 +141,7 @@ Func_7bed6: ; 7bed6 (1e:7ed6) asm_7befa: ; 7befa (1e:7efa) call DelayFrame push bc - call GetJoypadStateLowSensitivity + call JoypadLowSensitivity ld a, [$ffb5] pop bc and $2 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 diff --git a/engine/slot_machine.asm b/engine/slot_machine.asm index 6c106239..1d320207 100755 --- a/engine/slot_machine.asm +++ b/engine/slot_machine.asm @@ -799,7 +799,7 @@ SlotMachine_3784e: ; 3784e (d:784e) SlotMachine_37882: ; 37882 (d:7882) call DelayFrame - call GetJoypadStateLowSensitivity + call JoypadLowSensitivity ld a, [$ffb5] and $1 ret z diff --git a/engine/town_map.asm b/engine/town_map.asm index 6fbdeb2a..e759d503 100755 --- a/engine/town_map.asm +++ b/engine/town_map.asm @@ -67,7 +67,7 @@ Func_70e92: ; 70e92 (1c:4e92) call CopyData .asm_70ec8 call Func_716c6 - call GetJoypadStateLowSensitivity + call JoypadLowSensitivity ld a, [$ffb5] ld b, a and $c3 @@ -195,7 +195,7 @@ LoadTownMap_Fly: ; 70f90 (1c:4f90) .asm_71004 push hl call DelayFrame - call GetJoypadStateLowSensitivity + call JoypadLowSensitivity ld a, [$ffb5] ld b, a pop hl |