Merge branch 'master' into mapper_edit

Author: zohassadar

CHANGELOG.md

@@ -8,15 +8,19 @@
 * 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 ingame score display at 8/9 million with Classic Scoring](https://www.youtube.com/watch?v=fYdXky2i5AE)
 * 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
+* Fixed crashes in garbage mode 4
+* Fixed line clearing happening on pause
+* Fixed PAL level 181 colour
 * Famicom Keyboard support
 * Autodetect MMC1/CNROM
 * NROM Support

src/constants.asm

@@ -54,6 +54,14 @@ 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_DEBUG = $08
+RENDER_HZ = $10
+RENDER_STATS = $40
+RENDER_HIGH_SCORE_LETTER = $80
+
 .enum
 MODE_TETRIS
 MODE_TSPINS

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:

src/gamemode/levelmenu.asm

@@ -24,9 +24,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
@@ -295,9 +295,9 @@ levelControlCustomLevel:
 @changeLevel:
         lda #$1
         sta soundEffectSlot1Init
-        lda outOfDateRenderFlags
-        ora #$1
-        sta outOfDateRenderFlags
+        lda renderFlags
+        ora #RENDER_LINES
+        sta renderFlags
         rts
 
 levelControlHearts:

src/gamemode/speedtest.asm

@@ -58,8 +58,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

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

src/highscores/entry_screen.asm

@@ -274,8 +274,8 @@ highScoreEntryScreen:
         tax
         lda highscores,x
         sta highScoreEntryCurrentLetter
-        lda #$80
-        sta outOfDateRenderFlags
+        lda #RENDER_HIGH_SCORE_LETTER
+        sta renderFlags
         jsr updateAudioWaitForNmiAndResetOamStaging
         jmp @renderFrame
 

src/main.asm

@@ -12,6 +12,7 @@
 .include "chr.asm"
 
 .setcpu "6502"
+.feature force_range
 
 .segment    "PRG_chunk1": absolute
 
@@ -49,7 +50,6 @@ 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"
@@ -59,8 +59,9 @@ mainLoop:
 .include "util/autodetect.asm"
 .endif
 
-.include "sprites/loadsprite.asm"
+.include "sprites/bytesprite.asm"
 .include "sprites/drawrect.asm"
+.include "sprites/loadsprite.asm"
 .include "sprites/piece.asm"
 
 .include "data/bytebcd.asm"

src/modes/debug.asm

@@ -300,9 +300,9 @@ renderStateGameplay:
         rts
 
 renderDebugSaveSlot:
-        lda pausedOutOfDateRenderFlags
-        ora #$2
-        sta pausedOutOfDateRenderFlags
+        lda renderFlags
+        ora #RENDER_DEBUG
+        sta renderFlags
         rts
 
 renderDebugHUD:

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: