Skip to content

Commit b82bafa

Browse files
committed
change displayNextPiece to hideNextPiece
1 parent 5be18db commit b82bafa

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

CHANGELOG.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Changelog
22

33
## [unreleased]
4-
* Crash Simulation
4+
* Crash Behaviours
55
* Crunch Mode
66
* Marathon Mode
77
* Hidden Score Mode
@@ -13,7 +13,7 @@
1313
* Fixed ingame score display at 8 million with Classic Scoring
1414
* Fixed CNROM legal screen CHR bank
1515
* Fixed CNROM legal to title flicker
16-
* Fixed a bug in Sonic Drop
16+
* Fixed piece skip when doing Sonic Drop then Hard Drop immediately
1717
* Block Tool pieces wrap around
1818
* Always Next Box removed
1919
* 0001 seeds are ignored

src/gamemode/gametypemenu/menu.asm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ gameMode_gameTypeMenu:
99
jsr calc_menuScrollY
1010
sta menuScrollY
1111
lda #0
12-
sta displayNextPiece
12+
sta hideNextPiece
1313
RESET_MMC1
1414
.if HAS_MMC
1515
; switch to blank charmap

src/gamemodestate/updatecounters.asm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ gameModeState_updateCountersAndNonPlayerState:
88
lda newlyPressedButtons_player1
99
and #BUTTON_SELECT
1010
beq @ret
11-
lda displayNextPiece
11+
lda hideNextPiece
1212
eor #$01
13-
sta displayNextPiece
13+
sta hideNextPiece
1414
@ret: inc gameModeState ; 3
1515
rts

src/playstate/updatestats.asm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -489,7 +489,7 @@ testCrash:
489489
bne @clearedLine
490490

491491
@linesNotCleared:
492-
lda displayNextPiece ;00 is nextbox enabled
492+
lda hideNextPiece
493493
bne @nextOff
494494
lda #$8A ; add 394 cycles for nextbox
495495
adc cycleCount+1
@@ -733,7 +733,7 @@ testCrash:
733733
bne @loop
734734
;562 has been added to the cycle count
735735
;confettiA at 30405-30754 76C5-7822
736-
lda displayNextPiece
736+
lda hideNextPiece
737737
beq @nextOn
738738
lda cycleCount+1 ; add 394 cycles for nextbox if not added earlier. Necessary because we're checking for pre-nextbox NMI now.
739739
adc #$8A

src/sprites/piece.asm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ stageSpriteForCurrentPiece_return:
136136
rts
137137

138138
stageSpriteForNextPiece:
139-
lda displayNextPiece
139+
lda hideNextPiece
140140
bne @maybeDisplayNextPiece
141141

142142
@displayNextPiece:

0 commit comments

Comments
 (0)