Merge branch 'master' into lowstack

zohassadar · web-flow · commit 94aaa09673b7 · 2024-03-17T16:55:48.000-07:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,15 +9,16 @@
 * M Score changed to Classic Scoring + Millions counter
 * Invisible linecap turns entire playfield invisible
 * Invisible mode preserves original piece colors
+* Block Tool pieces wrap around
+* Always Next Box removed
+* 0001 seeds are ignored
 * Floor no longer gobbled up by top line clear
 * Floor 0 has original no-burns behaviour again
 * Fixed ingame score display at 8 million with Classic Scoring
 * Fixed CNROM legal screen CHR bank
 * Fixed CNROM legal to title flicker
 * Fixed piece skip when doing Sonic Drop then Hard Drop immediately
-* Block Tool pieces wrap around
-* Always Next Box removed
-* 0001 seeds are ignored
+* Fixed storage bug for push down points
 * Famicom Keyboard support
 * MMC3 Support
 * MMC5 Support
diff --git a/src/constants.asm b/src/constants.asm
@@ -53,6 +53,13 @@ BUTTON_SELECT := $20
 BUTTON_START := $10
 BUTTON_DPAD := BUTTON_UP | BUTTON_DOWN | BUTTON_LEFT | BUTTON_RIGHT
 
+RENDER_LINES = $01
+RENDER_LEVEL = $02
+RENDER_SCORE = $04
+RENDER_HZ = $10
+RENDER_STATS = $40
+RENDER_HIGH_SCORE_LETTER = $80
+
 .enum
 MODE_TETRIS
 MODE_TSPINS
diff --git a/src/gamemode/gametypemenu/linecap.asm b/src/gamemode/gametypemenu/linecap.asm
@@ -11,8 +11,8 @@ linecapMenuCursorIndices := 3
         jsr bulkCopyToPpu
         .addr linecapMenuNametable
 
-        lda #1
-        sta outOfDateRenderFlags
+        lda #RENDER_LINES
+        sta renderFlags
 
         lda #$02
         sta soundEffectSlot1Init
@@ -115,8 +115,8 @@ linecapMenuControlsWhen:
         beq @ret
         lda #$01
         sta soundEffectSlot1Init
-        lda #1
-        sta outOfDateRenderFlags
+        lda #RENDER_LINES
+        sta renderFlags
         lda linecapWhen
         eor #1
         sta linecapWhen
@@ -153,8 +153,8 @@ linecapMenuControlsAdjLevel:
 linecapMenuControlsBoopAndRender:
         lda #$01
         sta soundEffectSlot1Init
-        lda #1
-        sta outOfDateRenderFlags
+        lda #RENDER_LINES
+        sta renderFlags
         rts
 
 linecapMenuControlsAdjLinesUp:
diff --git a/src/gamemode/levelmenu.asm b/src/gamemode/levelmenu.asm
@@ -30,9 +30,9 @@ gameMode_levelMenu:
         beq @noLinecapInfo
         jsr levelMenuLinecapInfo
 @noLinecapInfo:
-        ; render level when loading screen
-        lda #$1
-        sta outOfDateRenderFlags
+        ; render lines when loading screen
+        lda #RENDER_LINES
+        sta renderFlags
         jsr resetScroll
         jsr waitForVBlankAndEnableNmi
         jsr updateAudioWaitForNmiAndResetOamStaging
@@ -301,9 +301,9 @@ levelControlCustomLevel:
 @changeLevel:
         lda #$1
         sta soundEffectSlot1Init
-        lda outOfDateRenderFlags
-        ora #$1
-        sta outOfDateRenderFlags
+        lda renderFlags
+        ora #RENDER_LINES
+        sta renderFlags
         rts
 
 levelControlHearts:
diff --git a/src/gamemode/speedtest.asm b/src/gamemode/speedtest.asm
@@ -62,8 +62,8 @@ speedTestControl:
         lda heldButtons_player1
         and #BUTTON_LEFT+BUTTON_RIGHT+BUTTON_B+BUTTON_A
         beq @noupdate
-        lda #$10
-        sta outOfDateRenderFlags
+        lda #RENDER_HZ
+        sta renderFlags
         lda newlyPressedButtons_player1
         and #BUTTON_LEFT+BUTTON_RIGHT
         beq @noupdate
diff --git a/src/gamemodestate/initstate.asm b/src/gamemodestate/initstate.asm
@@ -88,6 +88,7 @@ gameModeState_initGameState:
         sta demo_repeats
         sta demoIndex
         sta demoButtonsAddr
+        sta holdDownPoints
         sta spawnID
         lda #>demoButtonsTable
         sta demoButtonsAddr+1
@@ -137,8 +138,8 @@ gameModeState_initGameState:
         jsr presetScoreFromBCD
 @noChecker:
 
-        lda #$57
-        sta outOfDateRenderFlags
+        lda #RENDER_STATS|RENDER_HZ|RENDER_SCORE|RENDER_LEVEL|RENDER_LINES
+        sta renderFlags
         jsr updateAudioWaitForNmiAndResetOamStaging
 
         lda practiseType
