From ebf0c2c7375932a98f5203bbb7f399f7c0b1c4a9 Mon Sep 17 00:00:00 2001
From: zeromus <zeromus@users.noreply.github.com>
Date: Wed, 18 Jan 2023 11:05:30 -0600
Subject: [PATCH] update 225 from fceumm to get 255 support too.

---
 src/boards/225.cpp | 76 +++++++++++++++++++++++++---------------------
 src/ines.cpp       |  2 +-
 src/ines.h         |  1 +
 3 files changed, 44 insertions(+), 35 deletions(-)

diff --git a/src/boards/225.cpp b/src/boards/225.cpp
index e8237ed6..f1857374 100644
--- a/src/boards/225.cpp
+++ b/src/boards/225.cpp
@@ -1,30 +1,40 @@
 /* FCE Ultra - NES/Famicom Emulator
- *
- * Copyright notice for this file:
- *  Copyright (C) 2011 CaH4e3
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- */
+*
+* Copyright notice for this file:
+*  Copyright (C) 2011 CaH4e3
+* Copyright (C) 2019 Libretro Team
+*  Copyright (C) 2020
+*
+* This program is free software; you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation; either version 2 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program; if not, write to the Free Software
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+*
+* PCB-018 board, discrete multigame cart 110-in-1
+*
+* Mapper 225
+* Mapper 255
+*
+*/
+
+/* 2020-2-20 - merge mapper 255, re-implement extra RAM */
 
 #include "mapinc.h"
 
-static uint8 prot[4], prg, mode, chr, mirr;
+static uint8 extraRAM[4], prg, mode, chr, mirr;
 
 static SFORMAT StateRegs[] =
 {
-	{ prot, 4, "PROT" },
+	{ extraRAM, 4, "PROT" },
 	{ &prg, 1, "PRG" },
 	{ &chr, 1, "CHR" },
 	{ &mode, 1, "MODE" },
@@ -36,14 +46,15 @@ static void Sync(void) {
 	if (mode) {
 		setprg16(0x8000, prg);
 		setprg16(0xC000, prg);
-	} else
+	}
+	else
 		setprg32(0x8000, prg >> 1);
 	setchr8(chr);
 	setmirror(mirr ^ 1);
 }
 
 static DECLFW(M225Write) {
-	uint32 bank = (A >> 14) & 1;
+	uint8 bank = (A >> 14) & 1;
 	mirr = (A >> 13) & 1;
 	mode = (A >> 12) & 1;
 	chr = (A & 0x3f) | (bank << 6);
@@ -52,35 +63,28 @@ static DECLFW(M225Write) {
 }
 
 static DECLFW(M225LoWrite) {
-	if (A & 0x800) {
-		prot[A & 0x03] = V;
-	}
+	/* e.g. 115-in-1 [p1][!] CRC32 0xb39d30b4 */
+	if (A & 0x800) extraRAM[A & 3] = V & 0x0F;
 }
 
 static DECLFR(M225LoRead) {
-	if (A & 0x800) {
-		return prot[A & 3] & 0x0F;
-	}
+	if (A & 0x800) return extraRAM[A & 3];
 	return X.DB;
 }
 
 static void M225Power(void) {
 	prg = 0;
-	chr = 0;
 	mode = 0;
-	mirr = 0;
 	Sync();
-	SetReadHandler(0x5000, 0x5FFF, M225LoRead);
-	SetWriteHandler(0x5000, 0x5FFF, M225LoWrite);
+	SetReadHandler(0x5000, 0x5fff, M225LoRead);
+	SetWriteHandler(0x5000, 0x5fff, M225LoWrite);
 	SetReadHandler(0x8000, 0xFFFF, CartBR);
 	SetWriteHandler(0x8000, 0xFFFF, M225Write);
 }
 
 static void M225Reset(void) {
 	prg = 0;
-	chr = 0;
 	mode = 0;
-	mirr = 0;
 	Sync();
 }
 
@@ -94,3 +98,7 @@ void Mapper225_Init(CartInfo *info) {
 	GameStateRestore = StateRestore;
 	AddExState(&StateRegs, ~0, 0, 0);
 }
+
+void Mapper255_Init(CartInfo *info) {
+	Mapper225_Init(info);
+}
\ No newline at end of file
diff --git a/src/ines.cpp b/src/ines.cpp
index 721668ae..0a2c7c73 100644
--- a/src/ines.cpp
+++ b/src/ines.cpp
@@ -770,7 +770,7 @@ BMAPPINGLocal bmap[] = {
 	{"SAN GUO ZHI PIRATE",	252, Mapper252_Init},
 	{"DRAGON BALL PIRATE",	253, Mapper253_Init},
 	{"",					254, Mapper254_Init},
-//	{"",					255, Mapper255_Init},	// No good dumps for this mapper
+	{"",					255, Mapper255_Init},	// dupe of 225
 
 //-------- Mappers 256-511 is the Supplementary Multilingual Plane ----------
 //-------- Mappers 512-767 is the Supplementary Ideographic Plane -----------
diff --git a/src/ines.h b/src/ines.h
index 9d4e684b..f1b0d231 100644
--- a/src/ines.h
+++ b/src/ines.h
@@ -274,6 +274,7 @@ void Mapper250_Init(CartInfo *);
 void Mapper252_Init(CartInfo *);
 void Mapper253_Init(CartInfo *);
 void Mapper254_Init(CartInfo *);
+void Mapper255_Init(CartInfo *);
 void Mapper354_Init(CartInfo *);
 void Mapper406_Init(CartInfo *);