Merge branch 'master' of github.com:kirjavascript/TetrisGYM into readme_v6

Author: kirjavascript

CHANGELOG.md

@@ -5,9 +5,12 @@
 * 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
@@ -21,7 +24,10 @@
 * 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
+* Autodetect MMC1/CNROM
+* NROM Support
 * MMC3 Support
 * MMC5 Support
 

README.md

@@ -463,3 +463,4 @@ This project descends from the TAUS disassembly of NES Tetris and has been heavi
 
 * [https://github.com/ejona86/taus](https://github.com/ejona86/taus)  
 * [https://github.com/CelestialAmber/TetrisNESDisasm](https://github.com/CelestialAmber/TetrisNESDisasm)  
+* [https://github.com/pinobatch/holy-mapperel](https://github.com/pinobatch/holy-mapperel)

assets/screens/lowstack.png

@@ -6,10 +6,12 @@ console.log('TetrisGYM buildscript');
 console.time('build');
 
 const mappers = { // https://www.nesdev.org/wiki/Mapper
+    0: 'NROM',
     1: 'MMC1',
     3: 'CNROM',
     4: 'MMC3',
     5: 'MMC5',
+    1000: 'Autodetect MMC1/CNROM',
 };
 
 // options handling
@@ -25,6 +27,7 @@ if (args.includes('-h')) {
 -k  Famicom Keyboard support
 -w  force WASM compiler
 -c  force PNG to CHR conversion
+-o  override autodetect mmc1 header with cnrom
 -t  run tests (requires cargo)
 -h  you are here
 `);
@@ -47,7 +50,7 @@ console.log(`using ${nativeCC65 ? 'system' : 'wasm'} ca65/ld65`);
 
 // mapper options
 
-const mapper = args.find((d) => d.startsWith('-m'))?.slice(2) ?? 1;
+const mapper = args.find((d) => d.startsWith('-m'))?.slice(2) ?? 1000;
 
 if (!mappers[mapper]) {
     console.error(
@@ -79,6 +82,11 @@ if (args.includes('-s')) {
     console.log('highscore saving disabled');
 }
 
+if (args.includes('-o')) {
+    compileFlags.push('-D', 'CNROM_OVERRIDE=1');
+    console.log('cnrom override for autodetect');
+}
+
 console.log();
 
 // build / compress nametables

build.js

@@ -1,14 +1,4 @@
-        ldy #$06
-        sty tmp2
-        ldy #$00
-        sty tmp1
-        lda #$00
-@zeroOutPages:
-        sta (tmp1),y
-        dey
-        bne @zeroOutPages
-        dec tmp2
-        bpl @zeroOutPages
+        ; $0000 through $06FF cleared during vblank wait
         lda initMagic
         cmp #$54
         bne @coldBoot

src/boot.asm

@@ -1,14 +1,8 @@
 .segment "CHR"
-
-.if HAS_MMC
+; CHRBankSet0:
     .incbin "chr/title_menu_tileset.chr"
     .incbin "chr/game_tileset.chr"
+; CHRBankSet1:
+.if INES_MAPPER <> 0 ; exclude for NROM
     .incbin "chr/rocket_tileset.chr"
-.elseif INES_MAPPER = 3
-    .incbin "chr/rocket_tileset.chr"
-    .repeat $1000
-    .byte $0
-    .endrepeat
-    .incbin "chr/title_menu_tileset.chr"
-    .incbin "chr/game_tileset.chr"
 .endif

src/chr.asm

@@ -1,9 +1,7 @@
 .ifndef INES_MAPPER ; is set via ca65 flags
-INES_MAPPER := 1 ; supports 1, 3 and 4 (MMC1 / CNROM / MMC3)
+INES_MAPPER := 1000 ; 0 (NROM), 1 (MMC1), 3 (CNROM), 4 (MMC3), 5 (MMC5), and 1000 (autodetect 1/3)
 .endif
 
-HAS_MMC = INES_MAPPER = 1 || INES_MAPPER = 4 || INES_MAPPER = 5
-
 .ifndef SAVE_HIGHSCORES
 SAVE_HIGHSCORES := 1
 .endif
@@ -17,6 +15,10 @@ AUTO_WIN := 0
 KEYBOARD := 0
 .endif
 
+.ifndef CNROM_OVERRIDE
+CNROM_OVERRIDE := 0
+.endif
+
 NO_MUSIC := 1
 
 ; dev flags
@@ -34,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
@@ -78,16 +81,19 @@ 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
 MODE_DISABLE_PAUSE
+MODE_DARK
 MODE_GOOFY
 MODE_DEBUG
 MODE_LINECAP
@@ -111,16 +117,16 @@ LINECAP_FLOOR := 2
 LINECAP_INVISIBLE := 3
 LINECAP_HALT := 4
 
-CRASH_SHOW := 0
-CRASH_TOPOUT := 1
-CRASH_CRASH := 2
-CRASH_OFF := 3
+CRASH_OFF := 0
+CRASH_SHOW := 1
+CRASH_TOPOUT := 2
+CRASH_CRASH := 3
 
 LINECAP_WHEN_STRING_OFFSET := $10
 LINECAP_HOW_STRING_OFFSET := $12
 
 MENU_SPRITE_Y_BASE := $47
-MENU_MAX_Y_SCROLL := $80
+MENU_MAX_Y_SCROLL := $A0
 MENU_TOP_MARGIN_SCROLL := 7 ; in blocks
 
 ; menuConfigSizeLookup
@@ -143,16 +149,19 @@ 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
     .byte $1    ; MODE_DISABLE_PAUSE
+    .byte $1    ; MODE_DARK
     .byte $1    ; MODE_GOOFY
     .byte $1    ; MODE_DEBUG
     .byte $1    ; MODE_LINECAP
@@ -179,6 +188,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

@@ -10,24 +10,6 @@ gameMode_gameTypeMenu:
         sta menuScrollY
         lda #0
         sta hideNextPiece
-        RESET_MMC1
-.if HAS_MMC
-        ; switch to blank charmap
-        ; (stops glitching when resetting)
-        lda #$03
-        jsr changeCHRBank1
-.endif
-.if INES_MAPPER = 4
-        ; Horizontal mirroring
-        lda #$1
-        sta MMC3_MIRRORING
-.elseif INES_MAPPER = 5
-        ; Horizontal mirroring
-        lda #$50
-        sta MMC5_NT_MAPPING
-.endif
-        lda #%10011 ; used to be $10 (enable horizontal mirroring)
-        jsr setMMC1Control
         lda #$1
         sta renderMode
         jsr updateAudioWaitForNmiAndDisablePpuRendering
@@ -40,15 +22,12 @@ gameMode_gameTypeMenu:
         sta tmp3
         jsr copyRleNametableToPpuOffset
         .addr   game_type_menu_nametable_extra
-        lda #$00
-        jsr changeCHRBank0
-        lda #$00
-        jsr changeCHRBank1
-.if INES_MAPPER = 3
-CNROM_CHR_MENU:
-        lda #1
-        sta CNROM_CHR_MENU+1
+.if INES_MAPPER <> 0
+        lda #CHRBankSet0
+        jsr changeCHRBanks
 .endif
+        lda #NMIEnable
+        sta currentPpuCtrl
         jsr waitForVBlankAndEnableNmi
         jsr updateAudioWaitForNmiAndResetOamStaging
         jsr updateAudioWaitForNmiAndEnablePpuRendering
@@ -72,8 +51,6 @@ gameTypeLoopCheckStart:
         lda practiseType
         cmp #MODE_KILLX2
         bne @checkSpeedTest
-        lda #$10
-        jsr setMMC1Control
         lda #29
         sta startLevel
         sta levelNumber
@@ -555,9 +532,9 @@ menuYTmp := tmp2
         lda crashModifier
         cmp #CRASH_OFF
         bne @notOff
-        lda #$F1
+        lda #$F3
 @notOff:
-        adc #$16
+        adc #$14
         sta spriteIndexInOamContentLookup
         lda #(MODE_CRASH*8) + MENU_SPRITE_Y_BASE + 1
         sec