Set mirroring once

zohassadar · zohassadar · commit 784adb3a61a5 · 2023-12-21T09:06:30.000-07:00
diff --git a/src/gamemode/gametypemenu/menu.asm b/src/gamemode/gametypemenu/menu.asm
@@ -10,7 +10,6 @@ gameMode_gameTypeMenu:
         sta menuScrollY
         lda #0
         sta displayNextPiece
-        jsr setHorizontalMirroring
         lda #$1
         sta renderMode
         jsr updateAudioWaitForNmiAndDisablePpuRendering
@@ -50,7 +49,6 @@ gameTypeLoopCheckStart:
         lda practiseType
         cmp #MODE_KILLX2
         bne @checkSpeedTest
-        jsr setVerticalMirroring
         lda #29
         sta startLevel
         sta levelNumber
diff --git a/src/gamemode/levelmenu.asm b/src/gamemode/levelmenu.asm
@@ -1,5 +1,4 @@
 gameMode_levelMenu:
-        jsr setVerticalMirroring
         lda currentPpuCtrl
         and #NMIEnable
         sta currentPpuCtrl
diff --git a/src/gamemodestate/initbackground.asm b/src/gamemodestate/initbackground.asm
@@ -41,7 +41,6 @@ gameModeState_initGameBackground:
         lda #NMIEnable
         sta PPUCTRL
         sta currentPpuCtrl
-        jsr setVerticalMirroring
         jsr resetScroll
         jsr waitForVBlankAndEnableNmi
         jsr updateAudioWaitForNmiAndResetOamStaging
diff --git a/src/highscores/entry_screen.asm b/src/highscores/entry_screen.asm
@@ -109,7 +109,6 @@ copyHighscore:
         rts
 
 highScoreEntryScreen:
-        jsr setVerticalMirroring
         lda #$09
         jsr setMusicTrack
         lda #$02
diff --git a/src/reset.asm b/src/reset.asm
@@ -32,17 +32,17 @@ reset:  cld
         dex ; $FF for stack pointer
         txs
         jsr mapperInit
-        jsr setVerticalMirroring
+        jsr setHorizontalMirroring
         lda #CHRBankSet0
         jsr changeCHRBanks
         jmp initRam
 
 mapperInit:
 ; autodetect
 .if INES_MAPPER = 0
-        jsr testHorizontalMirroring
-        bne not_mmc1
         jsr testVerticalMirroring
+        bne not_mmc1 ; cnrom should bail here
+        jsr testHorizontalMirroring ; Test again in case of cnrom miswire
         bne not_mmc1
         inc mapperId ; 1 for MMC1, otherwise 0 for CNROM
 not_mmc1:
diff --git a/src/util/mapper.asm b/src/util/mapper.asm
@@ -138,6 +138,8 @@ setHorizontalMirroring:
         rts
 
 setVerticalMirroring:
+; Unused except during mapper detect for INES_MAPPER 0 
+
 ; autodetect
 .if INES_MAPPER = 0
         lda mapperId

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`gameMode_levelMenu:`
`2`		`- jsr setVerticalMirroring`
`3`	`2`	`lda currentPpuCtrl`
`4`	`3`	`and #NMIEnable`
`5`	`4`	`sta currentPpuCtrl`