update Mapper176(BMC-FK23C/A), fix init state and prg mask

src/boards/fk23c.c

@@ -21,6 +21,7 @@
 #include "mapinc.h"
 #include "mmc3.h"
 
+static int is_BMCFK23CA;
 static uint8 unromchr;
 static uint32 dipswitch = 0;
 static uint8 *CHRRAM = NULL;
@@ -32,7 +33,7 @@ static void BMCFK23CCW(uint32 A, uint8 V) {
 	else if (EXPREGS[0] & 0x20) {
 		setchr1r(0x10, A, V);
 	} else {
-		uint16 base = (EXPREGS[2] & 0x7F) << 3;
+		uint16 base=(EXPREGS[2] & 0x7F) << 3;
 		if (EXPREGS[3] & 2) {
 			int cbase = (MMC3_cmd & 0x80) << 5;
 			setchr1(A, V | base);
@@ -45,40 +46,93 @@ static void BMCFK23CCW(uint32 A, uint8 V) {
 	}
 }
 
+//some games are wired differently, and this will need to be changed.
+//all the WXN games require prg_bonus = 1, and cah4e3's multicarts require prg_bonus = 0
+//we'll populate this from a game database
+static int prg_mask;
+static int prg_bonus = 1;
+
+//prg_bonus = 0
+//4-in-1 (FK23C8021)[p1][!].nes
+//4-in-1 (FK23C8033)[p1][!].nes
+//4-in-1 (FK23C8043)[p1][!].nes
+//4-in-1 (FK23Cxxxx, S-0210A PCB)[p1][!].nes
+
+//prg_bonus = 1
+//[m176]大富翁2-上海大亨.wxn.nes
+//[m176]宠物翡翠.fix.nes
+//[m176]格兰帝亚.wxn.nes
+//[m176]梦幻之星.wxn.nes
+//[m176]水浒神兽.fix.nes
+//[m176]西楚霸王.fix.nes
+//[m176]超级大富翁.wxn.nes
+//[m176]雄霸天下.wxn.nes
+
+//works as-is under virtuanes m176
+//[m176]三侠五义.wxn.nes
+//[m176]口袋金.fix.nes
+//[m176]爆笑三国.fix.nes
+
+//needs other tweaks
+//[m176]三国忠烈传.wxn.nes
+//[m176]破釜沉舟.fix.nes
+
+static uint64 CartList[] =
+{
+	0x1606b8c2aff8d942LL, // 4-in-1 (BS-8088) [p1][!].nes
+	0x62b51b108a01d2beLL, // 4-in-1 (FK23C8021) [p1][!].nes
+	0xa37eb9163e001a46LL, // 4-in-1 (FK23C8026) [p1][!].nes
+	0x8bb48490d8d22711LL, // 4-in-1 (FK23C8033) [p1][!].nes
+	0xc75888d7b48cd378LL, // 4-in-1 (FK23C8043) [p1][!].nes
+	0xde5ce25860233f7eLL, // 4-in-1 (FK23C8045) [p1][!].nes
+	0x8b6c9fc7769a5500LL, // 4-in-1 (FK23C8052) [p1][!].nes
+	0x5b3aa4cdc484a088LL, // 4-in-1 (FK23C8056) [p1][!].nes
+	0x497344d14c308a1aLL, // 4-in-1 (FK23C8078) (Ch) [p1].nes
+	0x9342bf9bae1c798aLL, // 4-in-1 (FK23C8079) [p1][!].nes
+	0xf81a376fa54fdd69LL, // 4-in-1 (FK23Cxxxx, S-0210A PCB)[p1][!].nes
+	0x8fd9c235957a6df0LL, // 5-in-1 (K5003) [p1][!]-1125) (Ch).nes
+	0x0315924d00dd7807LL, // Mortal Kombat 30 Peoples (DH1043) (Ch).nes
+	0x4b99c39fdb66128aLL, // 4-in-1 (FK23C8078) (Ch) [p1][U][!].unf
+	0						/* Abandon all hope if the game has 0 in the lower 64-bits of its MD5 hash */
+};
+
+static void DetectPRGbonus(uint64 md5partial) {
+	int x;
+	x = 0;
+	while (CartList[x] != 0) {
+		if (CartList[x] == md5partial) {
+			prg_bonus = 0;
+			return;
+		}
+		x++;
+	}
+}
+
 static void BMCFK23CPW(uint32 A, uint8 V) {
 	uint32 bank = (EXPREGS[1] & 0x1F);
 	uint32 hiblock = ((EXPREGS[0] & 8) << 4) | ((EXPREGS[0] & 0x80) << 1) | (UNIFchrrama ? ((EXPREGS[2] & 0x40) << 3) : 0);
 	uint32 block = (EXPREGS[1] & 0x60) | hiblock;
 	uint32 extra = (EXPREGS[3] & 2);
-	switch (EXPREGS[0] & 7) {
+
-	case 0:
+	if ((EXPREGS[0] & 7) == 4)
-		setprg8(A, (block << 1) | (V & 0x3F));
+		setprg32(0x8000, EXPREGS[1] >> 1);
-		if (extra) {
+	else if ((EXPREGS[0] & 7) == 3) {
+		setprg16(0x8000, EXPREGS[1]);
+		setprg16(0xC000, EXPREGS[1]);
+	} else {
+		if (EXPREGS[0] & 3) {
+			uint32 blocksize = (6) - (EXPREGS[0] & 3);
+			uint32 mask = (1 << blocksize) - 1;
+			V &= mask;
+			//V &= 63; //? is this a good idea?
+			V |= (EXPREGS[1] << 1);
+			setprg8(A, V);
+		} else
+			setprg8(A, V & prg_mask);
+		if (EXPREGS[3] & 2) {
 			setprg8(0xC000, EXPREGS[4]);
 			setprg8(0xE000, EXPREGS[5]);
 		}
-		break;
-	case 1:
-		setprg8(A, ((hiblock | (EXPREGS[1] & 0x70)) << 1) | (V & 0x1F));
-		if (extra) {
-			setprg8(0xC000, EXPREGS[4]);
-			setprg8(0xE000, EXPREGS[5]);
-		}
-		break;
-	case 2:
-		setprg8(A, ((hiblock | (EXPREGS[1] & 0x78)) << 1) | (V & 0x0F));
-		if (extra) {
-			setprg8(0xC000, EXPREGS[4]);
-			setprg8(0xE000, EXPREGS[5]);
-		}
-		break;
-	case 3:
-		setprg16(0x8000, (bank | block));
-		setprg16(0xC000, (bank | block));
-		break;
-	case 4:
-		setprg32(0x8000, (bank | block) >> 1);
-		break;
 	}
 	setprg8r(0x10, 0x6000, A001B & 3);
 }
@@ -92,50 +146,63 @@ static DECLFW(BMCFK23CHiWrite) {
 			FixMMC3CHR(MMC3_cmd);
 		}
 	} else {
-		if ((A == 0x8001) && (EXPREGS[3] & 2) && (MMC3_cmd & 8)) {
+		if ((A == 0x8001) && (EXPREGS[3] & 2 && MMC3_cmd & 8)) {
 			EXPREGS[4 | (MMC3_cmd & 3)] = V;
 			FixMMC3PRG(MMC3_cmd);
 			FixMMC3CHR(MMC3_cmd);
 		} else
-		if (A < 0xC000) {
+			if (A < 0xC000) {
-			if (UNIFchrrama) {		// hacky... strange behaviour, must be bit scramble due to pcb layot restrictions
+				if (UNIFchrrama) { // hacky... strange behaviour, must be bit scramble due to pcb layot restrictions
-									// check if it not interfer with other dumps
+								  // check if it not interfer with other dumps
-				if ((A == 0x8000) && (V == 0x46))
+					if ((A == 0x8000) && (V == 0x46))
-					V = 0x47;
+						V = 0x47;
-				else if ((A == 0x8000) && (V == 0x47))
+					else if ((A==0x8000) && (V == 0x47))
-					V = 0x46;
+						V = 0x46;
-			}
+				}
-			MMC3_CMDWrite(A, V);
+				MMC3_CMDWrite(A, V);
-			FixMMC3PRG(MMC3_cmd);
+				FixMMC3PRG(MMC3_cmd);
-		} else
+			} else
-			MMC3_IRQWrite(A, V);
+				MMC3_IRQWrite(A, V);
 	}
 }
 
 static DECLFW(BMCFK23CWrite) {
-//	FCEU_printf("lo %04x:%02x\n",A,V);
+	if (A & (1 << (dipswitch + 4))) {
-	if (dipswitch) {		// íóëåâîé äèï áåðåò ëþáûå çàïèñè ïî äåôîëòó, äàëüøå èäåò âûáîð
+		EXPREGS[A & 3] = V;
-		if (A & (1 << (dipswitch + 3))) {
+
-			EXPREGS[A & 3] = V;
+		int remap = 0;
-//			FCEU_printf(" reg %d set!\n",A&3);
+
+		//sometimes writing to reg0 causes remappings to occur. we think the 2 signifies this.
+		//if not, 0x24 is a value that is known to work
+		//however, the low 4 bits are known to control the mapping mode, so 0x20 is more likely to be the immediate remap flag
+		remap |= ((EXPREGS[0] & 0xF0) == 0x20);
+
+		//this is an actual mapping reg. i think reg0 controls what happens when reg1 is written. anyway, we have to immediately remap these
+		remap |= (A & 3) == 1;
+		//this too.
+		remap |= (A & 3) == 2;
+
+		if(remap)
+		{
 			FixMMC3PRG(MMC3_cmd);
 			FixMMC3CHR(MMC3_cmd);
 		}
-	} else {
-		EXPREGS[A & 3] = V;
-//		FCEU_printf(" reg %d set!\n",A&3);
-		FixMMC3PRG(MMC3_cmd);
-		FixMMC3CHR(MMC3_cmd);
 	}
-	if (EXPREGS[3] & 2)
+
-		EXPREGS[0] &= ~7;	// hacky hacky! if someone wants extra banking, then for sure doesn't want mode 4 for it! (allow to run A version boards on normal mapper)
+	if(is_BMCFK23CA)
+	{
+		if(EXPREGS[3] & 2)
+			EXPREGS[0] &= ~7;   // hacky hacky! if someone wants extra banking, then for sure doesn't want mode 4 for it! (allow to run A version boards on normal mapper)
+	}
 }
 
 static void BMCFK23CReset(void) {
-	if (dipswitch <= 8)
+	//NOT NECESSARY ANYMORE
-		dipswitch++;
+	//this little hack makes sure that we try all the dip switch settings eventually, if we reset enough
-	else
+	// dipswitch++;
-		dipswitch = 0;
+	// dipswitch&=7;
+	//printf("BMCFK23C dipswitch set to %d\n",dipswitch);
+
 	EXPREGS[0] = EXPREGS[1] = EXPREGS[2] = EXPREGS[3] = 0;
 	EXPREGS[4] = EXPREGS[5] = EXPREGS[6] = EXPREGS[7] = 0xFF;
 	MMC3RegReset();
@@ -145,10 +212,8 @@ static void BMCFK23CReset(void) {
 
 static void BMCFK23CPower(void) {
 	GenMMC3Power();
-	EXPREGS[0] = 4;
-	EXPREGS[1] = 0xFF;
-	EXPREGS[2] = EXPREGS[3] = 0;
 	dipswitch = 0;
+	EXPREGS[0] = EXPREGS[1] = EXPREGS[2] = EXPREGS[3] = 0;
 	EXPREGS[4] = EXPREGS[5] = EXPREGS[6] = EXPREGS[7] = 0xFF;
 	SetWriteHandler(0x5000, 0x5fff, BMCFK23CWrite);
 	SetWriteHandler(0x8000, 0xFFFF, BMCFK23CHiWrite);
@@ -170,11 +235,13 @@ static void BMCFK23CAPower(void) {
 static void BMCFK23CAClose(void) {
 	if (CHRRAM)
 		FCEU_gfree(CHRRAM);
-	CHRRAM = NULL;
+	CHRRAM=NULL;
 }
 
 void BMCFK23C_Init(CartInfo *info) {
-	GenMMC3_Init(info, 512, 256, 128, 0);
+	is_BMCFK23CA = 0;
+
+	GenMMC3_Init(info, 512, 256, 8, 0);
 	cwrap = BMCFK23CCW;
 	pwrap = BMCFK23CPW;
 	info->Power = BMCFK23CPower;
@@ -182,22 +249,39 @@ void BMCFK23C_Init(CartInfo *info) {
 	AddExState(EXPREGS, 8, 0, "EXPR");
 	AddExState(&unromchr, 1, 0, "UCHR");
 	AddExState(&dipswitch, 1, 0, "DPSW");
+
+	int x;
+	uint64 partialmd5 = 0;
+	for (x = 0; x < 8; x++)
+		partialmd5 |= (uint64)info->MD5[15 - x] << (x * 8);
+	DetectPRGbonus(partialmd5);
+	prg_mask = 0x7F >> (prg_bonus);
 }
 
-void BMCFK23CA_Init(CartInfo *info) {
+void BMCFK23CA_Init(CartInfo *info)
-	GenMMC3_Init(info, 512, 256, 128, 0);
+{
-	cwrap = BMCFK23CCW;
+	is_BMCFK23CA = 1;
-	pwrap = BMCFK23CPW;
-	info->Power = BMCFK23CAPower;
-	info->Reset = BMCFK23CReset;
-	info->Close = BMCFK23CAClose;
 
-	CHRRAMSize = 8192;
+	GenMMC3_Init(info, 512, 256, 8, 0);
-	CHRRAM = (uint8*)FCEU_gmalloc(CHRRAMSize);
+	cwrap=BMCFK23CCW;
+	pwrap=BMCFK23CPW;
+	info->Power=BMCFK23CAPower;
+	info->Reset=BMCFK23CReset;
+	info->Close=BMCFK23CAClose;
+
+	CHRRAMSize=8192;
+	CHRRAM=(uint8*)FCEU_gmalloc(CHRRAMSize);
 	SetupCartCHRMapping(0x10, CHRRAM, CHRRAMSize, 1);
 	AddExState(CHRRAM, CHRRAMSize, 0, "CRAM");
 
 	AddExState(EXPREGS, 8, 0, "EXPR");
 	AddExState(&unromchr, 1, 0, "UCHR");
 	AddExState(&dipswitch, 1, 0, "DPSW");
+
+	int x;
+	uint64 partialmd5 = 0;
+	for (x = 0; x < 8; x++)
+		partialmd5 |= (uint64)info->MD5[15 - x] << (x * 8);
+	DetectPRGbonus(partialmd5);
+	prg_mask = 0x7F >> (prg_bonus);
 }

src/ines.c

@@ -831,7 +831,7 @@ static int iNES_Init(int num) {
 				case 13:  CHRRAMSize = 16 * 1024; break;
 				case 6:
 				case 96:  CHRRAMSize = 32 * 1024; break;
-				case 176: CHRRAMSize = 256 * 1024; break;
+				case 176: CHRRAMSize = 128 * 1024; break;
 				default:  CHRRAMSize = 8 * 1024; break;
 				}
 				if ((VROM = (uint8*)malloc(CHRRAMSize)) == NULL) return 0;