diff --git a/src/gamemodestate/pause.asm b/src/gamemodestate/pause.asm
@@ -30,8 +30,6 @@ pause:
 @pauseSetupClassic:
         lda #$16
         sta PPUMASK
-        jmp @pauseSetupPart2
-
 @pauseSetupNotClassic:
         lda #$04 ; render_mode_pause
         sta renderMode
diff --git a/src/highscores/entry_screen.asm b/src/highscores/entry_screen.asm
@@ -279,8 +279,8 @@ highScoreEntryScreen:
         tax
         lda highscores,x
         sta highScoreEntryCurrentLetter
-        lda #$80
-        sta outOfDateRenderFlags
+        lda #RENDER_HIGH_SCORE_LETTER
+        sta renderFlags
         jsr updateAudioWaitForNmiAndResetOamStaging
         jmp @renderFrame
 
diff --git a/src/main.asm b/src/main.asm
@@ -12,6 +12,7 @@
 .include "chr.asm"
 
 .setcpu "6502"
+.feature force_range
 
 .segment    "PRG_chunk1": absolute
 
@@ -49,14 +50,14 @@ mainLoop:
 .include "highscores/entry_screen.asm"
 
 .include "util/core.asm"
-.include "util/bytesprite.asm"
 .include "util/strings.asm"
 .include "util/math.asm"
 .include "util/menuthrottle.asm"
 .include "util/modetext.asm"
 
-.include "sprites/loadsprite.asm"
+.include "sprites/bytesprite.asm"
 .include "sprites/drawrect.asm"
+.include "sprites/loadsprite.asm"
 .include "sprites/piece.asm"
 
 .include "data/bytebcd.asm"
diff --git a/src/modes/debug.asm b/src/modes/debug.asm
@@ -300,9 +300,9 @@ renderStateGameplay:
         rts
 
 renderDebugSaveSlot:
-        lda pausedOutOfDateRenderFlags
+        lda pausedrenderFlags
         ora #$2
-        sta pausedOutOfDateRenderFlags
+        sta pausedrenderFlags
         rts
 
 renderDebugHUD:
diff --git a/src/modes/hz.asm b/src/modes/hz.asm
@@ -178,9 +178,9 @@ hzTap:
 @calcEnd:
 
         ; update game UI
-        lda outOfDateRenderFlags
-        ora #$10 ; @renderHz
-        sta outOfDateRenderFlags
+        lda renderFlags
+        ora #RENDER_HZ
+        sta renderFlags
         rts
 
 dasLimitLookup:
diff --git a/src/modes/saveslots.asm b/src/modes/saveslots.asm
@@ -110,7 +110,7 @@ loadState:
         ; sta score+2
         ; ; mark for update
         ; lda #7
-        ; sta outOfDateRenderFlags
+        ; sta renderFlags
 
         lda #$18
         sta saveStateSpriteType
diff --git a/src/modes/tspins.asm b/src/modes/tspins.asm
@@ -24,9 +24,9 @@ advanceGameTSpins:
 
         jsr clearPoints
 
-        lda outOfDateRenderFlags
-        ora #$04
-        sta outOfDateRenderFlags
+        lda renderFlags
+        ora #RENDER_SCORE
+        sta renderFlags
 @continue:
 
 advanceGameTSpins_actual:
diff --git a/src/nmi/render_mode_congratulations_screen.asm b/src/nmi/render_mode_congratulations_screen.asm
@@ -1,6 +1,6 @@
 render_mode_congratulations_screen:
-        lda outOfDateRenderFlags
-        and #$80
+        lda renderFlags
+        and #RENDER_HIGH_SCORE_LETTER
         beq @ret
         lda highScoreEntryRawPos
         asl a
@@ -19,7 +19,8 @@ render_mode_congratulations_screen:
         ldx highScoreEntryCurrentLetter
         lda highScoreCharToTile,x
         sta PPUDATA
-        sta outOfDateRenderFlags
+        lda #0
+        sta renderFlags
 @ret:
         jsr resetScroll
         rts
diff --git a/src/nmi/render_mode_level_menu.asm b/src/nmi/render_mode_level_menu.asm
@@ -1,6 +1,6 @@
 render_mode_level_menu:
-        lda outOfDateRenderFlags
-        and #1
+        lda renderFlags
+        and #RENDER_LINES
         beq @noCustomLevel
         lda #$21
         sta PPUADDR
@@ -9,5 +9,5 @@ render_mode_level_menu:
         lda customLevel
         jsr renderByteBCD
         lda #0
-        sta outOfDateRenderFlags
+        sta renderFlags
 @noCustomLevel:
diff --git a/src/nmi/render_mode_linecap.asm b/src/nmi/render_mode_linecap.asm
@@ -1,10 +1,10 @@
 render_mode_linecap_menu:
-        lda outOfDateRenderFlags
-        and #1
+        lda renderFlags
+        and #RENDER_LINES
         beq @static
         ; render level / lines
         lda #0
