Merge branch 'master' into darkmode_toggle

Author: kirjavascript

.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,20 +1,30 @@
 # Changelog
 
 ## [unreleased]
+* Crash Behaviours
 * Crunch Mode
 * Marathon Mode
 * Hidden Score Mode
 * Dark Mode
+* Low Stack Mode
 * M Score changed to Classic Scoring + Millions counter
 * Invisible linecap turns entire playfield invisible
 * Invisible mode preserves original piece colors
+* Added "negative delay" to the hz display
+* 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
-* Block Tool pieces wrap around
-* 0001 seeds are ignored
+* Fixed piece skip when doing Sonic Drop then Hard Drop immediately
+* Fixed storage bug for push down points
+* Fixed crashes in garbage mode 4
+* Fixed line clearing happening on pause
+* Fixed PAL colours
+* Keep hz display enabled when topped out
 * Famicom Keyboard support
 * MMC3 Support
 * MMC5 Support

README.md

@@ -16,12 +16,10 @@
     * [Setups](#setups)
     * [B-Type](#b-type)
     * [Floor](#floor)
-    * [Crunch](#crunch)
     * [(Quick)Tap](#quicktap)
     * [Tap Quantity](#tap-quantity)
     * [Checkerboard](#checkerboard)
     * [Transition](#transition)
-    * [Marathon](#marathon)
     * [Garbage](#garbage)
     * [Drought](#drought)
     * [DAS Delay](#das-delay)
@@ -76,7 +74,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
 
@@ -154,16 +152,6 @@ Fill in the floor to a certain height to force higher stacking. This mode is oft
 
 Setting the height to zero will result in a game mode with burns disabled.
 
-### Crunch
-
-![Crunch](./assets/screens/crunch.png)
-
-Shrink the width of the playfield to force cramped stacking.
-
-Every increment of 4 will decrease the width from the left.
-
-Every increment of 1 will decrease the width from the right until it reaches its maximum of 3, where it will be reset to 0.
-
 ### (Quick)Tap
 
 ![Tap](./assets/screens/tap.png)
@@ -194,10 +182,6 @@ Puts you ten lines before transition. The value given will be added to your scor
 
 Setting the value to G causes the mode to act identical to the game genie code `SXTOKL`
 
-### 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.
-
 ### Garbage
 
 ![Garbage](./assets/screens/garbage.png)

assets/screens/lowstack.png

@@ -1,7 +1,6 @@
 const fs = require('fs');
 const path = require('path');
 const crypto = require('crypto');
-const { spawnSync } = require('child_process');
 
 console.log('TetrisGYM buildscript');
 console.time('build');
@@ -117,7 +116,10 @@ console.timeEnd('CHR');
 
 // build object files
 
-function handleSpawn(exe, ...args) {
+const { spawnSync } = require('child_process');
+
+function exec(cmd) {
+    const [exe, ...args] = cmd.split(' ');
     const output = spawnSync(exe, args).output.flatMap(
         (d) => d?.toString() || [],
     );
@@ -127,36 +129,23 @@ function handleSpawn(exe, ...args) {
     }
 }
 
-const ca65bin = nativeCC65 ? ['ca65'] : ['node', './tools/assemble/ca65.js'];
+const ca65bin = nativeCC65 ? 'ca65' : 'node ./tools/assemble/ca65.js';
+const flags = compileFlags.join(' ');
 
 console.time('assemble');
 
-handleSpawn(
-    ...ca65bin,
-    ...compileFlags,
-    ...'-g src/header.asm -o header.o'.split(' '),
-);
-
-handleSpawn(
-    ...ca65bin,
-    ...compileFlags,
-    ...'-l tetris.lst -g src/main.asm -o main.o'.split(' '),
-);
+exec(`${ca65bin} ${flags} -g src/header.asm -o header.o`);
+exec(`${ca65bin} ${flags} -l tetris.lst -g src/main.asm -o main.o`);
 
 console.timeEnd('assemble');
 
 // link object files
 
-const ld65bin = nativeCC65 ? ['ld65'] : ['node', './tools/assemble/ld65.js'];
+const ld65bin = nativeCC65 ? 'ld65' : 'node ./tools/assemble/ld65.js';
 
 console.time('link');
 
-handleSpawn(
-    ...ld65bin,
-    ...'-m tetris.map -Ln tetris.lbl --dbgfile tetris.dbg -o tetris.nes -C src/tetris.nes.cfg main.o header.o'.split(
-        ' ',
-    ),
-);
+exec(`${ld65bin} -m tetris.map -Ln tetris.lbl --dbgfile tetris.dbg -o tetris.nes -C src/tetris.nes.cfg main.o header.o`);
 
 console.timeEnd('link');
 
@@ -200,5 +189,5 @@ console.timeEnd('build');
 
 if (args.includes('-t')) {
     console.log('\nrunning tests');
-    handleSpawn('cargo', ...'run --release --manifest-path tests/Cargo.toml -- -t'.split(' '));
+    exec('cargo run --release --manifest-path tests/Cargo.toml -- -t');
 }

build.js

@@ -34,6 +34,7 @@ BTYPE_START_LINES := $25 ; bcd
 MENU_HIGHLIGHT_COLOR := $12 ; $12 in gym, $16 in original
 BLOCK_TILES := $7B
 EMPTY_TILE := $EF
+LOW_STACK_LINE := $DF
 TETRIMINO_X_HIDE := $EF
 
 PAUSE_SPRITE_X := $74
@@ -52,6 +53,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
@@ -70,11 +79,14 @@ MODE_CHECKERBOARD
 MODE_GARBAGE
 MODE_DROUGHT
 MODE_DAS
+MODE_LOWSTACK
 MODE_KILLX2
 MODE_INVISIBLE
 MODE_HARDDROP
 MODE_SPEED_TEST
 MODE_SCORE_DISPLAY
+MODE_CRASH
+MODE_STRICT
 MODE_HZ_DISPLAY
 MODE_INPUT_DISPLAY
 MODE_DISABLE_FLASH
@@ -103,11 +115,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 := $98
 MENU_TOP_MARGIN_SCROLL := 7 ; in blocks
 
 ; menuConfigSizeLookup
@@ -124,17 +141,20 @@ 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
     .byte $12   ; MODE_DROUGHT
     .byte $10   ; MODE_DAS
+    .byte $0F   ; MODE_LOWSTACK
     .byte $0    ; MODE_KILLX2
     .byte $0    ; MODE_INVISIBLE
     .byte $0    ; MODE_HARDDROP
     .byte $0    ; MODE_SPEED_TEST
     .byte $5    ; MODE_SCORE_DISPLAY
+    .byte $3	; MODE_CRASH
+    .byte $1	; MODE_STRICT
     .byte $1    ; MODE_HZ_DISPLAY
     .byte $1    ; MODE_INPUT_DISPLAY
     .byte $1    ; MODE_DISABLE_FLASH
@@ -166,6 +186,7 @@ MENU_TOP_MARGIN_SCROLL := 7 ; in blocks
     .byte   "GARBGE"
     .byte   "LOBARS"
     .byte   "DASDLY"
+    .byte   "LOWSTK"
     .byte   "KILLX2"
     .byte   "INVZBL"
     .byte   "HRDDRP"

src/chr/game_tileset.png

@@ -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/constants.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