ref: 496502b3dc16318cf59dd41d8462330f66cd19d6
parent: 18124d0a5d6790bc42cf12320557e997cdb31a7a
author: yenatch <[email protected]>
date: Sun Dec 22 12:30:35 EST 2013
no more Public in joypad interface labels
--- a/engine/events.asm
+++ b/engine/events.asm
@@ -124,7 +124,7 @@
ld bc, $3e
call ByteFill
callba Function113e5
- call ClearJoypadPublic
+ call ClearJoypad
; fallthrough
; 9673e
@@ -226,7 +226,7 @@
cp 1
ret z
call UpdateTime
- call GetJoypadPublic
+ call GetJoypad
call TimeOfDayPals
ret
; 967d1
--- a/home.asm
+++ b/home.asm
@@ -364,7 +364,7 @@
ld [TextDelayFrames], a
.checkjoypad
- call GetJoypadPublic
+ call GetJoypad
; input override
ld a, [$c2d7]
--- a/home/joypad.asm
+++ b/home/joypad.asm
@@ -6,7 +6,7 @@
reti
; 92f
-ClearJoypadPublic: ; 92f
+ClearJoypad: ; 92f
xor a
; Pressed this frame (delta)
ld [hJoyPressed], a
@@ -109,7 +109,7 @@
; 984
-GetJoypadPublic: ; 984
+GetJoypad: ; 984
; Update mirror joypad input from hJoypadDown (real input)
; hJoyReleased: released this frame (delta)
@@ -304,7 +304,7 @@
Functiona36: ; a36
call DelayFrame
- call GetJoypadPublic
+ call GetJoypad
ld a, [hJoyPressed]
and A_BUTTON | B_BUTTON
ret nz
@@ -325,7 +325,7 @@
; a57
Functiona57: ; a57
- call GetJoypadPublic
+ call GetJoypad
ld a, [$ffaa]
and a
ld a, [hJoyPressed]
--- a/home/text.asm
+++ b/home/text.asm
@@ -1048,7 +1048,7 @@
Text_0A: ; 14ed
push hl
push bc
- call GetJoypadPublic
+ call GetJoypad
ld a, [hJoyDown]
and A_BUTTON | B_BUTTON
jr nz, .asm_14fd
@@ -1130,7 +1130,7 @@
push de
ld a, "…"
ld [hli], a
- call GetJoypadPublic
+ call GetJoypad
ld a, [hJoyDown]
and A_BUTTON | B_BUTTON
jr nz, .asm_155a
--- a/main.asm
+++ b/main.asm
@@ -4118,7 +4118,7 @@
Function5e34: ; 5e34
.asm_5e34
call DelayFrame
- call GetJoypadPublic
+ call GetJoypad
ld hl, hJoyPressed
bit 0, [hl]
jr nz, .asm_5e47
@@ -4878,7 +4878,7 @@
ld [hl], e
; Save data can be deleted by pressing Up + B + Select.
- call GetJoypadPublic
+ call GetJoypad
ld hl, hJoyDown
ld a, [hl]
and D_UP + B_BUTTON + SELECT
@@ -16237,7 +16237,7 @@
ld [$ffde], a
pop af
ld [Options], a
- call ClearJoypadPublic
+ call ClearJoypad
ret
; 116f8
@@ -48780,7 +48780,7 @@
; known jump sources: 4ddac (13:5dac), 4ddd6 (13:5dd6)
Function4de2c: ; 4de2c (13:5e2c)
- call GetJoypadPublic
+ call GetJoypad
ld a, [MonType] ; $cf5f
cp $3
jr nz, .asm_4de4e
@@ -49926,7 +49926,7 @@
; 4e726
Function4e726: ; 4e726
- call ClearJoypadPublic
+ call ClearJoypad
ld bc, $010e
.asm_4e72c
push bc
@@ -73694,7 +73694,7 @@
Functionb929a: ; b929a
.asm_b929a
- call GetJoypadPublic
+ call GetJoypad
ld a, [hJoyPressed]
and $b
jr z, .asm_b929a
@@ -84017,7 +84017,7 @@
ld [$cd27], a
.asm_100a92
call DelayFrame
- call GetJoypadPublic
+ call GetJoypad
callba Function100382
ld c, $1
ld b, $3