aboutsummaryrefslogtreecommitdiffstats
path: root/engine/events/vending_machine.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 /engine/events/vending_machine.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 'engine/events/vending_machine.asm')
-rw-r--r--engine/events/vending_machine.asm4
1 files changed, 2 insertions, 2 deletions
diff --git a/engine/events/vending_machine.asm b/engine/events/vending_machine.asm
index 1530b994..bdbcd9bb 100644
--- a/engine/events/vending_machine.asm
+++ b/engine/events/vending_machine.asm
@@ -7,7 +7,7 @@ VendingMachineMenu::
xor a
ld [wCurrentMenuItem], a
ld [wLastMenuItem], a
- ld a, A_BUTTON | B_BUTTON
+ ld a, PAD_A | PAD_B
ld [wMenuWatchedKeys], a
ld a, 3
ld [wMaxMenuItem], a
@@ -31,7 +31,7 @@ VendingMachineMenu::
ld hl, wStatusFlags5
res BIT_NO_TEXT_DELAY, [hl]
call HandleMenuInput
- bit BIT_B_BUTTON, a
+ bit B_PAD_B, a
jr nz, .notThirsty
ld a, [wCurrentMenuItem]
cp 3 ; chose Cancel?