centralize mapper duties

zohassadar · zohassadar · commit ff560a5bc694 · 2023-12-20T20:45:56.000-07:00
diff --git a/MapperChecklist.md b/MapperChecklist.md
@@ -0,0 +1,143 @@
+# MMC1 Mesen
+
+- [ ] qual legal/title
+- [ ] qual rocket screen game
+- [ ] qual reset
+- [ ] regular high score game
+- [ ] reset
+- [ ] tap roll screen
+
+# MMC1 Everdrive
+
+- [ ] qual legal/title
+- [ ] qual rocket screen game
+- [ ] qual reset
+- [ ] regular high score game
+- [ ] reset
+- [ ] tap roll screen
+
+# MMC1 Krzysio
+
+- [ ] qual legal/title
+- [ ] qual rocket screen game
+- [ ] qual reset
+- [ ] regular high score game
+- [ ] reset
+- [ ] tap roll screen
+
+# CNROM Mesen
+
+- [ ] qual legal/title
+- [ ] qual rocket screen game
+- [ ] qual reset
+- [ ] regular high score game
+- [ ] reset
+- [ ] tap roll screen
+
+# CNROM Everdrive
+
+- [ ] qual legal/title
+- [ ] qual rocket screen game
+- [ ] qual reset
+- [ ] regular high score game
+- [ ] reset
+- [ ] tap roll screen
+
+# CNROM Krzysio
+
+- [ ] qual legal/title
+- [ ] qual rocket screen game
+- [ ] qual reset
+- [ ] regular high score game
+- [ ] reset
+- [ ] tap roll screen
+
+# CNROM PCB
+
+- [ ] qual legal/title
+- [ ] qual rocket screen game
+- [ ] qual reset
+- [ ] regular high score game
+- [ ] reset
+- [ ] tap roll screen
+
+# CNROM Allen
+
+- [ ] qual legal/title
+- [ ] qual rocket screen game
+- [ ] qual reset
+- [ ] regular high score game
+- [ ] reset
+- [ ] tap roll screen
+
+# CNROM Eric
+
+- [ ] qual legal/title
+- [ ] qual rocket screen game
+- [ ] qual reset
+- [ ] regular high score game
+- [ ] reset
+- [ ] tap roll screen
+
+# CNROM Gunter
+
+- [ ] qual legal/title
+- [ ] qual rocket screen game
+- [ ] qual reset
+- [ ] regular high score game
+- [ ] reset
+- [ ] tap roll screen
+
+# MMC3 Mesen
+
+- [ ] qual legal/title
+- [ ] qual rocket screen game
+- [ ] qual reset
+- [ ] regular high score game
+- [ ] reset
+- [ ] tap roll screen
+
+# MMC3 Everdrive
+
+- [ ] qual legal/title
+- [ ] qual rocket screen game
+- [ ] qual reset
+- [ ] regular high score game
+- [ ] reset
+- [ ] tap roll screen
+
+# MMC3 Krzysio
+
+- [ ] qual legal/title
+- [ ] qual rocket screen game
+- [ ] qual reset
+- [ ] regular high score game
+- [ ] reset
+- [ ] tap roll screen
+
+# MMC5 Mesen
+
+- [ ] qual legal/title
+- [ ] qual rocket screen game
+- [ ] qual reset
+- [ ] regular high score game
+- [ ] reset
+- [ ] tap roll screen
+
+# MMC5 Everdrive
+
+- [ ] qual legal/title
+- [ ] qual rocket screen game
+- [ ] qual reset
+- [ ] regular high score game
+- [ ] reset
+- [ ] tap roll screen
+
+# MMC5 Krzysio
+
+- [ ] qual legal/title
+- [ ] qual rocket screen game
+- [ ] qual reset
+- [ ] regular high score game
+- [ ] reset
+- [ ] tap roll screen
diff --git a/bm.sh b/bm.sh
@@ -0,0 +1,10 @@
+#!/usr/bin/bash
+node build.js -m1
+mv tetris.nes tetrismmc1.nes
+node build.js -m3
+mv tetris.nes tetriscnrom.nes
+node build.js -m4
+mv tetris.nes tetrismmc3.nes
+node build.js -m5
+mv tetris.nes tetrismmc5.nes
+
diff --git a/src/chr.asm b/src/chr.asm
@@ -1,8 +1,6 @@
-chrTitle = 0
-chrRocket = 1
-chrGame = 2
-
 .segment "CHR"
+; CHRBankSet0:
     .incbin "chr/title_menu_tileset.chr"
     .incbin "chr/rocket_tileset.chr"
