Merge pull request #36 from zohassadar/mmc3adjust

Simplify compile time statements

Author: kirjavascript

src/chr.asm

@@ -1,6 +1,6 @@
 .segment "CHR"
 
-.if INES_MAPPER = 1 || INES_MAPPER = 4
+.if HAS_MMC
     .incbin "chr/title_menu_tileset.chr"
     .incbin "chr/game_tileset.chr"
     .incbin "chr/rocket_tileset.chr"

src/constants.asm

@@ -2,6 +2,8 @@
 INES_MAPPER := 1 ; supports 1 and 3 (MMC1 / CNROM)
 .endif
 
+HAS_MMC = INES_MAPPER = 1 || INES_MAPPER = 4
+
 .ifndef SAVE_HIGHSCORES
 SAVE_HIGHSCORES := 1
 .endif

src/gamemode/gametypemenu/menu.asm

@@ -11,7 +11,7 @@ gameMode_gameTypeMenu:
         lda #0
         sta displayNextPiece
         RESET_MMC1
-.if INES_MAPPER = 1 || INES_MAPPER = 4
+.if HAS_MMC
         ; switch to blank charmap
         ; (stops glitching when resetting)
         lda #$03

src/gamemode/speedtest.asm

@@ -21,7 +21,7 @@ gameMode_speedTest:
         sta PPUADDR
         lda #$30
         sta PPUDATA
-.if INES_MAPPER = 1 || INES_MAPPER = 4
+.if HAS_MMC
         lda #$01
         jsr changeCHRBank0
         lda #$01

src/gamemode/waitscreen.asm

@@ -6,7 +6,7 @@ waitScreenLoad:
         sta renderMode
         jsr updateAudioWaitForNmiAndDisablePpuRendering
         jsr disableNmi
-.if INES_MAPPER = 1 || INES_MAPPER = 4
+.if HAS_MMC
         lda #$02
         jsr changeCHRBank0
         lda #$02

src/gamemodestate/initbackground.asm

@@ -1,7 +1,7 @@
 gameModeState_initGameBackground:
         jsr updateAudioWaitForNmiAndDisablePpuRendering
         jsr disableNmi
-.if INES_MAPPER = 1 || INES_MAPPER = 4
+.if HAS_MMC
         lda #$01
         jsr changeCHRBank0
         lda #$01

src/playstate/gameover_rocket.asm

@@ -76,7 +76,7 @@ sleep_gameplay:
 endingAnimation: ; rocket_screen
         jsr updateAudioWaitForNmiAndDisablePpuRendering
         jsr disableNmi
-.if INES_MAPPER = 1 || INES_MAPPER = 4
+.if HAS_MMC
         lda #$02
         jsr changeCHRBank0
         lda #$02