diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-09-09 15:09:51 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-09-09 15:09:51 -0400 |
| commit | ae022e1420ee16032cb7afb1a365bc32fc2a2c9b (patch) | |
| tree | 871e3f210173548fc3b87325b47535efe13b54c0 /engine/games | |
| parent | 84cfbc70fac02032d1608f89e9f551ab3d987315 (diff) | |
Curr -> Cur
Diffstat (limited to 'engine/games')
| -rw-r--r-- | engine/games/slot_machine.asm | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/engine/games/slot_machine.asm b/engine/games/slot_machine.asm index 72f9c400f..7299a8a32 100644 --- a/engine/games/slot_machine.asm +++ b/engine/games/slot_machine.asm @@ -182,7 +182,7 @@ SlotsLoop: call SlotsJumptable call Slots_SpinReels xor a - ld [wCurrSpriteOAMAddr], a + ld [wCurSpriteOAMAddr], a callfar DoNextFrameForFirst16Sprites call .PrintCoinsAndPayout call .Stubbed_Function927d3 @@ -778,9 +778,9 @@ Slots_UpdateReelPositionAndOAM: ld hl, REEL_X_COORD add hl, bc ld a, [hl] - ld [wCurrReelXCoord], a + ld [wCurReelXCoord], a ld a, 10 * 8 - ld [wCurrReelYCoord], a + ld [wCurReelYCoord], a ld hl, REEL_POSITION add hl, bc ld e, [hl] @@ -813,9 +813,9 @@ Slots_UpdateReelPositionAndOAM: ld h, [hl] ld l, a .loop - ld a, [wCurrReelYCoord] + ld a, [wCurReelYCoord] ld [hli], a ; y - ld a, [wCurrReelXCoord] + ld a, [wCurReelXCoord] ld [hli], a ; x ld a, [de] ld [hli], a ; tile id @@ -824,9 +824,9 @@ Slots_UpdateReelPositionAndOAM: set OAM_PRIORITY, a ld [hli], a ; attributes - ld a, [wCurrReelYCoord] + ld a, [wCurReelYCoord] ld [hli], a ; y - ld a, [wCurrReelXCoord] + ld a, [wCurReelXCoord] add 1 * TILE_WIDTH ld [hli], a ; x ld a, [de] @@ -838,9 +838,9 @@ Slots_UpdateReelPositionAndOAM: set OAM_PRIORITY, a ld [hli], a ; attributes inc de - ld a, [wCurrReelYCoord] + ld a, [wCurReelYCoord] sub 2 * TILE_WIDTH - ld [wCurrReelYCoord], a + ld [wCurReelYCoord], a cp 2 * TILE_WIDTH jr nz, .loop ret @@ -1412,35 +1412,35 @@ Slots_CheckMatchedFirstTwoReels: ret .CheckBottomRow: - ld hl, wCurrReelStopped + ld hl, wCurReelStopped ld a, [wReel1Stopped] cp [hl] call z, .StoreResult ret .CheckUpwardsDiag: - ld hl, wCurrReelStopped + 1 + ld hl, wCurReelStopped + 1 ld a, [wReel1Stopped] cp [hl] call z, .StoreResult ret .CheckMiddleRow: - ld hl, wCurrReelStopped + 1 + ld hl, wCurReelStopped + 1 ld a, [wReel1Stopped + 1] cp [hl] call z, .StoreResult ret .CheckDownwardsDiag: - ld hl, wCurrReelStopped + 1 + ld hl, wCurReelStopped + 1 ld a, [wReel1Stopped + 2] cp [hl] call z, .StoreResult ret .CheckTopRow: - ld hl, wCurrReelStopped + 2 + ld hl, wCurReelStopped + 2 ld a, [wReel1Stopped + 2] cp [hl] call z, .StoreResult @@ -1509,7 +1509,7 @@ Slots_CheckMatchedAllThreeReels: ret .CheckBottomRow: - ld hl, wCurrReelStopped + ld hl, wCurReelStopped ld a, [wReel1Stopped] cp [hl] ret nz @@ -1519,7 +1519,7 @@ Slots_CheckMatchedAllThreeReels: ret .CheckUpwardsDiag: - ld hl, wCurrReelStopped + 2 + ld hl, wCurReelStopped + 2 ld a, [wReel1Stopped] cp [hl] ret nz @@ -1529,7 +1529,7 @@ Slots_CheckMatchedAllThreeReels: ret .CheckMiddleRow: - ld hl, wCurrReelStopped + 1 + ld hl, wCurReelStopped + 1 ld a, [wReel1Stopped + 1] cp [hl] ret nz @@ -1539,7 +1539,7 @@ Slots_CheckMatchedAllThreeReels: ret .CheckDownwardsDiag: - ld hl, wCurrReelStopped + ld hl, wCurReelStopped ld a, [wReel1Stopped + 2] cp [hl] ret nz @@ -1549,7 +1549,7 @@ Slots_CheckMatchedAllThreeReels: ret .CheckTopRow: - ld hl, wCurrReelStopped + 2 + ld hl, wCurReelStopped + 2 ld a, [wReel1Stopped + 2] cp [hl] ret nz @@ -1563,7 +1563,7 @@ Slots_CheckMatchedAllThreeReels: ret Slots_CopyReelState: - ld de, wCurrReelStopped + ld de, wCurReelStopped ld a, [hli] ld [de], a inc de |