Merge branch 'lowstack_chr' into lowstack

Author: zohassadar

.gitignore

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

@@ -1,6 +1,7 @@
 # Changelog
 
 ## [unreleased]
+* Crash Behaviours
 * Crunch Mode
 * Marathon Mode
 * Hidden Score Mode
@@ -13,7 +14,9 @@
 * 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
 * Famicom Keyboard support
 * MMC3 Support

README.md

@@ -77,7 +77,7 @@ Like in the original ROM, holding `a` `b` `select` and then pressing `start` wil
 
 ![Tetris](./assets/screens/levelmenu.png)
 
-Same gameplay as A-Type, with some improvements: no score cap, no rocket, no curtain, no music, always next box, better pause, start on any level.
+Same gameplay as A-Type, with some improvements: no score cap, no rocket, no curtain, no music, better pause, start on any level.
 
 ### T-Spins
 
@@ -197,7 +197,11 @@ Setting the value to G causes the mode to act identical to the game genie code `
 
 ### Marathon
 
-Play as long as you are able to survive at a consistent speed.  While the level will increase normally, the drop rate and the points rewarded will remain fixed based on the starting level.
+Play as long as you are able to survive at a consistent speed.
+
+0. Level transitions do not happen, game remains on the same level for as long as you are able to survive.
+1. Levels will transition normally, but speed and points will remain fixed based on your starting level.
+2. Similar to 1, speed and points will remain fixed based on the starting level you choose, but actual game will begin at level 0.
 
 ### Garbage
 

src/constants.asm

@@ -77,6 +77,7 @@ MODE_INVISIBLE
 MODE_HARDDROP
 MODE_SPEED_TEST
 MODE_SCORE_DISPLAY
+MODE_CRASH
 MODE_HZ_DISPLAY
 MODE_INPUT_DISPLAY
 MODE_DISABLE_FLASH
@@ -104,11 +105,16 @@ LINECAP_FLOOR := 2
 LINECAP_INVISIBLE := 3
 LINECAP_HALT := 4
 
+CRASH_SHOW := 0
+CRASH_TOPOUT := 1
+CRASH_CRASH := 2
+CRASH_OFF := 3
+
 LINECAP_WHEN_STRING_OFFSET := $10
 LINECAP_HOW_STRING_OFFSET := $12
 
 MENU_SPRITE_Y_BASE := $47
-MENU_MAX_Y_SCROLL := $78
+MENU_MAX_Y_SCROLL := $80
 MENU_TOP_MARGIN_SCROLL := 7 ; in blocks
 
 ; menuConfigSizeLookup
@@ -125,7 +131,7 @@ MENU_TOP_MARGIN_SCROLL := 7 ; in blocks
     .byte $F    ; MODE_CRUNCH
     .byte $20   ; MODE_TAP
     .byte $10   ; MODE_TRANSITION
-    .byte $0    ; MODE_MARATHON
+    .byte $2    ; MODE_MARATHON
     .byte $1F   ; MODE_TAPQTY
     .byte $8    ; MODE_CHECKERBOARD
     .byte $4    ; MODE_GARBAGE
@@ -137,6 +143,7 @@ MENU_TOP_MARGIN_SCROLL := 7 ; in blocks
     .byte $0    ; MODE_HARDDROP
     .byte $0    ; MODE_SPEED_TEST
     .byte $5    ; MODE_SCORE_DISPLAY
+    .byte $3	; MODE_CRASH
     .byte $1    ; MODE_HZ_DISPLAY
     .byte $1    ; MODE_INPUT_DISPLAY
     .byte $1    ; MODE_DISABLE_FLASH

src/gamemode/gametypemenu/menu.asm

@@ -9,7 +9,7 @@ gameMode_gameTypeMenu:
         jsr calc_menuScrollY
         sta menuScrollY
         lda #0
-        sta displayNextPiece
+        sta hideNextPiece
         RESET_MMC1
 .if HAS_MMC
         ; switch to blank charmap
@@ -488,15 +488,16 @@ menuYTmp := tmp2
         cmp #MODE_SCORE_DISPLAY
         beq @renderScoreName
 
+        cmp #MODE_CRASH
+        beq @renderCrashMode
+
+
+        jsr menuItemY16Offset
+        bne @loopNext
+        txa
+
         ldx oamStagingLength
 
-        ; get Y offset
-        lda menuCounter
-        asl
-        asl
-        asl
-        adc #MENU_SPRITE_Y_BASE + 1
-        sbc menuScrollY
         sta oamStaging, x
         inx
         lda menuVars, y
@@ -547,6 +548,26 @@ menuYTmp := tmp2
         jsr stringSpriteAlignRight
         jmp @loopNext
 
+@renderCrashMode:
+        jsr menuItemY16Offset
+        bne @loopNext
+@doRender:
+        lda crashModifier
+        cmp #CRASH_OFF
+        bne @notOff
+        lda #$F1
+@notOff:
+        adc #$16
+        sta spriteIndexInOamContentLookup
+        lda #(MODE_CRASH*8) + MENU_SPRITE_Y_BASE + 1
+        sec
+        sbc menuScrollY
+        sta spriteYOffset
+        lda #$e9
+        sta spriteXOffset
+        jsr stringSpriteAlignRight
+        jmp @loopNext
+
 ; <- menu item index in A
 ; -> high byte of offset in A
 ; -> low byte in X

src/gamemode/levelmenu.asm

@@ -132,6 +132,14 @@ levelMenuCheckStartGame:
         sta startLevel
 @startGame:
         ; lda startLevel
+        ldy practiseType
+        cpy #MODE_MARATHON
+        bne @noLevelModification
+        ldy marathonModifier
+        cpy #2 ; marathon mode 2 starts at level 0
+        bne @noLevelModification
+        lda #0
+@noLevelModification:
         sta levelNumber
         lda #$00
         sta gameModeState
@@ -157,16 +165,14 @@ levelMenuCheckGoBack:
 shredSeedAndContinue:
         ; seed shredder
 @chooseRandomHole_player1:
-        ldx #$17
-        ldy #$02
+        ldx #rng_seed
         jsr generateNextPseudorandomNumber
         lda rng_seed
         and #$0F
         cmp #$0A
         bpl @chooseRandomHole_player1
 @chooseRandomHole_player2:
-        ldx #$17
-        ldy #$02
+        ldx #rng_seed
         jsr generateNextPseudorandomNumber
         lda rng_seed
         and #$0F

src/gamemodestate/initstate.asm

@@ -13,6 +13,11 @@ gameModeState_initGameState:
         lda #$05
         sta tetriminoX
 
+        ;init for crash frame parity
+        lda frameCounter
+        and #$01
+        sta startParity
+
         ; set seed init
         lda set_seed_input
         sta set_seed
@@ -98,7 +103,6 @@ gameModeState_initGameState:
         sta currentPiece
         jsr incrementPieceStat
         ldx #rng_seed
-        ldy #$02
         jsr generateNextPseudorandomNumber
         jsr chooseNextTetrimino
         sta nextPiece
@@ -264,8 +268,7 @@ L87E7:  lda generalCounter
         sta vramRow
         lda #$09
         sta generalCounter3
-L87FC:  ldx #$17
-        ldy #$02
+L87FC:  ldx #rng_seed
         jsr generateNextPseudorandomNumber
         lda rng_seed
         and #$07
@@ -284,8 +287,7 @@ L87FC:  ldx #$17
         dec generalCounter3
         jmp L87FC
 
-L8824:  ldx #$17
-        ldy #$02
+L8824:  ldx #rng_seed
         jsr generateNextPseudorandomNumber
         lda rng_seed
         and #$0F

src/gamemodestate/updatecounters.asm

@@ -6,10 +6,10 @@ gameModeState_updateCountersAndNonPlayerState:
         ; next code makes acc behave as normal
         ; (dont edit unless you know what you're doing)
         lda newlyPressedButtons_player1
-        and #$20
+        and #BUTTON_SELECT
         beq @ret
-        lda displayNextPiece
+        lda hideNextPiece
         eor #$01
-        sta displayNextPiece
+        sta hideNextPiece
 @ret:   inc gameModeState ; 3
         rts

src/modes/tspins.asm

@@ -70,7 +70,6 @@ advanceGameTSpins_actual:
 
 generateNewTSpin:
         ldx #rng_seed
-        ldy #$2
         jsr generateNextPseudorandomNumber
         lda rng_seed
         tax

src/nametables/enter_high_score.js

@@ -1,14 +1,13 @@
 const {
-    readStripe,
     writeRLE,
-    printNT,
+    blankNT,
     drawTiles,
     drawAttrs,
     flatLookup,
 } = require('./nametables');
 
 
-const buffer = readStripe(__dirname + '/enter_high_score_nametable.bin');
+const buffer = blankNT();
 
 let lookup = flatLookup(`
 0123456789ABCDEF
