aboutsummaryrefslogtreecommitdiffstats
path: root/engine/events/vending_machine.asm
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2021-11-23 21:19:29 -0500
committerRangi <remy.oukaour+rangi42@gmail.com>2021-11-23 21:19:29 -0500
commit7574e186e7505e237efc3ab0969fed60bec6eb9d (patch)
tree527ec48412989e98cca7827c5e31d89cdf742b05 /engine/events/vending_machine.asm
parentIdentify starter pikachu happiness boost medicine check (#72) (diff)
parentUse ~X instead of $ff ^ X (diff)
downloadpokeyellow-7574e186e7505e237efc3ab0969fed60bec6eb9d.tar.gz
pokeyellow-7574e186e7505e237efc3ab0969fed60bec6eb9d.tar.xz
pokeyellow-7574e186e7505e237efc3ab0969fed60bec6eb9d.zip
Merge remote-tracking branch 'remotes/pokered/master'
Diffstat (limited to 'engine/events/vending_machine.asm')
-rw-r--r--engine/events/vending_machine.asm2
1 files changed, 1 insertions, 1 deletions
diff --git a/engine/events/vending_machine.asm b/engine/events/vending_machine.asm
index 6ff6a5e4..68dfadfb 100644
--- a/engine/events/vending_machine.asm
+++ b/engine/events/vending_machine.asm
@@ -30,7 +30,7 @@ VendingMachineMenu::
ld hl, wd730
res 6, [hl]
call HandleMenuInput
- bit 1, a ; pressed B?
+ bit BIT_B_BUTTON, a
jr nz, .notThirsty
ld a, [wCurrentMenuItem]
cp 3 ; chose Cancel?