MAME 0.258 sync (part 1)

finalburnneo · Sep 11, 2023 · 3a8144d · 3a8144d
1 parent 81dbc6a
commit 3a8144d
Show file tree

Hide file tree

Showing 4 changed files with 107 additions and 37 deletions.
diff --git a/src/burn/drv/pst90s/d_metro.cpp b/src/burn/drv/pst90s/d_metro.cpp
@@ -5296,9 +5296,39 @@ struct BurnDriver BurnDrvDharmak = {
 };
 
 
-// Pururun
+// Pururun (set 1)
 
 static struct BurnRomInfo pururunRomDesc[] = {
+	{ "pu_ja-5.20e",			0x020000, 0xc15ae3db, 1 | BRF_PRG | BRF_ESS }, //  0 68k Code
+	{ "pu_ja-6.20c",			0x020000, 0x2e21328a, 1 | BRF_PRG | BRF_ESS }, //  1
+
+	{ "pu_ja-8.3i",				0x020000, 0xedc3830b, 2 | BRF_PRG | BRF_ESS }, //  2 uPD7810 Code
+
+	{ "pu_ja-2.14i",			0x080000, 0x93a9dbed, 3 | BRF_GRA },           //  3 Graphics
+	{ "pu_ja-4.18i",			0x080000, 0x47d82187, 3 | BRF_GRA },           //  4
+	{ "pu_ja-1.12i",			0x080000, 0x436096c6, 3 | BRF_GRA },           //  5
+	{ "pu_ja-3.16i",			0x080000, 0x80619e1a, 3 | BRF_GRA },           //  6
+
+	{ "pu_ja-7.3g",				0x040000, 0x51ae4926, 4 | BRF_SND },           //  7 MSM6295 Samples
+};
+
+STD_ROM_PICK(pururun)
+STD_ROM_FN(pururun)
+
+struct BurnDriver BurnDrvPururun = {
+	"pururun", NULL, NULL, NULL, "1995",
+	"Pururun (set 1)\0", NULL, "Metro / Banpresto", "Miscellaneous",
+	NULL, NULL, NULL, NULL,
+	BDF_GAME_WORKING | BDF_HISCORE_SUPPORTED, 2, HARDWARE_MISC_POST90S, GBF_PUZZLE, 0,
+	NULL, pururunRomInfo, pururunRomName, NULL, NULL, NULL, NULL, PururunInputInfo, PururunDIPInfo,
+	pururunInit, DrvExit, NoZ80Frame, i4x00_draw, DrvScan, &DrvRecalc, 0x1000,
+	320, 224, 4, 3
+};
+
+
+// Pururun (set 2)
+
+static struct BurnRomInfo pururunaRomDesc[] = {
 	{ "pu9-19-5.20e",			0x020000, 0x5a466a1b, 1 | BRF_PRG | BRF_ESS }, //  0 68k Code
 	{ "pu9-19-6.20c",			0x020000, 0xd155a53c, 1 | BRF_PRG | BRF_ESS }, //  1
 
@@ -5312,15 +5342,15 @@ static struct BurnRomInfo pururunRomDesc[] = {
 	{ "pu9-19-7.3g",			0x040000, 0x51ae4926, 4 | BRF_SND },           //  7 MSM6295 Samples
 };
 
-STD_ROM_PICK(pururun)
-STD_ROM_FN(pururun)
+STD_ROM_PICK(pururuna)
+STD_ROM_FN(pururuna)
 
-struct BurnDriver BurnDrvPururun = {
-	"pururun", NULL, NULL, NULL, "1995",
-	"Pururun\0", NULL, "Metro / Banpresto", "Miscellaneous",
+struct BurnDriver BurnDrvPururuna = {
+	"pururuna", "pururun", NULL, NULL, "1995",
+	"Pururun (set 2)\0", NULL, "Metro / Banpresto", "Miscellaneous",
 	NULL, NULL, NULL, NULL,
-	BDF_GAME_WORKING | BDF_HISCORE_SUPPORTED, 2, HARDWARE_MISC_POST90S, GBF_PUZZLE, 0,
-	NULL, pururunRomInfo, pururunRomName, NULL, NULL, NULL, NULL, PururunInputInfo, PururunDIPInfo,
+	BDF_GAME_WORKING | BDF_CLONE | BDF_HISCORE_SUPPORTED, 2, HARDWARE_MISC_POST90S, GBF_PUZZLE, 0,
+	NULL, pururunaRomInfo, pururunaRomName, NULL, NULL, NULL, NULL, PururunInputInfo, PururunDIPInfo,
 	pururunInit, DrvExit, NoZ80Frame, i4x00_draw, DrvScan, &DrvRecalc, 0x1000,
 	320, 224, 4, 3
 };

diff --git a/src/burn/drv/pst90s/d_raiden.cpp b/src/burn/drv/pst90s/d_raiden.cpp
@@ -886,13 +886,14 @@ static INT32 DrvScan(INT32 nAction, INT32 *pnMin)
 	return 0;
 }
 
-// Raiden (set 1)
+
+// Raiden (World set 1)
 
 static struct BurnRomInfo raidenRomDesc[] = {
 	{ "1.u0253",        0x010000, 0xa4b12785, BRF_ESS | BRF_PRG },  // CPU 0, V30
 	{ "2.u0252",        0x010000, 0x17640bd5, BRF_ESS | BRF_PRG },
 	{ "3.u022",     	0x020000, 0xf6af09d0, BRF_ESS | BRF_PRG },
-	{ "4j.u023",        0x020000, 0x505c4c5d, BRF_ESS | BRF_PRG },
+	{ "4.u023",     	0x020000, 0x6bdfd416, BRF_ESS | BRF_PRG },
 
 	{ "5.u042",     	0x020000, 0xed03562e, BRF_ESS | BRF_PRG },  // CPU 1, V30
 	{ "6.u043",     	0x020000, 0xa19d5b5d, BRF_ESS | BRF_PRG },
@@ -903,7 +904,7 @@ static struct BurnRomInfo raidenRomDesc[] = {
 	{ "10",         	0x008000, 0x5f90786a, BRF_GRA },
 	{ "sei420",     	0x080000, 0xda151f0b, BRF_GRA },
 	{ "sei430",     	0x080000, 0xac1f57ac, BRF_GRA },
-	{ "sei440",         0x080000, 0x946d7bde, BRF_GRA },
+	{ "sei440",     	0x080000, 0x946d7bde, BRF_GRA },
 
 	{ "7.u203",     	0x010000, 0x8f927822, BRF_SND },        	// Sound
 
@@ -922,7 +923,7 @@ static INT32 RaidenInit() {
 
 struct BurnDriver BurnDrvRaiden = {
 	"raiden", NULL, NULL, NULL, "1990",
-	"Raiden (set 1)\0", NULL, "Seibu Kaihatsu", "Miscellaneous",
+	"Raiden (World set 1)\0", NULL, "Seibu Kaihatsu", "Miscellaneous",
 	NULL, NULL, NULL, NULL,
 	BDF_GAME_WORKING | BDF_ORIENTATION_VERTICAL | BDF_HISCORE_SUPPORTED, 2, HARDWARE_MISC_POST90S, GBF_VERSHOOT, 0,
 	NULL, raidenRomInfo, raidenRomName, NULL, NULL, NULL, NULL, raidenInputInfo, raidenDIPInfo,
@@ -931,13 +932,13 @@ struct BurnDriver BurnDrvRaiden = {
 };
 
 
-// Raiden (set 2)
+// Raiden (Japan)
 
-static struct BurnRomInfo raidenaRomDesc[] = {
+static struct BurnRomInfo raidenjRomDesc[] = {
 	{ "1.u0253",        0x010000, 0xa4b12785, BRF_ESS | BRF_PRG },  // CPU 0, V30
 	{ "2.u0252",        0x010000, 0x17640bd5, BRF_ESS | BRF_PRG },
 	{ "3.u022",     	0x020000, 0xf6af09d0, BRF_ESS | BRF_PRG },
-	{ "4.u023",     	0x020000, 0x6bdfd416, BRF_ESS | BRF_PRG },
+	{ "4j.u023",        0x020000, 0x505c4c5d, BRF_ESS | BRF_PRG },
 
 	{ "5.u042",     	0x020000, 0xed03562e, BRF_ESS | BRF_PRG },  // CPU 1, V30
 	{ "6.u043",     	0x020000, 0xa19d5b5d, BRF_ESS | BRF_PRG },
@@ -948,7 +949,7 @@ static struct BurnRomInfo raidenaRomDesc[] = {
 	{ "10",         	0x008000, 0x5f90786a, BRF_GRA },
 	{ "sei420",     	0x080000, 0xda151f0b, BRF_GRA },
 	{ "sei430",     	0x080000, 0xac1f57ac, BRF_GRA },
-	{ "sei440",     	0x080000, 0x946d7bde, BRF_GRA },
+	{ "sei440",         0x080000, 0x946d7bde, BRF_GRA },
 
 	{ "7.u203",     	0x010000, 0x8f927822, BRF_SND },        	// Sound
 
@@ -958,15 +959,15 @@ static struct BurnRomInfo raidenaRomDesc[] = {
 	{ "rd006b.u0365",	0x000884, 0x00000000, BRF_OPT | BRF_NODUMP },
 };
 
-STD_ROM_PICK(raidena)
-STD_ROM_FN(raidena)
+STD_ROM_PICK(raidenj)
+STD_ROM_FN(raidenj)
 
-struct BurnDriver BurnDrvRaidena = {
-	"raidena", "raiden", NULL, NULL, "1990",
-	"Raiden (set 2)\0", NULL, "Seibu Kaihatsu", "Miscellaneous",
+struct BurnDriver BurnDrvRaidenj = {
+	"raidenj", "raiden", NULL, NULL, "1990",
+	"Raiden (Japan)\0", NULL, "Seibu Kaihatsu", "Miscellaneous",
 	NULL, NULL, NULL, NULL,
 	BDF_GAME_WORKING | BDF_ORIENTATION_VERTICAL | BDF_CLONE | BDF_HISCORE_SUPPORTED, 2, HARDWARE_MISC_POST90S, GBF_VERSHOOT, 0,
-	NULL, raidenaRomInfo, raidenaRomName, NULL, NULL, NULL, NULL, raidenInputInfo, raidenDIPInfo,
+	NULL, raidenjRomInfo, raidenjRomName, NULL, NULL, NULL, NULL, raidenInputInfo, raidenDIPInfo,
 	RaidenInit, DrvExit, DrvFrame, DrvDraw, DrvScan, &bRecalcPalette, 0x800,
 	224, 256, 3, 4
 };
@@ -1145,7 +1146,7 @@ struct BurnDriver BurnDrvRaidenkb = {
 	224, 256, 3, 4
 };
 
-// Raiden (set 3)
+// Raiden (World set 2, newer hardware)
 
 static struct BurnRomInfo raidenbRomDesc[] = {
 	{ "1.u0253",        	0x010000, 0xa4b12785, BRF_ESS | BRF_PRG },  // CPU 0, V30
@@ -1178,7 +1179,7 @@ static INT32 RaidenbInit() {
 
 struct BurnDriver BurnDrvRaidenb = {
 	"raidenb", "raiden", NULL, NULL, "1990",
-	"Raiden (set 3)\0", NULL, "Seibu Kaihatsu", "Miscellaneous",
+	"Raiden (World set 2, newer hardware)\0", NULL, "Seibu Kaihatsu", "Miscellaneous",
 	NULL, NULL, NULL, NULL,
 	BDF_GAME_WORKING | BDF_ORIENTATION_VERTICAL | BDF_CLONE | BDF_HISCORE_SUPPORTED, 2, HARDWARE_MISC_POST90S, GBF_VERSHOOT, 0,
 	NULL, raidenbRomInfo, raidenbRomName, NULL, NULL, NULL, NULL, raidenInputInfo, raidenDIPInfo,

diff --git a/src/burn/drv/pst90s/d_raiden2.cpp b/src/burn/drv/pst90s/d_raiden2.cpp
@@ -5501,9 +5501,48 @@ struct BurnDriver BurnDrvNzeroteam = {
 };
 
 
-// New Zero Team (V33 SYSTEM TYPE_B hardware, China?)
+// New Zero Team (V33 SYSTEM TYPE_B hardware, Zhongguo Shantou Yihuang license)
 
 static struct BurnRomInfo nzeroteamaRomDesc[] = {
+	{ "seibu_1.u0224",			0x080000, 0xcb277b46, 1 | BRF_PRG | BRF_ESS }, //  0 V33 Code
+	{ "seibu_2.u0226",			0x080000, 0x6debbf78, 1 | BRF_PRG | BRF_ESS }, //  1
+
+	{ "copx-d3.bin",			0x020000, 0xfa2cf3ad, 2 | BRF_GRA },           //  2 Copx data
+
+	{ "seibu_3.u01019",			0x010000, 0x7ec1fbc3, 3 | BRF_PRG | BRF_ESS }, //  3 Z80 Code
+
+	{ "seibu_5.u0616",			0x010000, 0xce68ba3c, 4 | BRF_GRA },           //  4 Characters
+	{ "seibu_6.u0617",			0x010000, 0xcf44aea7, 4 | BRF_GRA },           //  5
+
+	{ "back-1",					0x100000, 0x8b7f9219, 5 | BRF_GRA },           //  6 Tiles
+	{ "back-2",					0x080000, 0xce61c952, 5 | BRF_GRA },           //  7
+
+	{ "obj-1",					0x200000, 0x45be8029, 6 | BRF_GRA },           //  8 Sprites (Encrypted)
+	{ "obj-2",					0x200000, 0xcb61c19d, 6 | BRF_GRA },           //  9
+
+	{ "seibu_4.u099",			0x040000, 0x48be32b1, 7 | BRF_SND },           // 10 OKI Samples
+
+	{ "sysv33b-2.u0227.bin",	0x0117, 0xd9f4612f, 0 | BRF_OPT },
+	{ "sysv33b-1.u0222.bin",	0x0117, 0xf514a11f, 0 | BRF_OPT },
+};
+
+STD_ROM_PICK(nzeroteama)
+STD_ROM_FN(nzeroteama)
+
+struct BurnDriver BurnDrvNzeroteama = {
+	"nzeroteama", "zeroteam", NULL, NULL, "1997",
+	"New Zero Team (V33 SYSTEM TYPE_B hardware, Zhongguo Shantou Yihuang license)\0", NULL, "Seibu Kaihatsu (Zhongguo Shantou Yihuang license)", "Miscellaneous",
+	NULL, NULL, NULL, NULL,
+	BDF_GAME_WORKING | BDF_CLONE | BDF_HISCORE_SUPPORTED, 2, HARDWARE_MISC_POST90S, GBF_SCRFIGHT, 0,
+	NULL, nzeroteamaRomInfo, nzeroteamaRomName, NULL, NULL, NULL, NULL, NzeroteaInputInfo, NzeroteaDIPInfo,
+	NzeroteamInit, DrvExit, DrvFrame, ZeroteamDraw, DrvScan, &DrvRecalc, 0x800,
+	320, 256, 4, 3
+};
+
+
+// New Zero Team (V33 SYSTEM TYPE_B hardware, Haoyunlai Trading Company license)
+
+static struct BurnRomInfo nzeroteambRomDesc[] = {
 	{ "prg1",				0x080000, 0x3c7d9410, 1 | BRF_PRG | BRF_ESS }, //  0 V33 Code
 	{ "prg2",				0x080000, 0x6cba032d, 1 | BRF_PRG | BRF_ESS }, //  1
 
@@ -5526,15 +5565,15 @@ static struct BurnRomInfo nzeroteamaRomDesc[] = {
 	{ "sysv33b-1.u0222.bin",	0x0117, 0xf514a11f, 0 | BRF_OPT },
 };
 
-STD_ROM_PICK(nzeroteama)
-STD_ROM_FN(nzeroteama)
+STD_ROM_PICK(nzeroteamb)
+STD_ROM_FN(nzeroteamb)
 
-struct BurnDriver BurnDrvNzeroteama = {
-	"nzeroteama", "zeroteam", NULL, NULL, "1997",
-	"New Zero Team (V33 SYSTEM TYPE_B hardware, China?)\0", NULL, "Seibu Kaihatsu (Haoyunlai Trading Company license)", "Miscellaneous",
+struct BurnDriver BurnDrvNzeroteamb = {
+	"nzeroteamb", "zeroteam", NULL, NULL, "1997",
+	"New Zero Team (V33 SYSTEM TYPE_B hardware, Haoyunlai Trading Company license)\0", NULL, "Seibu Kaihatsu (Haoyunlai Trading Company license)", "Miscellaneous",
 	NULL, NULL, NULL, NULL,
 	BDF_GAME_WORKING | BDF_CLONE | BDF_HISCORE_SUPPORTED, 2, HARDWARE_MISC_POST90S, GBF_SCRFIGHT, 0,
-	NULL, nzeroteamaRomInfo, nzeroteamaRomName, NULL, NULL, NULL, NULL, NzeroteaInputInfo, NzeroteaDIPInfo,
+	NULL, nzeroteambRomInfo, nzeroteambRomName, NULL, NULL, NULL, NULL, NzeroteaInputInfo, NzeroteaDIPInfo,
 	NzeroteamInit, DrvExit, DrvFrame, ZeroteamDraw, DrvScan, &DrvRecalc, 0x800,
 	320, 256, 4, 3
 };

diff --git a/src/burn/drv/taito/d_lkage.cpp b/src/burn/drv/taito/d_lkage.cpp
@@ -955,7 +955,7 @@ struct BurnDriver BurnDrvLkageo = {
 
 // The Legend of Kage (oldest)
 
-static struct BurnRomInfo lkageooRomDesc[] = {
+static struct BurnRomInfo lkageo2RomDesc[] = {
 	{ "a54-01.37",			0x8000, 0x34eab2c5, 1 | BRF_PRG | BRF_ESS }, //  0 Z80 #0 Code
 	{ "a54-02.38",			0x8000, 0xea471d8a, 1 | BRF_PRG | BRF_ESS }, //  1
 
@@ -978,15 +978,15 @@ static struct BurnRomInfo lkageooRomDesc[] = {
 	{ "pal16l8a-a54-14.35", 0x0104, 0xa89c644e, 7 | BRF_OPT },  		 // 13
 };
 
-STD_ROM_PICK(lkageoo)
-STD_ROM_FN(lkageoo)
+STD_ROM_PICK(lkageo2)
+STD_ROM_FN(lkageo2)
 
-struct BurnDriver BurnDrvLkageoo = {
-	"lkageoo", "lkage", NULL, NULL, "1984",
+struct BurnDriver BurnDrvLkageo2 = {
+	"lkageo2", "lkage", NULL, NULL, "1984",
 	"The Legend of Kage (oldest)\0", NULL, "Taito Corporation", "Miscellaneous",
 	NULL, NULL, NULL, NULL,
 	BDF_GAME_WORKING | BDF_CLONE | BDF_HISCORE_SUPPORTED, 2, HARDWARE_TAITO_MISC, GBF_SCRFIGHT, 0,
-	NULL, lkageooRomInfo, lkageooRomName, NULL, NULL, NULL, NULL, LkageInputInfo, LkageDIPInfo,
+	NULL, lkageo2RomInfo, lkageo2RomName, NULL, NULL, NULL, NULL, LkageInputInfo, LkageDIPInfo,
 	DrvInit, DrvExit, DrvFrame, DrvDraw, DrvScan, &DrvRecalc, 0x400,
 	240, 224, 4, 3
 };