@@ -29,41 +28,37 @@ ui!###g@######()
 ###############
 `);
 
-lookup = [...lookup].map((d, i) => d === '#' ? String.fromCharCode(9472 + i) : d).join``;
-
-printNT(buffer, lookup);
-
 drawTiles(buffer, lookup, `
-################################
-#qwwwwwwwwwwwwwwwwwwwwwwwwwwwwe#
-#a                            d#
-#a                            d#
-#a                            d#
-#a                            d#
-#a         GOOD GAME          d#
-#a                            d#
-#a                            d#
-#a                            d#
-#a         YOU ARE A          d#
-#a                            d#
-#a       TETRIS MASTER#       d#
-#a                            d#
-#a                            d#
-#a   PLEASE ENTER YOUR NAME   d#
-#a                            d#
-#a rtttttttttttttttttttttttty d#
-#a fNAME     SCORE   LNS  LVh d#
-#a jbbbbbbbbbbbbbbbbbbbbbbbbl d#
-#a f                        h d#
-#a f                        h d#
-#a f                        h d#
-#a f                        h d#
-#a f                        h d#
-#a f                        h d#
-#a vbbbbbbbbbbbbbbbbbbbbbbbbn d#
-#a                            d#
-#zxxxxxxxxxxxxxxxxxxxxxxxxxxxxc#
-################################
+╲▂╢╢╢▀░▀╃▃╢╲╠╡▂▐▃╲▐▁▃▂╢▂╢╲╢▀▁▁▃╲
+╲qwwwwwwwwwwwwwwwwwwwwwwwwwwwwe□
+▂a                            d╢
+▀a                            d□
+╢a                            d╢
+╂a                            d□
+▂a         GOOD GAME          d▀
+╢a                            d╡
+╀a                            d╱
+▂a                            d▀
+╠a         YOU ARE A          d▃
+╰a                            d▃
+╠a       TETRIS MASTER.       d╢
+╰a                            d╀
+▀a                            d▂
+╢a   PLEASE ENTER YOUR NAME   d╢
+╀a                            d╲
+▂a rtttttttttttttttttttttttty d╲
+▃a fNAME     SCORE   LNS  LVh d▂
+▀a jbbbbbbbbbbbbbbbbbbbbbbbbl d▀
+▀a f                        h d▃
+▐a f                        h d▀
+╲a f                        h d▃
+▂a f                        h d▀
+▃a f                        h d▀
+▀a f                        h d╡
+▀a vbbbbbbbbbbbbbbbbbbbbbbbbn d╱
+▁a                            d╢
+╠zxxxxxxxxxxxxxxxxxxxxxxxxxxxxc□
+╰╱╰╱▐▃▀▁□╲■▁▃▂╀▃▂▀╂╀▃▀░▀╂╲╢╰╱╲▂╢
 `);
 
 drawAttrs(buffer, [`