summaryrefslogtreecommitdiff
path: root/engine/menu/main_menu.asm
diff options
context:
space:
mode:
authoryenatch <yenatch@gmail.com>2014-05-25 11:21:48 -0700
committeryenatch <yenatch@gmail.com>2014-05-25 11:21:48 -0700
commitbba84059925c25e04fdcef5e4f3e2192176faf2d (patch)
tree31dad8410ee610e6dcc1ceb2216ef22a433941c1 /engine/menu/main_menu.asm
parent031e33957dfaf9a5e29fb67aaf600ec809b8e35f (diff)
Rename GetJoypadState -> Joypad.
Diffstat (limited to 'engine/menu/main_menu.asm')
-rwxr-xr-xengine/menu/main_menu.asm4
1 files changed, 2 insertions, 2 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?