Merge branch 'master' into mapper_edit

Author: zohassadar

CHANGELOG.md

@@ -5,9 +5,11 @@
 * Crunch Mode
 * Marathon Mode
 * Hidden Score 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
@@ -20,7 +22,8 @@
 * Fixed storage bug for push down points
 * Fixed crashes in garbage mode 4
 * Fixed line clearing happening on pause
-* Fixed PAL level 181 colour
+* Fixed PAL colours
+* Keep hz display enabled when topped out
 * Famicom Keyboard support
 * Autodetect MMC1/CNROM
 * NROM 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)
@@ -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,14 +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.
-
-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)

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');
@@ -125,7 +124,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() || [],
     );
@@ -135,36 +137,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');
 
@@ -208,5 +197,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

@@ -36,6 +36,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
@@ -80,12 +81,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
@@ -122,7 +125,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 := $98
 MENU_TOP_MARGIN_SCROLL := 7 ; in blocks
 
 ; menuConfigSizeLookup
@@ -145,12 +148,14 @@ MENU_TOP_MARGIN_SCROLL := 7 ; in blocks
     .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
@@ -181,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

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

src/constants.asm

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