merged

Author: kirjavascript

.gitignore

@@ -4,9 +4,15 @@
 *.o
 *.chr
 *.pyc
+*.bin
 tetris.lst
 tetris.lbl
 tetris.map
 tetris.dbg
 release/*
 target
+
+!src/nametables/enter_high_score_nametable.bin
+!src/nametables/game_nametable.bin
+!src/nametables/game_type_menu_nametable.bin
+!src/nametables/level_menu_nametable.bin

CHANGELOG.md

@@ -4,20 +4,21 @@
 * Crash Detection / Simulation
 * Crunch Mode
 * Marathon Mode
-* Added hidden score option
-* Famicom Keyboard support
-* MMC3 Support
-* MMC5 Support
+* Hidden Score Mode
+* M Score changed to Classic Scoring + Millions counter
 * Invisible linecap turns entire playfield invisible
 * Invisible mode preserves original piece colors
 * 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 ingame score display at 8 million with Classic Scoring
 * Block Tool pieces wrap around
 * Always Next Box removed
 * 0001 seeds are ignored
+* Famicom Keyboard support
+* MMC3 Support
+* MMC5 Support
 
 ## [v5 tournament]
 * Linecap Menu (from CTM Masters September 2022)

src/constants.asm

@@ -38,7 +38,7 @@ TETRIMINO_X_HIDE := $EF
 
 PAUSE_SPRITE_X := $74
 PAUSE_SPRITE_Y := $58
-; yobi-style
+; jazzthief-style
 ; PAUSE_SPRITE_X := $C4
 ; PAUSE_SPRITE_Y := $16
 

src/gamemode/gametypemenu/menu.asm

@@ -232,7 +232,6 @@ seedControls:
         jmp @skipSeedDown
 @lowNybbleDown:
         lda set_seed_input, x
-        clc
         tay
         and #$F
         ; cmp #$0 ; and sets z flag
@@ -245,6 +244,7 @@ seedControls:
         jmp @skipSeedDown
 @noWrapDown:
         tya
+        sec
         sbc #1
         sta set_seed_input, x
 @skipSeedDown:

src/gamemodestate/initstate.asm

@@ -45,6 +45,15 @@ gameModeState_initGameState:
         sta linecapState
         sta dasOnlyShiftDisabled
         sta invisibleFlag
+        sta currentFloor
+
+; initialize currentFloor if necessary
+        lda practiseType
+        cmp #MODE_FLOOR
+        bne @notFloor
+        lda floorModifier
+        sta currentFloor
+@notFloor:
 
         lda practiseType
         cmp #MODE_INVISIBLE

src/modes/floor.asm

@@ -1,5 +1,5 @@
 advanceGameFloor:
-        lda floorModifier
+        lda currentFloor
 drawFloor:
         ; get correct offset
         sta tmp1