summaryrefslogtreecommitdiff
path: root/home/joypad.asm
diff options
context:
space:
mode:
authoryenatch <yenatch@gmail.com>2013-12-22 17:30:35 -0500
committeryenatch <yenatch@gmail.com>2013-12-22 17:30:35 -0500
commit496502b3dc16318cf59dd41d8462330f66cd19d6 (patch)
tree83f5102314bfcefd7b76588b8d8f53db7759bc1d /home/joypad.asm
parent18124d0a5d6790bc42cf12320557e997cdb31a7a (diff)
no more Public in joypad interface labels
Diffstat (limited to 'home/joypad.asm')
-rw-r--r--home/joypad.asm8
1 files changed, 4 insertions, 4 deletions
diff --git a/home/joypad.asm b/home/joypad.asm
index efe70e809..a55bb204b 100644
--- a/home/joypad.asm
+++ b/home/joypad.asm
@@ -6,7 +6,7 @@ JoypadInt: ; 92e
reti
; 92f
-ClearJoypadPublic: ; 92f
+ClearJoypad: ; 92f
xor a
; Pressed this frame (delta)
ld [hJoyPressed], a
@@ -109,7 +109,7 @@ Joypad: ; 935
; 984
-GetJoypadPublic: ; 984
+GetJoypad: ; 984
; Update mirror joypad input from hJoypadDown (real input)
; hJoyReleased: released this frame (delta)
@@ -304,7 +304,7 @@ Functiona1b: ; a1b
Functiona36: ; a36
call DelayFrame
- call GetJoypadPublic
+ call GetJoypad
ld a, [hJoyPressed]
and A_BUTTON | B_BUTTON
ret nz
@@ -325,7 +325,7 @@ Functiona46: ; a46
; a57
Functiona57: ; a57
- call GetJoypadPublic
+ call GetJoypad
ld a, [$ffaa]
and a
ld a, [hJoyPressed]