summaryrefslogtreecommitdiff
path: root/main.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 /main.asm
parent031e33957dfaf9a5e29fb67aaf600ec809b8e35f (diff)
Rename GetJoypadState -> Joypad.
Diffstat (limited to 'main.asm')
-rwxr-xr-xmain.asm4
1 files changed, 2 insertions, 2 deletions
diff --git a/main.asm b/main.asm
index da4109c0..183d62cc 100755
--- a/main.asm
+++ b/main.asm
@@ -3075,7 +3075,7 @@ Func_7c18: ; 7c18 (1:7c18)
SECTION "bank3",ROMX,BANK[$3]
-_GetJoypadState::
+_Joypad::
ld a, [hJoyInput]
cp A_BUTTON + B_BUTTON + SELECT + START ; soft reset
jp z, TrySoftReset
@@ -3125,7 +3125,7 @@ TrySoftReset:
ld hl, hSoftReset
dec [hl]
jp z, SoftReset
- jp GetJoypadState
+ jp Joypad
INCLUDE "data/map_songs.asm"