-        sta outOfDateRenderFlags
+        sta renderFlags
         lda #$21
         sta PPUADDR
         lda #$F3
diff --git a/src/nmi/render_mode_pause.asm b/src/nmi/render_mode_pause.asm
@@ -1,11 +1,11 @@
 render_mode_pause:
-        lda pausedOutOfDateRenderFlags
+        lda pausedrenderFlags
         and #$02
         beq @skipSaveSlotPatch
         jsr saveSlotNametablePatch
 @skipSaveSlotPatch:
         lda #0
-        sta pausedOutOfDateRenderFlags
+        sta pausedrenderFlags
 
         lda playState
         cmp #$04
diff --git a/src/nmi/render_mode_play_and_demo.asm b/src/nmi/render_mode_play_and_demo.asm
@@ -16,8 +16,8 @@ render_mode_play_and_demo:
         lda scoringModifier
         bne @modernLines
 
-        lda outOfDateRenderFlags
-        and #$01
+        lda renderFlags
+        and #RENDER_LINES
         beq @renderLevel
 
         ldx #linesPrev-lines
@@ -39,13 +39,13 @@ render_mode_play_and_demo:
 @modernLines:
         jsr renderModernLines
 @doneRenderingLines:
-        lda outOfDateRenderFlags
-        and #$FE
-        sta outOfDateRenderFlags
+        lda renderFlags
+        and #~RENDER_LINES
+        sta renderFlags
 
 @renderLevel:
-        lda outOfDateRenderFlags
-        and #$02
+        lda renderFlags
+        and #RENDER_LEVEL
         beq @renderScore
 
         lda practiseType
@@ -84,13 +84,13 @@ render_mode_play_and_demo:
 
 @renderLevelEnd:
         jsr updatePaletteForLevel
-        lda outOfDateRenderFlags
-        and #$FD
-        sta outOfDateRenderFlags
+        lda renderFlags
+        and #~RENDER_LEVEL
+        sta renderFlags
 
 @renderScore:
-        lda outOfDateRenderFlags
-        and #$04
+        lda renderFlags
+        and #RENDER_SCORE
         beq @renderHz
 
         ; 8 safe tile writes freed from stats / hz
@@ -160,33 +160,33 @@ render_mode_play_and_demo:
         jsr renderClassicScore
 
 @clearScoreRenderFlags:
-        lda outOfDateRenderFlags
-        and #$FB
-        sta outOfDateRenderFlags
+        lda renderFlags
+        and #~RENDER_SCORE
+        sta renderFlags
 
 @renderHz:
         lda hzFlag
         beq @renderStats
-        lda outOfDateRenderFlags
-        and #$10
+        lda renderFlags
+        and #RENDER_HZ
         beq @renderStatsHz
         jsr renderHz
-        lda outOfDateRenderFlags
-        and #$EF
-        sta outOfDateRenderFlags
+        lda renderFlags
+        and #~RENDER_HZ
+        sta renderFlags
 
         ; run a patched version of the stats
 @renderStatsHz:
-        lda outOfDateRenderFlags
-        and #$40
+        lda renderFlags
+        and #RENDER_STATS
         beq @renderTetrisFlashAndSound
         lda #$06
         sta tmpCurrentPiece
         jmp @renderPieceStat
 
 @renderStats:
-        lda outOfDateRenderFlags
-        and #$40
+        lda renderFlags
+        and #RENDER_STATS
         beq @renderTetrisFlashAndSound
         ldx currentPiece
         lda tetriminoTypeFromOrientation, x
@@ -203,9 +203,9 @@ render_mode_play_and_demo:
         sta PPUDATA
         lda statsByType,x
         jsr twoDigsToPPU
-        lda outOfDateRenderFlags
-        and #$BF
-        sta outOfDateRenderFlags
+        lda renderFlags
+        and #~RENDER_STATS
+        sta renderFlags
 @renderTetrisFlashAndSound:
         lda #$3F
         sta PPUADDR
@@ -395,7 +395,7 @@ incrementPieceStat:
         sta statsByType+1,x
 L9996:  lda generalCounter
         sta statsByType,x
-        lda outOfDateRenderFlags
-        ora #$40
-        sta outOfDateRenderFlags
+        lda renderFlags
+        ora #RENDER_STATS
+        sta renderFlags
         rts
diff --git a/src/nmi/render_mode_speed_test.asm b/src/nmi/render_mode_speed_test.asm
diff --git a/src/nmi/render_score.asm b/src/nmi/render_score.asm
diff --git a/src/playstate/lock.asm b/src/playstate/lock.asm
diff --git a/src/playstate/preparenext.asm b/src/playstate/preparenext.asm
diff --git a/src/playstate/updatestats.asm b/src/playstate/updatestats.asm
diff --git a/src/ram.asm b/src/ram.asm
diff --git a/src/sprites/bytesprite.asm b/src/sprites/bytesprite.asm
diff --git a/tests/src/garbage.rs b/tests/src/garbage.rs
diff --git a/tests/src/main.rs b/tests/src/main.rs
