diff options
| author | Daniel Harding <corrnondacqb@yahoo.com> | 2015-07-03 16:03:10 -0500 |
|---|---|---|
| committer | Daniel Harding <corrnondacqb@yahoo.com> | 2015-07-03 16:03:10 -0500 |
| commit | ec4c53559379f3bf7bd332905ba144e1d998f38b (patch) | |
| tree | f8ee8f2d9c8042b55edb1a4761833511ab1695b1 /engine/slot_machine.asm | |
| parent | Merge pull request #96 from dannye/master (diff) | |
| parent | No more ldh (diff) | |
| download | pokeyellow-ec4c53559379f3bf7bd332905ba144e1d998f38b.tar.gz pokeyellow-ec4c53559379f3bf7bd332905ba144e1d998f38b.tar.xz pokeyellow-ec4c53559379f3bf7bd332905ba144e1d998f38b.zip | |
Merge pull request #98 from dannye/master
Renaming and clean up
Diffstat (limited to 'engine/slot_machine.asm')
| -rwxr-xr-x | engine/slot_machine.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engine/slot_machine.asm b/engine/slot_machine.asm index e3e452f3..0b9f8bc9 100755 --- a/engine/slot_machine.asm +++ b/engine/slot_machine.asm @@ -128,7 +128,7 @@ MainSlotMachineLoop: ; 37395 (d:7395) jr nz, .skip2 ld hl, OutOfCoinsSlotMachineText call PrintText - ld c, $3c + ld c, 60 jp DelayFrames .skip2 ld hl, OneMoreGoSlotMachineText @@ -202,13 +202,13 @@ SlotMachine_37480: ; 37480 (d:7480) ret SlotMachine_374ad: ; 374ad (d:74ad) - ld c, $14 + ld c, 20 .loop1 push bc call SlotMachine_37813 call SlotMachine_37823 call SlotMachine_37833 - ld c, $2 + ld c, 2 call DelayFrames pop bc dec c @@ -437,7 +437,7 @@ SlotMachine_37588: ; 37588 (d:7588) ld a, [$ff47] xor $40 ld [$ff47], a - ld c, $5 + ld c, 5 call DelayFrames dec b jr nz, .asm_37638 @@ -456,7 +456,7 @@ SlotMachine_37588: ; 37588 (d:7588) jp .loop SlotsMachineText_37665: ; 37665 (d:7665) - db $08 ; asm + TX_ASM push bc call SlotMachine_37728 ld hl, LinedUpText @@ -674,7 +674,7 @@ SlotMachine_3776b: ; 3776b (d:776b) ld [W_SUBANIMTRANSFORM], a ld a, [wTrainerScreenX] cp $7 - ld c, $8 + ld c, 8 jr nc, .skip2 srl c .skip2 |