+; CHRBankSet1:
     .incbin "chr/game_tileset.chr"
diff --git a/src/chr/rocket_tileset.png b/src/chr/rocket_tileset.png
diff --git a/src/gamemode/gametypemenu/menu.asm b/src/gamemode/gametypemenu/menu.asm
@@ -10,25 +10,7 @@ gameMode_gameTypeMenu:
         sta menuScrollY
         lda #0
         sta displayNextPiece
-        RESET_MMC1
-.if HAS_MMC
-        ; switch to blank charmap
-        ; (stops glitching when resetting)
-        ; lda #$03
-        ; jsr changeCHRBank1 ; should this be all or nothing?
-.endif
-
-.if INES_MAPPER = 4   ; centralize mirroring
-        ; 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
+        jsr setHorizontalMirroring
         lda #$1
         sta renderMode
         jsr updateAudioWaitForNmiAndDisablePpuRendering
@@ -41,9 +23,9 @@ gameMode_gameTypeMenu:
         sta tmp3
         jsr copyRleNametableToPpuOffset
         .addr   game_type_menu_nametable_extra
-        lda #$00
+        lda #CHRBankSet0
         jsr changeCHRBanks
-        lda #$80
+        lda #NMIEnable
         sta currentPpuCtrl
         jsr waitForVBlankAndEnableNmi
         jsr updateAudioWaitForNmiAndResetOamStaging
@@ -68,8 +50,7 @@ gameTypeLoopCheckStart:
         lda practiseType
         cmp #MODE_KILLX2
         bne @checkSpeedTest
-        lda #$10
-        jsr setMMC1Control
+        jsr setVerticalMirroring
         lda #29
         sta startLevel
         sta levelNumber
diff --git a/src/gamemode/levelmenu.asm b/src/gamemode/levelmenu.asm
@@ -1,18 +1,14 @@
 gameMode_levelMenu:
-        RESET_MMC1
-        lda #$10
-        jsr setMMC1Control
-; .if INES_MAPPER = 3
+        jsr setVerticalMirroring
         lda currentPpuCtrl
-        and #%10000000
+        and #NMIEnable
         sta currentPpuCtrl
-; .endif
         jsr updateAudio2
         lda #$7
         sta renderMode
         jsr updateAudioWaitForNmiAndDisablePpuRendering
         jsr disableNmi
-        lda #$00
+        lda #CHRBankSet0
         jsr changeCHRBanks
         jsr bulkCopyToPpu
         .addr   menu_palette
diff --git a/src/gamemode/speedtest.asm b/src/gamemode/speedtest.asm
@@ -21,7 +21,7 @@ gameMode_speedTest:
         sta PPUADDR
         lda #$30
         sta PPUDATA
-        lda #$02
+        lda #CHRBankSet1
         jsr changeCHRBanks
 
         jsr waitForVBlankAndEnableNmi
diff --git a/src/gamemode/waitscreen.asm b/src/gamemode/waitscreen.asm
@@ -6,8 +6,9 @@ waitScreenLoad:
         sta renderMode
         jsr updateAudioWaitForNmiAndDisablePpuRendering
         jsr disableNmi
-        lda #$00
-        sta currentPpuCtrl  ; all or nothing?
+        lda #NMIEnable|BGPattern1|SpritePattern1
+        sta currentPpuCtrl
+        lda #CHRBankSet0
         jsr changeCHRBanks
         jsr bulkCopyToPpu
         .addr wait_palette
diff --git a/src/gamemodestate/handlegameover.asm b/src/gamemodestate/handlegameover.asm
@@ -13,14 +13,6 @@ gameModeState_handleGameOver:
 @gameOver:
         lda #$03
         sta renderMode
-.if INES_MAPPER = 3
-        lda qualFlag
-        beq @CNROM_CHR_HIGHSCORE_END
-@CNROM_CHR_HIGHSCORE:
-        lda #1
-        sta @CNROM_CHR_HIGHSCORE+1
-@CNROM_CHR_HIGHSCORE_END:
-.endif
         jsr handleHighScoreIfNecessary
         lda #$01
         sta playState
diff --git a/src/gamemodestate/initbackground.asm b/src/gamemodestate/initbackground.asm
@@ -1,7 +1,7 @@
 gameModeState_initGameBackground:
         jsr updateAudioWaitForNmiAndDisablePpuRendering
         jsr disableNmi
-        lda #$02
+        lda #CHRBankSet1
         jsr changeCHRBanks
         jsr bulkCopyToPpu
         .addr   game_palette
