aboutsummaryrefslogtreecommitdiffstats
path: root/engine/slots
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/slots
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/slots')
-rw-r--r--engine/slots/slot_machine.asm6
1 files changed, 3 insertions, 3 deletions
diff --git a/engine/slots/slot_machine.asm b/engine/slots/slot_machine.asm
index ac6e642f..9dc32397 100644
--- a/engine/slots/slot_machine.asm
+++ b/engine/slots/slot_machine.asm
@@ -68,7 +68,7 @@ MainSlotMachineLoop:
call PrintText
call SaveScreenTilesToBuffer1
.loop
- ld a, A_BUTTON | B_BUTTON
+ ld a, PAD_A | PAD_B
ld [wMenuWatchedKeys], a
ld a, 2
ld [wMaxMenuItem], a
@@ -88,7 +88,7 @@ MainSlotMachineLoop:
ld de, CoinMultiplierSlotMachineText
call PlaceString
call HandleMenuInput
- and B_BUTTON
+ and PAD_B
jp nz, LoadScreenTilesFromBuffer1
ld a, [wCurrentMenuItem]
ld b, a
@@ -827,7 +827,7 @@ SlotMachine_HandleInputWhileWheelsSpin:
call DelayFrame
call JoypadLowSensitivity
ldh a, [hJoy5]
- and A_BUTTON
+ and PAD_A
ret z
ld hl, wStoppingWhichSlotMachineWheel
ld a, [hl]