Rename GetJoypadState -> Joypad.

This commit is contained in:
yenatch 2014-05-25 11:21:48 -07:00
parent 031e33957d
commit bba8405992
10 changed files with 28 additions and 28 deletions

View file

@ -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?

View file

@ -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

View file

@ -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

View file

@ -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