@@ -38,20 +38,10 @@ gameModeState_initGameBackground:
         sta PPUDATA
 @heartEnd:
 
-
-; .if INES_MAPPER = 3
-        lda #%10000000
+        lda #NMIEnable
         sta PPUCTRL
         sta currentPpuCtrl
-.if INES_MAPPER = 4
-        ; Vertical mirroring (Prevents screen glitching)
-        lda #$0
-        sta MMC3_MIRRORING
-.elseif INES_MAPPER = 5
-        ; Single screen (Prevents screen glitching)
-        lda #$0
-        sta MMC5_NT_MAPPING
-.endif
+        jsr setVerticalMirroring
         jsr resetScroll
         jsr waitForVBlankAndEnableNmi
         jsr updateAudioWaitForNmiAndResetOamStaging
diff --git a/src/highscores/entry_screen.asm b/src/highscores/entry_screen.asm
@@ -109,18 +109,16 @@ copyHighscore:
         rts
 
 highScoreEntryScreen:
-        RESET_MMC1
-        lda #$10
-        jsr setMMC1Control
+        jsr setVerticalMirroring
         lda #$09
         jsr setMusicTrack
         lda #$02
         sta renderMode
         jsr updateAudioWaitForNmiAndDisablePpuRendering
         jsr disableNmi
-        lda #$00
+        lda #CHRBankSet0
         jsr changeCHRBanks
-        lda #%10000000 ; should this be all or nothing?
+        lda #NMIEnable
         sta PPUCTRL
         sta currentPpuCtrl
         jsr bulkCopyToPpu
diff --git a/src/io.asm b/src/io.asm
@@ -66,3 +66,10 @@ MMC5_CHR_BANK1 := $5127
                 ; https://www.nesdev.org/wiki/MMC1#Reset
 .endif
 .endmacro
+
+NMIEnable = $80
+BGPattern1 = $10
+SpritePattern1 = $08
+
+CHRBankSet0 = $00
+CHRBankSet1 = $02
diff --git a/src/nametables/legal_nametable.bin b/src/nametables/legal_nametable.bin
diff --git a/src/nametables/rocket_legal.js b/src/nametables/rocket_legal.js
@@ -3,6 +3,7 @@ const {
     drawTiles,
     flatLookup,
     drawAttrs,
+    drawRect,
 } = require('./nametables');
 
 const legal = Array.from({ length: 1024 }, () => 0xFF);
@@ -95,6 +96,8 @@ drawTiles(legal, lookup, `
 ################################
 `);
 
+drawRect(legal, 7, 5, 10, 5, 0xA6);
+
 drawAttrs(rocket, [`
     1111111111111111
     1111111111111111
@@ -118,9 +121,9 @@ drawAttrs(rocket, [`
 drawAttrs(legal, [`
     0000000000000000
     0000000000000000
-    0000000000000000
-    0000000000000000
-    0000000000000000
+    0000011111000000
+    0000011111000000
+    0000011111000000
     0000000000000000
     0000000000000000
     0000000000000000
diff --git a/src/nmi/nmi.asm b/src/nmi/nmi.asm
@@ -6,6 +6,8 @@ nmi:    pha
         lda #$00
         sta oamStagingLength
         jsr render
+        lda currentPpuCtrl
+        sta PPUCTRL
         dec sleepCounter
         lda sleepCounter
         cmp #$FF
diff --git a/src/nmi/render_mode_play_and_demo.asm b/src/nmi/render_mode_play_and_demo.asm
@@ -198,11 +198,6 @@ render_mode_play_and_demo:
         bne @noFlash
         stx PPUDATA
 @noFlash:
-; .if INES_MAPPER = 3
-        lda #%10000000
-        sta PPUCTRL
-        sta currentPpuCtrl
-; .endif
         jsr resetScroll
         rts
 
diff --git a/src/nmi/render_mode_rocket.asm b/src/nmi/render_mode_rocket.asm
@@ -18,10 +18,5 @@ render_mode_rocket:
         .addr rocket_nametable_patch
 @stage2:
 @rocketEnd:
-.if INES_MAPPER = 3
-        lda #%10000000
-        sta PPUCTRL
-        sta currentPpuCtrl
-.endif
         jsr resetScroll
         rts
diff --git a/src/nmi/render_mode_scroll.asm b/src/nmi/render_mode_scroll.asm
diff --git a/src/playstate/gameover_rocket.asm b/src/playstate/gameover_rocket.asm
diff --git a/src/reset.asm b/src/reset.asm
diff --git a/src/util/core.asm b/src/util/core.asm
