aboutsummaryrefslogtreecommitdiffstats
path: root/home/joypad2.asm
diff options
context:
space:
mode:
authorRangi <35663410+Rangi42@users.noreply.github.com>2025-06-30 12:47:22 -0400
committerGitHub <noreply@github.com>2025-06-30 12:47:22 -0400
commit56c405de09ce267c4cfbc68a15c37b2ff51c635a (patch)
tree47d25c237e9af824f7a57295a2d2e298b194a8e6 /home/joypad2.asm
parentDistinguish single trainer pics section from Pokemon pics (diff)
downloadpokeyellow-56c405de09ce267c4cfbc68a15c37b2ff51c635a.tar.gz
pokeyellow-56c405de09ce267c4cfbc68a15c37b2ff51c635a.tar.xz
pokeyellow-56c405de09ce267c4cfbc68a15c37b2ff51c635a.zip
Replace hardware_constants.asm with hardware.inc (#511)
Diffstat (limited to 'home/joypad2.asm')
-rw-r--r--home/joypad2.asm4
1 files changed, 2 insertions, 2 deletions
diff --git a/home/joypad2.asm b/home/joypad2.asm
index 139dd3f5..a07b9ee4 100644
--- a/home/joypad2.asm
+++ b/home/joypad2.asm
@@ -40,7 +40,7 @@ JoypadLowSensitivity::
.delayOver
; if [hJoy6] = 0 and A or B is pressed, report no buttons as pressed
ldh a, [hJoyHeld]
- and A_BUTTON | B_BUTTON
+ and PAD_A | PAD_B
jr z, .setShortDelay
ldh a, [hJoy6] ; flag
and a
@@ -74,7 +74,7 @@ WaitForTextScrollButtonPress::
call JoypadLowSensitivity
predef CableClub_Run
ldh a, [hJoy5]
- and A_BUTTON | B_BUTTON
+ and PAD_A | PAD_B
jr z, .loop
pop af
ldh [hDownArrowBlinkCount2], a