diff options
Diffstat (limited to 'engine/slots/slot_machine.asm')
| -rw-r--r-- | engine/slots/slot_machine.asm | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/engine/slots/slot_machine.asm b/engine/slots/slot_machine.asm index fe137632..ba007d9d 100644 --- a/engine/slots/slot_machine.asm +++ b/engine/slots/slot_machine.asm @@ -23,9 +23,11 @@ PromptUserToPlaySlots: call LoadFontTilePatterns ld b, SET_PAL_SLOTS call RunPaletteCommand + call Delay3 call GBPalNormal ld a, $e4 ldh [rOBP0], a + call UpdateGBCPal_OBP0 ld hl, wd730 set 6, [hl] xor a @@ -80,8 +82,7 @@ MainSlotMachineLoop: ld [wLastMenuItem], a ld [wMenuWatchMovingOutOfBounds], a hlcoord 14, 11 - ld b, 5 - ld c, 4 + lb bc, 5, 4 call TextBoxBorder hlcoord 16, 12 ld de, CoinMultiplierSlotMachineText @@ -457,6 +458,7 @@ SlotMachine_CheckForMatches: ldh a, [rBGP] xor $40 ldh [rBGP], a + call UpdateGBCPal_BGP ld c, 5 call DelayFrames dec b @@ -473,6 +475,7 @@ SlotMachine_CheckForMatches: call SlotMachine_PrintPayoutCoins ld a, $e4 ldh [rOBP0], a + call UpdateGBCPal_OBP0 jp .done SymbolLinedUpSlotMachineText: @@ -698,6 +701,7 @@ SlotMachine_PayCoinsToPlayer: ldh a, [rOBP0] xor $40 ; make the slot wheel symbols flash ldh [rOBP0], a + call UpdateGBCPal_OBP0 ld a, 5 .skip1 ld [wAnimCounter], a @@ -852,17 +856,17 @@ LoadSlotMachineTiles: ld de, vChars0 ld bc, $1c tiles ; should be SlotMachineTiles2End - SlotMachineTiles2, or $18 tiles ld a, BANK(SlotMachineTiles2) - call FarCopyData2 + call FarCopyData ld hl, SlotMachineTiles1 ld de, vChars2 ld bc, SlotMachineTiles1End - SlotMachineTiles1 ld a, BANK(SlotMachineTiles1) - call FarCopyData2 + call FarCopyData ld hl, SlotMachineTiles2 ld de, vChars2 tile $25 ld bc, $1c tiles ; should be SlotMachineTiles2End - SlotMachineTiles2, or $18 tiles ld a, BANK(SlotMachineTiles2) - call FarCopyData2 + call FarCopyData ld hl, SlotMachineMap decoord 0, 0 ld bc, SlotMachineMapEnd - SlotMachineMap @@ -884,10 +888,5 @@ SlotMachineMapEnd: INCLUDE "data/events/slot_machine_wheels.asm" SlotMachineTiles1: -IF DEF(_RED) - INCBIN "gfx/slots/red_slots_1.2bpp" -ENDC -IF DEF(_BLUE) - INCBIN "gfx/slots/blue_slots_1.2bpp" -ENDC + INCBIN "gfx/slots/slots_1.2bpp" SlotMachineTiles1End: |