Exclude nrom from bank switching routine

Author: zohassadar

src/gamemode/gametypemenu/menu.asm

@@ -22,8 +22,10 @@ gameMode_gameTypeMenu:
         sta tmp3
         jsr copyRleNametableToPpuOffset
         .addr   game_type_menu_nametable_extra
+.if INES_MAPPER <> 0
         lda #CHRBankSet0
         jsr changeCHRBanks
+.endif
         lda #NMIEnable
         sta currentPpuCtrl
         jsr waitForVBlankAndEnableNmi

src/gamemode/levelmenu.asm

@@ -7,8 +7,10 @@ gameMode_levelMenu:
         sta renderMode
         jsr updateAudioWaitForNmiAndDisablePpuRendering
         jsr disableNmi
+.if INES_MAPPER <> 0
         lda #CHRBankSet0
         jsr changeCHRBanks
+.endif
         jsr bulkCopyToPpu
         .addr   menu_palette
         jsr copyRleNametableToPpu

src/gamemode/speedtest.asm

@@ -23,8 +23,10 @@ gameMode_speedTest:
         sta PPUDATA
         lda #NMIEnable|BGPattern1|SpritePattern1
         sta currentPpuCtrl
+.if INES_MAPPER <> 0
         lda #CHRBankSet0
         jsr changeCHRBanks
+.endif
 
         jsr waitForVBlankAndEnableNmi
         jsr updateAudioWaitForNmiAndResetOamStaging

src/gamemode/waitscreen.asm

@@ -13,8 +13,8 @@ waitScreenLoad:
 ; and will instead use the title/menu chrset letters.  This won't be noticeable
 ; unless a graphic is added 
         lda #CHRBankSet1
-.endif
         jsr changeCHRBanks
+.endif
         jsr bulkCopyToPpu
         .addr wait_palette
         jsr copyRleNametableToPpu

src/gamemodestate/initbackground.asm

@@ -1,8 +1,10 @@
 gameModeState_initGameBackground:
         jsr updateAudioWaitForNmiAndDisablePpuRendering
         jsr disableNmi
+.if INES_MAPPER <> 0
         lda #CHRBankSet0
         jsr changeCHRBanks
+.endif
         jsr bulkCopyToPpu
         .addr   game_palette
         jsr copyRleNametableToPpu

src/highscores/entry_screen.asm

@@ -115,8 +115,10 @@ highScoreEntryScreen:
         sta renderMode
         jsr updateAudioWaitForNmiAndDisablePpuRendering
         jsr disableNmi
+.if INES_MAPPER <> 0
         lda #CHRBankSet0
         jsr changeCHRBanks
+.endif
         lda #NMIEnable
         sta PPUCTRL
         sta currentPpuCtrl

src/playstate/gameover_rocket.asm

@@ -79,8 +79,8 @@ endingAnimation: ; rocket_screen
 .if INES_MAPPER <> 0
         ; NROM will use a smaller ufo in the game tileset
         lda #CHRBankSet1
-.endif
         jsr changeCHRBanks
+.endif
         lda #NMIEnable
         sta currentPpuCtrl
         jsr copyRleNametableToPpu
@@ -237,7 +237,7 @@ handleRocket:
         lda #>spriteCathedralFire0
         sta $1
         lda frameCounter
-.if INES_MAPPER = 0 
+.if INES_MAPPER = 0
         and #8 ; Every 8 frames for ufo
 .else
         and #1 ; Every other frame for cathedral

src/reset.asm

@@ -33,8 +33,10 @@ reset:  cld
         txs
         jsr mapperInit
         jsr setHorizontalMirroring
+.if INES_MAPPER <> 0
         lda #CHRBankSet0
         jsr changeCHRBanks
+.endif
         jmp initRam
 
 .macro setMMC1PRG