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

Author: kirjavascript

src/gamemode/waitscreen.asm

@@ -12,6 +12,9 @@ waitScreenLoad:
         lda #$02
         jsr changeCHRBank1
 .elseif INES_MAPPER = 3
+CNROM_CHR_LEGAL:
+        lda #0
+        sta CNROM_CHR_LEGAL+1
         lda #%10000000
         sta PPUCTRL
         sta currentPpuCtrl

src/reset.asm

@@ -1,5 +1,18 @@
 ; incremented to reset MMC1 reg
-reset:  cld
+reset:  
+.if INES_MAPPER = 4
+        ldy #$00
+        ldx #$06
+        stx MMC3_BANK_SELECT
+        sty MMC3_BANK_DATA
+        inx
+        iny
+        stx MMC3_BANK_SELECT
+        sty MMC3_BANK_DATA
+        lda #$00
+        stx MMC3_BANK_SELECT
+.endif
+        cld
         sei
         ldx #$00
         stx PPUCTRL
@@ -12,7 +25,9 @@ reset:  cld
         bpl @vsyncWait2
         dex
         txs
+.if INES_MAPPER <> 4
         inc reset
+.endif
         lda #$10
         jsr setMMC1Control
         lda #$00