aboutsummaryrefslogtreecommitdiffstats
path: root/home/window.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/window.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/window.asm')
-rw-r--r--home/window.asm6
1 files changed, 3 insertions, 3 deletions
diff --git a/home/window.asm b/home/window.asm
index 48ab1d0e..48bef77a 100644
--- a/home/window.asm
+++ b/home/window.asm
@@ -50,7 +50,7 @@ HandleMenuInput_::
ld [wCheckFor180DegreeTurn], a
ldh a, [hJoy5]
ld b, a
- bit BIT_D_UP, a
+ bit B_PAD_UP, a
jr z, .checkIfDownPressed
.upPressed
ld a, [wCurrentMenuItem] ; selected menu item
@@ -68,7 +68,7 @@ HandleMenuInput_::
ld [wCurrentMenuItem], a ; wrap to the bottom of the menu
jr .checkOtherKeys
.checkIfDownPressed
- bit BIT_D_DOWN, a
+ bit B_PAD_DOWN, a
jr z, .checkOtherKeys
.downPressed
ld a, [wCurrentMenuItem]
@@ -91,7 +91,7 @@ HandleMenuInput_::
jp z, .loop1
.checkIfAButtonOrBButtonPressed
ldh a, [hJoy5]
- and A_BUTTON | B_BUTTON
+ and PAD_A | PAD_B
jr z, .skipPlayingSound
.AButtonOrBButtonPressed
push hl