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

Author: kirjavascript

CHANGELOG.md

@@ -26,6 +26,8 @@
 * Fixed PAL colours
 * Keep hz display enabled when topped out
 * Famicom Keyboard support
+* Autodetect MMC1/CNROM
+* NROM Support
 * MMC3 Support
 * MMC5 Support
 

README.md

@@ -436,3 +436,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)

build.js

@@ -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

src/boot.asm

@@ -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/chr.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/title_menu_tileset.png

@@ -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

src/constants.asm

@@ -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

src/gamemode/gametypemenu/menu.asm

@@ -1,21 +1,15 @@
 gameMode_levelMenu:
-        RESET_MMC1
-        lda #$10
-        jsr setMMC1Control
-.if INES_MAPPER = 3
-        lda currentPpuCtrl
-        and #%10000000
+        lda #NMIEnable
         sta currentPpuCtrl
-.endif
         jsr updateAudio2
         lda #$7
         sta renderMode
         jsr updateAudioWaitForNmiAndDisablePpuRendering
         jsr disableNmi
-        lda #$00
-        jsr changeCHRBank0
-        lda #$00
-        jsr changeCHRBank1
+.if INES_MAPPER <> 0
+        lda #CHRBankSet0
+        jsr changeCHRBanks
+.endif
         jsr bulkCopyToPpu
         .addr   menu_palette
         jsr copyRleNametableToPpu

src/gamemode/levelmenu.asm

@@ -22,15 +22,11 @@ gameMode_speedTest:
         sta PPUADDR
         lda #$30
         sta PPUDATA
-.if HAS_MMC
-        lda #$01
-        jsr changeCHRBank0
-        lda #$01
-        jsr changeCHRBank1
-.elseif INES_MAPPER = 3
-        lda #%10011001
-        sta PPUCTRL
+        lda #NMIEnable|BGPattern1|SpritePattern1
         sta currentPpuCtrl
+.if INES_MAPPER <> 0
+        lda #CHRBankSet0
+        jsr changeCHRBanks
 .endif
 
         jsr waitForVBlankAndEnableNmi