From 8844afc74347594a34d6973a46b70fed481bdf82 Mon Sep 17 00:00:00 2001
From: Barry Harris <44396066+barry65536@users.noreply.github.com>
Date: Mon, 19 Nov 2012 14:32:45 +0000
Subject: [PATCH] Add single PCB version of mvsc (Barry, ranger_lennier, Yohji,
 Tormod, Smitdogg, The Dumping Union)

---
 src/burn/drv/capcom/cps.cpp       | 11 +++++++++++
 src/burn/drv/capcom/cps2_crpt.cpp |  1 +
 src/burn/drv/capcom/d_cps2.cpp    | 28 ++++++++++++++++++++++++++++
 3 files changed, 40 insertions(+)

diff --git a/src/burn/drv/capcom/cps.cpp b/src/burn/drv/capcom/cps.cpp
index b1ac7218f..4afa0e215 100644
--- a/src/burn/drv/capcom/cps.cpp
+++ b/src/burn/drv/capcom/cps.cpp
@@ -1166,6 +1166,17 @@ static INT32 CpsGetROMs(bool bLoad)
 			}
 			continue;
 		}
+		if ((ri.nType & 15) == 8) {
+			if (bLoad) {
+				BurnLoadRom(CpsRomLoad + 0x01, i + 0, 2);
+				BurnLoadRom(CpsRomLoad + 0x00, i + 1, 2);
+				CpsRomLoad += ri.nLen * 2;
+				i++;
+			} else {
+				nCpsRomLen += ri.nLen;
+			}
+			continue;
+		}
 		// XOR tables
 		if ((ri.nType & 7) == 2) {
 			if (bLoad) {
diff --git a/src/burn/drv/capcom/cps2_crpt.cpp b/src/burn/drv/capcom/cps2_crpt.cpp
index eb072e169..2e5c6d5de 100644
--- a/src/burn/drv/capcom/cps2_crpt.cpp
+++ b/src/burn/drv/capcom/cps2_crpt.cpp
@@ -973,6 +973,7 @@ static const struct game_keys keys_table[] =
 	{ "mvscur1",    { 0x692dc41b,0x7ef1c805 }, 0x100000 },	// 0C81 1972 0121  cmpi.l  #$19720121,D1
 	{ "mvscj",      { 0xafc16138,0x97123eb0 }, 0x100000 },	// 0C81 1972 0121  cmpi.l  #$19720121,D1
 	{ "mvscjr1",    { 0xafc16138,0x97123eb0 }, 0x100000 },	// 0C81 1972 0121  cmpi.l  #$19720121,D1
+	{ "mvscjsing",  { 0xafc16138,0x97123eb0 }, 0x100000 },	// 0C81 1972 0121  cmpi.l  #$19720121,D1
 	{ "mvsca",      { 0xf248aec6,0x7905cd17 }, 0x100000 },	// 0C81 1972 0121  cmpi.l  #$19720121,D1
 	{ "mvscar1",    { 0xf248aec6,0x7905cd17 }, 0x100000 },	// 0C81 1972 0121  cmpi.l  #$19720121,D1
 	{ "mvsch",      { 0x9d5c7a23,0xe56b18ef }, 0x100000 },	// 0C81 1972 0121  cmpi.l  #$19720121,D1
diff --git a/src/burn/drv/capcom/d_cps2.cpp b/src/burn/drv/capcom/d_cps2.cpp
index 438516440..f5f7ef943 100644
--- a/src/burn/drv/capcom/d_cps2.cpp
+++ b/src/burn/drv/capcom/d_cps2.cpp
@@ -3950,6 +3950,24 @@ static struct BurnRomInfo Mvscur1RomDesc[] = {
 STD_ROM_PICK(Mvscur1)
 STD_ROM_FN(Mvscur1)
 
+static struct BurnRomInfo MvscjsingRomDesc[] = {
+	{ "mvc_ja.simm1",  0x200000, 0x6a2ef7c2, 8 | BRF_ESS | BRF_PRG },
+	{ "mvc_ja.simm2",  0x200000, 0x699d09ad, 8 | BRF_ESS | BRF_PRG },
+
+	{ "mvc64-13m.13",  0x800000, 0x8428ce69, 3 | BRF_GRA },
+	{ "mvc64-15m.15",  0x800000, 0x2e0028f4, 3 | BRF_GRA },
+	{ "mvc64-17m.17",  0x800000, 0x308ca826, 3 | BRF_GRA },
+	{ "mvc64-19m.19",  0x800000, 0x10699fe1, 3 | BRF_GRA },
+
+	{ "mvc.01",        0x020000, 0x41629e95, 4 | BRF_ESS | BRF_PRG },
+	{ "mvc.02",        0x020000, 0x963abf6b, 4 | BRF_ESS | BRF_PRG },
+
+	{ "mvc64-11m.11",  0x800000, 0x5d8819e0, 5 | BRF_SND },
+};
+
+STD_ROM_PICK(Mvscjsing)
+STD_ROM_FN(Mvscjsing)
+
 static struct BurnRomInfo NwarrRomDesc[] = {
 	{ "vphe.03f",      0x080000, 0xa922c44f, 1 | BRF_ESS | BRF_PRG },
 	{ "vphe.04c",      0x080000, 0x7312d890, 1 | BRF_ESS | BRF_PRG },
@@ -8341,6 +8359,16 @@ struct BurnDriver BurnDrvCpsMvscur1 = {
 	&CpsRecalcPal, 0x1000, 384, 224, 4, 3
 };
 
+struct BurnDriver BurnDrvCpsMvscjsing = {
+	"mvscjsing", "mvsc", NULL, NULL, "1998",
+	"Marvel vs Capcom - clash of super heroes (980123 Japan, single PCB)\0", NULL, "Capcom", "CPS2",
+	NULL, NULL, NULL, NULL,
+	BDF_GAME_WORKING | BDF_CLONE, 2, HARDWARE_CAPCOM_CPS2, GBF_VSFIGHT, FBF_SF,
+	NULL, MvscjsingRomInfo, MvscjsingRomName, NULL, NULL, Cps2FightingInputInfo, NULL,
+	Cps2Init, DrvExit, Cps2Frame, CpsRedraw, CpsAreaScan,
+	&CpsRecalcPal, 0x1000, 384, 224, 4, 3
+};
+
 struct BurnDriver BurnDrvCpsNwarr = {
 	"nwarr", NULL, NULL, NULL, "1995",
 	"Night Warriors - darkstalkers' revenge (950316 Euro)\0", NULL, "Capcom", "CPS2",