Merge branch 'master' into mmc5

Author: zohassadar

CHANGELOG.md

@@ -11,6 +11,7 @@
 * Fixed CNROM legal screen CHR bank
 * Fixed CNROM legal to title flicker
 * Block Tool pieces wrap around
+* Added hidden score option
 
 ## [v5 tournament]
 * Linecap Menu (from CTM Masters September 2022)

README.md

@@ -306,6 +306,12 @@ __Capped__
 
 Cap your score at 999999.
 
+__Hidden__
+
+![Hidden](./assets/screens/score-hidden.png)
+
+Hides score until game over.
+
 ## Hz Display
 
 ![Hz Display](./assets/screens/hz.png)

assets/screens/score-hidden.png

@@ -94,6 +94,7 @@ SCORING_LETTERS := 1
 SCORING_SEVENDIGIT := 2
 SCORING_FLOAT := 3
 SCORING_SCORECAP := 4
+SCORING_HIDDEN := 5
 
 LINECAP_KILLX2 := 1
 LINECAP_FLOOR := 2
@@ -130,7 +131,7 @@ MENU_TOP_MARGIN_SCROLL := 7 ; in blocks
     .byte $0    ; MODE_INVISIBLE
     .byte $0    ; MODE_HARDDROP
     .byte $0    ; MODE_SPEED_TEST
-    .byte $4    ; MODE_SCORE_DISPLAY
+    .byte $5    ; MODE_SCORE_DISPLAY
     .byte $1    ; MODE_HZ_DISPLAY
     .byte $1    ; MODE_INPUT_DISPLAY
     .byte $1    ; MODE_DISABLE_FLASH

src/constants.asm

@@ -84,7 +84,19 @@ scoringBackground:
         sta PPUADDR
         lda #$16
         sta PPUDATA
+        jmp @noSevenDigit
 @noFloat:
+        cmp #SCORING_HIDDEN
+        bne @notHidden
+        jsr scoreSetupPPU
+        lda #$FF
+        ldx #$6
+@hiddenScoreLoop:
+        sta PPUDATA
+        dex
+        bne @hiddenScoreLoop
+        jmp @noSevenDigit
+@notHidden:
         cmp #SCORING_SEVENDIGIT
         bne @noSevenDigit
         jsr bulkCopyToPpu

src/gamemodestate/initbackground.asm

@@ -91,6 +91,13 @@ render_mode_play_and_demo:
 
         ; scorecap
         lda scoringModifier
+        cmp #SCORING_HIDDEN
+        bne @notHidden
+        lda playState
+        cmp #$0A
+        beq @noFloat ; render classic score at game over
+        jmp @clearScoreRenderFlags
+@notHidden:
         cmp #SCORING_SCORECAP
         bne @noScoreCap
         jsr renderScoreCap

src/nmi/render_mode_play_and_demo.asm

@@ -2,6 +2,9 @@ playState_lockTetrimino:
         jsr isPositionValid
         beq @notGameOver
 ; gameOver:
+        lda outOfDateRenderFlags ; Flag needed to reveal hidden score
+        ora #$04
+        sta outOfDateRenderFlags
         lda #$02
         sta soundEffectSlot0Init
         lda #$0A ; playState_checkStartGameOver

src/playstate/lock.asm

@@ -80,10 +80,13 @@ typeBEndingStuffEnd:
         lda #$4
         sta soundEffectSlot1Init
 
-        lda #$30
-        jsr sleep_gameplay_nextSprite
+        lda outOfDateRenderFlags ; Flag needed to reveal hidden score
+        ora #$4
+        sta outOfDateRenderFlags
         lda #$0A ; playState_checkStartGameOver
         sta playState
+        lda #$30
+        jsr sleep_gameplay_nextSprite
         rts
 
 sleep_gameplay_nextSprite:

src/playstate/preparenext.asm

@@ -75,9 +75,9 @@ stringLookup:
         .byte stringSevenDigit-stringLookup
         .byte stringFloat-stringLookup
         .byte stringScorecap-stringLookup
+        .byte stringHidden-stringLookup
         .byte stringNull-stringLookup ; reserved for future use
         .byte stringNull-stringLookup
-        .byte stringNull-stringLookup
         .byte stringOff-stringLookup ; 8
         .byte stringOn-stringLookup
         .byte stringPause-stringLookup
@@ -102,6 +102,8 @@ stringFloat:
         .byte $1,'M'
 stringScorecap:
         .byte $6,'C','A','P','P','E','D'
+stringHidden:
+        .byte $6,'H','I','D','D','E','N'
 stringOff:
         .byte $3,'O','F','F'
 stringOn: