diff options
| author | dannye <33dannye@gmail.com> | 2025-01-30 21:40:19 -0600 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2025-01-30 21:40:19 -0600 |
| commit | 6cb885a9f68b9f445d7fa45279731336fe0247d4 (patch) | |
| tree | 39736ab1dd8ebcc57f8e981db6103285743d5530 /engine/slots | |
| parent | Identify unnamed functions in map_sprites.asm (#126) (diff) | |
| parent | Fix some label typos, and add some constants instead of raw numbers (#492) (diff) | |
| download | pokeyellow-6cb885a9f68b9f445d7fa45279731336fe0247d4.tar.gz pokeyellow-6cb885a9f68b9f445d7fa45279731336fe0247d4.tar.xz pokeyellow-6cb885a9f68b9f445d7fa45279731336fe0247d4.zip | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'engine/slots')
| -rw-r--r-- | engine/slots/slot_machine.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/engine/slots/slot_machine.asm b/engine/slots/slot_machine.asm index fd7a7466..9ad5aa6d 100644 --- a/engine/slots/slot_machine.asm +++ b/engine/slots/slot_machine.asm @@ -1,7 +1,7 @@ PromptUserToPlaySlots: call SaveScreenTilesToBuffer2 ld a, BANK(DisplayTextIDInit) - assert BANK(DisplayTextIDInit) == 1 << BIT_NO_AUTO_TEXT_BOX + ASSERT BANK(DisplayTextIDInit) == 1 << BIT_NO_AUTO_TEXT_BOX ld [wAutoTextBoxDrawingControl], a ; 1 << BIT_NO_AUTO_TEXT_BOX ld b, a ; BANK(DisplayTextIDInit) ld hl, DisplayTextIDInit @@ -28,7 +28,7 @@ PromptUserToPlaySlots: call GBPalNormal ld a, $e4 ldh [rOBP0], a - call UpdateGBCPal_OBP0 + call UpdateCGBPal_OBP0 ld hl, wStatusFlags5 set BIT_NO_TEXT_DELAY, [hl] xor a @@ -299,8 +299,8 @@ SlotMachine_StopWheel1Early: cp HIGH(SLOTSCHERRY) jr nz, .stopWheel ret -; It looks like this was intended to make the wheel stop when a 7 symbol was -; visible, but it has a bug and so the wheel stops randomly. +; Bug: This looks intended to make the wheel stop when a +; 7 symbol was visible, but instead the wheel stops randomly. .sevenAndBarMode ld c, $3 .loop @@ -459,7 +459,7 @@ SlotMachine_CheckForMatches: ldh a, [rBGP] xor $40 ldh [rBGP], a - call UpdateGBCPal_BGP + call UpdateCGBPal_BGP ld c, 5 call DelayFrames dec b @@ -476,7 +476,7 @@ SlotMachine_CheckForMatches: call SlotMachine_PrintPayoutCoins ld a, $e4 ldh [rOBP0], a - call UpdateGBCPal_OBP0 + call UpdateCGBPal_OBP0 jp .done SymbolLinedUpSlotMachineText: @@ -702,7 +702,7 @@ SlotMachine_PayCoinsToPlayer: ldh a, [rOBP0] xor $40 ; make the slot wheel symbols flash ldh [rOBP0], a - call UpdateGBCPal_OBP0 + call UpdateCGBPal_OBP0 ld a, 5 .skip1 ld [wAnimCounter], a |