Merge branch 'master' into lowstack

Author: kirjavascript

CHANGELOG.md

@@ -9,16 +9,21 @@
 * 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
 * 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)
@@ -155,16 +153,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)
@@ -195,14 +183,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.
-
-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
 
 ![Garbage](./assets/screens/garbage.png)

build.js

@@ -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');
 }

src/constants.asm

@@ -56,6 +56,7 @@ 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
@@ -85,6 +86,7 @@ MODE_HARDDROP
 MODE_SPEED_TEST
 MODE_SCORE_DISPLAY
 MODE_CRASH
+MODE_STRICT
 MODE_HZ_DISPLAY
 MODE_INPUT_DISPLAY
 MODE_DISABLE_FLASH
@@ -121,7 +123,7 @@ LINECAP_WHEN_STRING_OFFSET := $10
 LINECAP_HOW_STRING_OFFSET := $12
 
 MENU_SPRITE_Y_BASE := $47
-MENU_MAX_Y_SCROLL := $80
+MENU_MAX_Y_SCROLL := $90
 MENU_TOP_MARGIN_SCROLL := 7 ; in blocks
 
 ; menuConfigSizeLookup
@@ -151,6 +153,7 @@ MENU_TOP_MARGIN_SCROLL := 7 ; in blocks
     .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

src/gamemodestate/initstate.asm

@@ -149,6 +149,8 @@ gameModeState_initGameState:
 @noTypeBPlayfield:
 
         jsr hzStart
+        lda #0
+        sta hzSpawnDelay
         jsr practiseInitGameState
         jsr resetScroll
 

src/main.asm

@@ -75,6 +75,7 @@ mainLoop:
 .include "modes/pace.asm"
 .include "modes/debug.asm"
 .include "modes/saveslots.asm"
+.include "modes/crash.asm"
 
 .code