From 1b5220a004832e6b4118112713033654bee67a3c Mon Sep 17 00:00:00 2001
From: CaH4e3 <cah4e3@users.sf.net>
Date: Sun, 26 May 2013 07:55:23 +0000
Subject: [PATCH] mapper 183 - second level crash fix

---
 trunk/src/boards/183.cpp | 35 ++++++++++++++++++++---------------
 trunk/src/boards/69.cpp  |  7 +++----
 2 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/trunk/src/boards/183.cpp b/trunk/src/boards/183.cpp
index 7421abe8..9ba8c2c4 100644
--- a/trunk/src/boards/183.cpp
+++ b/trunk/src/boards/183.cpp
@@ -22,8 +22,7 @@
 
 #include "mapinc.h"
 
-static uint8 prg[4];
-static uint8 chr[8];
+static uint8 prg[4], chr[8], mirr;
 static uint8 IRQCount;
 static uint8 IRQPre;
 static uint8 IRQa;
@@ -32,6 +31,7 @@ static SFORMAT StateRegs[] =
 {
 	{ prg, 4, "PRG" },
 	{ chr, 8, "CHR" },
+	{ &mirr, 1, "MIRR" },
 	{ &IRQCount, 1, "IRQC" },
 	{ &IRQPre, 1, "IRQP" },
 	{ &IRQa, 1, "IRQA" },
@@ -39,13 +39,22 @@ static SFORMAT StateRegs[] =
 };
 
 static void SyncPrg(void) {
-	setprg8(0x6000, 0);
+	setprg8(0x6000, prg[3]);
 	setprg8(0x8000, prg[0]);
 	setprg8(0xA000, prg[1]);
 	setprg8(0xC000, prg[2]);
 	setprg8(0xE000, ~0);
 }
 
+static void SyncMirr(void) {
+	switch (mirr) {
+	case 0: setmirror(MI_V); break;
+	case 1: setmirror(MI_H); break;
+	case 2: setmirror(MI_0); break;
+	case 3: setmirror(MI_1); break;
+	}
+}
+
 static void SyncChr(void) {
 	int i;
 	for (i = 0; i < 8; i++)
@@ -55,10 +64,14 @@ static void SyncChr(void) {
 static void StateRestore(int version) {
 	SyncPrg();
 	SyncChr();
+	SyncMirr();
 }
 
 static DECLFW(M183Write) {
-	if (((A & 0xF80C) >= 0xB000) && ((A & 0xF80C) <= 0xE00C)) {
+	if ((A & 0xF800) == 0x6800) {
+		prg[3] = A & 0x3F;
+		SyncPrg();
+	} else if (((A & 0xF80C) >= 0xB000) && ((A & 0xF80C) <= 0xE00C)) {
 		int index = (((A >> 11) - 6) | (A >> 3)) & 7;
 		chr[index] = (chr[index] & (0xF0 >> (A & 4))) | ((V & 0x0F) << (A & 4));
 		SyncChr();
@@ -66,14 +79,7 @@ static DECLFW(M183Write) {
 		case 0x8800: prg[0] = V; SyncPrg(); break;
 		case 0xA800: prg[1] = V; SyncPrg(); break;
 		case 0xA000: prg[2] = V; SyncPrg(); break;
-		case 0x9800:
-			switch (V & 3) {
-			case 0: setmirror(MI_V); break;
-			case 1: setmirror(MI_H); break;
-			case 2: setmirror(MI_0); break;
-			case 3: setmirror(MI_1); break;
-			}
-			break;
+		case 0x9800: mirr = V & 3; SyncMirr(); break;
 		case 0xF000: IRQCount = ((IRQCount & 0xF0) | (V & 0xF)); break;
 		case 0xF004: IRQCount = ((IRQCount & 0x0F) | ((V & 0xF) << 4)); break;
 		case 0xF008: IRQa = V; if (!V) IRQPre = 0; X6502_IRQEnd(FCEU_IQEXT); break;
@@ -91,9 +97,8 @@ static void M183IRQCounter(void) {
 
 static void M183Power(void) {
 	IRQPre = IRQCount = IRQa = 0;
-	SetReadHandler(0x8000, 0xFFFF, CartBR);
-	SetWriteHandler(0x8000, 0xFFFF, M183Write);
-	SetReadHandler(0x6000, 0x7FFF, CartBR);
+	SetReadHandler(0x6000, 0xFFFF, CartBR);
+	SetWriteHandler(0x6000, 0xFFFF, M183Write);
 	SyncPrg();
 	SyncChr();
 }
diff --git a/trunk/src/boards/69.cpp b/trunk/src/boards/69.cpp
index 67d5b249..c289c9df 100644
--- a/trunk/src/boards/69.cpp
+++ b/trunk/src/boards/69.cpp
@@ -75,7 +75,7 @@ static DECLFW(M69Write0) {
 }
 
 static DECLFW(M69Write1) {
-	switch(cmdreg) {
+	switch (cmdreg) {
 	case 0x0: creg[0] = V; Sync(); break;
 	case 0x1: creg[1] = V; Sync(); break;
 	case 0x2: creg[2] = V; Sync(); break;
@@ -88,7 +88,7 @@ static DECLFW(M69Write1) {
 	case 0x9: preg[0] = V; Sync(); break;
 	case 0xA: preg[1] = V; Sync(); break;
 	case 0xB: preg[2] = V; Sync(); break;
-	case 0xC: mirr = V & 3; Sync(); break;
+	case 0xC: mirr = V & 3; Sync();break;
 	case 0xD: IRQa = V; X6502_IRQEnd(FCEU_IQEXT); break;
 	case 0xE: IRQCount &= 0xFF00; IRQCount |= V; X6502_IRQEnd(FCEU_IQEXT); break;
 	case 0xF: IRQCount &= 0x00FF; IRQCount |= V << 8; X6502_IRQEnd(FCEU_IQEXT); break;
@@ -234,8 +234,7 @@ static void M69Power(void) {
 	SetWriteHandler(0xE000, 0xFFFF, M69SWrite1);
 }
 
-static void M69Close(void)
-{
+static void M69Close(void) {
 	if (WRAM)
 		FCEU_gfree(WRAM);
 	WRAM = NULL;