Skip to content

Commit b499e7e

Browse files
Merge pull request #116 from zohassadar/no_sram_reset
Reset scores when no SRAM is present
2 parents a28e851 + ccfe83c commit b499e7e

File tree

2 files changed

+11
-18
lines changed

2 files changed

+11
-18
lines changed

CHANGELOG.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
## [unreleased]
44

55
* Fixed line based floor caps outside of levelups
6+
* Reset scores when no SRAM is present
67

78
## v6
89
* Crunch Trainer
@@ -62,9 +63,9 @@
6263
* Start on any level
6364
* Rewrite of all scoring code
6465
* Classic scoring
65-
* Millions counter
66+
* Millions counter
6667
* 7 digit score
67-
* 999999 scorecap
68+
* 999999 scorecap
6869
* Fixed T-Spin scoring
6970
* Crash free with no long frames
7071
* Rewrite of all highscore code
@@ -87,7 +88,7 @@
8788
* Added option to disable tetris flashing
8889
* Changes made to more closely match the original ROM
8990
* Restore seed shredding on level menu
90-
* Hold `select` to start in Qual Mode and reset level cursor
91+
* Hold `select` to start in Qual Mode and reset level cursor
9192
* Transition from Legal to Title screen after 512 frames
9293
* Hide next box between Curtain and Rocket
9394
* Persist Qual Mode (and menu config) between reset button presses
@@ -157,7 +158,7 @@
157158
- Garbage Trainer
158159
- Always Tetris Ready
159160
- Normal Garbage
160-
- Smart Garbage
161+
- Smart Garbage
161162
- Hard Garbage
162163
- Infinite Digging
163164
- Piece distribution in Setups Trainer is now even

src/gamemode/levelmenu.asm

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@ gameMode_levelMenu_processPlayer1Navigation:
7777
lda newlyPressedButtons_player1
7878
sta newlyPressedButtons
7979

80-
.if SAVE_HIGHSCORES
8180
lda levelControlMode
8281
cmp #4
8382
bne @notClearingHighscores
@@ -89,11 +88,15 @@ gameMode_levelMenu_processPlayer1Navigation:
8988
lda #0
9089
sta levelControlMode
9190
jsr resetScores
91+
.if SAVE_HIGHSCORES
92+
jsr detectSRAM
93+
beq @notResettingSavedScores
9294
jsr resetSavedScores
95+
@notResettingSavedScores:
96+
.endif
9397
jsr updateAudioWaitForNmiAndResetOamStaging
9498
jmp gameMode_levelMenu
9599
@notClearingHighscores:
96-
.endif
97100

98101
jsr levelControl
99102
jsr levelMenuRenderHearts
@@ -191,7 +194,6 @@ levelControl:
191194
.addr levelControlClearHighScores
192195
.addr levelControlClearHighScoresConfirm
193196

194-
.if SAVE_HIGHSCORES
195197
levelControlClearHighScores:
196198
lda #$20
197199
sta spriteXOffset
@@ -238,13 +240,7 @@ highScoreClearUpOrLeave:
238240
sta levelControlMode
239241
@ret:
240242
rts
241-
.else
242-
levelControlClearHighScores:
243-
levelControlClearHighScoresConfirm:
244-
lda #0
245-
sta levelControlMode
246-
rts
247-
.endif
243+
248244

249245
levelControlCustomLevel:
250246
jsr handleReadyInput
@@ -324,10 +320,7 @@ MAX_HEARTS := 7
324320
jsr @changeHearts
325321
@checkUpPressed:
326322

327-
.if SAVE_HIGHSCORES
328323
; to clear mode
329-
jsr detectSRAM
330-
beq @notClearMode
331324
lda newlyPressedButtons
332325
cmp #BUTTON_DOWN
333326
bne @notClearMode
@@ -336,7 +329,6 @@ MAX_HEARTS := 7
336329
lda #$3
337330
sta levelControlMode
338331
@notClearMode:
339-
.endif
340332

341333
; to normal mode
342334
lda newlyPressedButtons

0 commit comments

Comments
 (0)