summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Aaron Giles <aaron@aarongiles.com>2008-09-18 16:00:41 +0000
committer Aaron Giles <aaron@aarongiles.com>2008-09-18 16:00:41 +0000
commit2cb15a90471638124699aada3beaa52610f7eb0a (patch)
treefc7b93347d3d7b6d7e54d9034030d651f43f0444
parentdb3e968a6d7e95590a3a59c9de1e2e3f31cbc81a (diff)
From: Barry Harris [mailto:barry@barryharris.me.uk]
Sent: Monday, September 15, 2008 5:31 AM To: submit@mamedev.org Subject: Patch for new dumps Hi, I have attached a patch which adds support for the following; * The "Three Wonders (Hack?)" dump from the EMMA dumping team (I'm not 100% sure of the CPS B-ID this should use) * The "Marvel vs. Capcom (Euro 980123)" dump by bonky_0013 (this becomes the parent set). Regards, Barry Harris
-rw-r--r--src/mame/drivers/cps1.c54
-rw-r--r--src/mame/drivers/cps2.c34
-rw-r--r--src/mame/machine/cps2crpt.c1
-rw-r--r--src/mame/mamedriv.c4
-rw-r--r--src/mame/video/cps1.c1
5 files changed, 92 insertions, 2 deletions
diff --git a/src/mame/drivers/cps1.c b/src/mame/drivers/cps1.c
index d5d80fcfa44..414d1f8405a 100644
--- a/src/mame/drivers/cps1.c
+++ b/src/mame/drivers/cps1.c
@@ -5591,6 +5591,59 @@ ROM_START( wonder3 )
ROM_LOAD( "ioc1.ic1", 0x0000, 0x0117, CRC(0d182081) SHA1(475b3d417785da4bc512cce2b274bb00d4cc6792) )
ROM_END
+/* Three Wonders (hack?) */
+ROM_START( 3wonderh )
+ ROM_REGION( CODE_SIZE, "main", 0 ) /* 68000 code */
+ ROM_LOAD16_BYTE( "22.bin", 0x00000, 0x20000, CRC(e6071884) SHA1(5cf1a859739cf98846cb049b64fd083733acb29c) )
+ ROM_LOAD16_BYTE( "26.bin", 0x00001, 0x20000, CRC(a28447b7) SHA1(e3f11911f1d3d115c03edf1bb6c8a68fccd9e9b3) )
+ ROM_LOAD16_BYTE( "23.bin", 0x40000, 0x20000, CRC(fd3d6509) SHA1(0824ec397d12c2b832c9e694c23b59c2e489ed3b) )
+ ROM_LOAD16_BYTE( "27.bin", 0x40001, 0x20000, CRC(999cba3d) SHA1(99dfb902c0c77f798a868eb13340eb54fb4a84d3) )
+ ROM_LOAD16_BYTE( "rt_28a.9f", 0x80000, 0x20000, CRC(054137c8) SHA1(e4c406e0a32198323a5931093fbaa6836510b8ad) )
+ ROM_LOAD16_BYTE( "rt_33a.9h", 0x80001, 0x20000, CRC(7264cb1b) SHA1(b367acb9f6579569321ecaa98a14e29dd775b9db) )
+ ROM_LOAD16_BYTE( "rte_29a.10f", 0xc0000, 0x20000, CRC(cddaa919) SHA1(0c98e95ad5033d2c5ade7651243e7ccdb4e35463) )
+ ROM_LOAD16_BYTE( "rte_34a.10h", 0xc0001, 0x20000, CRC(ed52e7e5) SHA1(352433ae484967d26376141e3a8a0f968b98fde6) )
+
+ ROM_REGION( 0x400000, "gfx", 0 )
+ ROMX_LOAD( "16.bin", 0x000000, 0x40000, CRC(c997bca2) SHA1(6b6cd9c2fc56690c42a3368cd5e6c98d6bff5b5b) , ROM_SKIP(7) )
+ ROMX_LOAD( "6.bin", 0x000001, 0x40000, CRC(3eea321a) SHA1(4368aaf8a532c29f4b950adb2daedd3069d84cf1) , ROM_SKIP(7) )
+ ROMX_LOAD( "18.bin", 0x000002, 0x40000, CRC(98acdfd4) SHA1(910dfd6742e166530388c700c0797e692e501f97) , ROM_SKIP(7) )
+ ROMX_LOAD( "8.bin", 0x000003, 0x40000, CRC(dc9ca6f9) SHA1(77549e9a128d1b7ca0c4547cdc56f43450d426e0) , ROM_SKIP(7) )
+ ROMX_LOAD( "12.bin", 0x000004, 0x40000, CRC(0d8a6007) SHA1(48d61cbd91df01ba4b2f0e80e60375a50ddb065e) , ROM_SKIP(7) )
+ ROMX_LOAD( "2.bin", 0x000005, 0x40000, CRC(d75563b9) SHA1(7b7b105b84dc5d7b17838961fdd8be5bac90cbc6) , ROM_SKIP(7) )
+ ROMX_LOAD( "14.bin", 0x000006, 0x40000, CRC(84369a28) SHA1(3877186371fe289522133fd99be034b141a974ca) , ROM_SKIP(7) )
+ ROMX_LOAD( "4.bin", 0x000007, 0x40000, CRC(d4831578) SHA1(9ff5860f22976e9e4c023946f35e24fde84fe8ea) , ROM_SKIP(7) )
+ ROMX_LOAD( "17.bin", 0x200000, 0x40000, CRC(040edff5) SHA1(9747d67b980cc357c6fa732300a84ae55150bc51) , ROM_SKIP(7) )
+ ROMX_LOAD( "7.bin", 0x200001, 0x40000, CRC(c7c0468c) SHA1(e7a14cf579b023e8954b7e06aa2337db4f53bedc) , ROM_SKIP(7) )
+ ROMX_LOAD( "19.bin", 0x200002, 0x40000, CRC(9fef114f) SHA1(394afb083ce7c46d9a39097d0040f9e18aaab508) , ROM_SKIP(7) )
+ ROMX_LOAD( "9.bin", 0x200003, 0x40000, CRC(48cbfba5) SHA1(74047433e50795e29d8299526ae2c424610f0a5e) , ROM_SKIP(7) )
+ ROMX_LOAD( "13.bin", 0x200004, 0x40000, CRC(8fc3d7d1) SHA1(e2784e0fccfe062ea8dc440e4a884fc665f4a846) , ROM_SKIP(7) )
+ ROMX_LOAD( "3.bin", 0x200005, 0x40000, CRC(c65e9a86) SHA1(359ab1e2dd0fcf38ed9815a6a50294cbeca8223c) , ROM_SKIP(7) )
+ ROMX_LOAD( "15.bin", 0x200006, 0x40000, CRC(f239341a) SHA1(b1858f5f7a5d210c5327b84a797ed7e898250596) , ROM_SKIP(7) )
+ ROMX_LOAD( "5.bin", 0x200007, 0x40000, CRC(947ac944) SHA1(d962f49ba532fc60209bb3957ff8a456855ef67f) , ROM_SKIP(7) )
+
+ ROM_REGION( 0x18000, "audio", 0 ) /* 64k for the audio CPU (+banks) */
+ ROM_LOAD( "rt_9.12b", 0x00000, 0x08000, CRC(abfca165) SHA1(428069d3bdc45775854cd0e8abe447f134fe5492) )
+ ROM_CONTINUE( 0x10000, 0x08000 )
+
+ ROM_REGION( 0x40000, "oki", 0 ) /* Samples */
+ ROM_LOAD( "rt_18.11c", 0x00000, 0x20000, CRC(26b211ab) SHA1(0ea03fdd9edff41eacfc52aa9e0421c10968356b) )
+ ROM_LOAD( "rt_19.12c", 0x20000, 0x20000, CRC(dbe64ad0) SHA1(09f2ad522fe75d7bcca094b8c6696c3733b539d5) )
+
+ ROM_REGION( 0x0200, "aboardplds", ROMREGION_DISPOSE )
+ ROM_LOAD( "buf1", 0x0000, 0x0117, CRC(eb122de7) SHA1(b26b5bfe258e3e184f069719f9fd008d6b8f6b9b) )
+ ROM_LOAD( "ioa1", 0x0000, 0x0117, CRC(59c7ee3b) SHA1(fbb887c5b4f5cb8df77cec710eaac2985bc482a6) )
+ ROM_LOAD( "prg1", 0x0000, 0x0117, CRC(f1129744) SHA1(a5300f301c1a08a7da768f0773fa0fe3f683b237) )
+ ROM_LOAD( "rom1", 0x0000, 0x0117, CRC(41dc73b9) SHA1(7d4c9f1693c821fbf84e32dd6ef62ddf14967845) )
+ ROM_LOAD( "sou1", 0x0000, 0x0117, CRC(84f4b2fe) SHA1(dcc9e86cc36316fe42eace02d6df75d08bc8bb6d) )
+
+ ROM_REGION( 0x0200, "bboardplds", ROMREGION_DISPOSE )
+ ROM_LOAD( "rt24b.1a", 0x0000, 0x0117, CRC(54b85159) SHA1(c6f4fb5d747a215f4f50e4f2258e35d3f9bdbb2e) )
+ ROM_LOAD( "iob1.11e", 0x0000, 0x0117, CRC(3abc0700) SHA1(973043aa46ec6d5d1db20dc9d5937005a0f9f6ae) )
+
+ ROM_REGION( 0x0200, "cboardplds", ROMREGION_DISPOSE )
+ ROM_LOAD( "ioc1.ic1", 0x0000, 0x0117, CRC(0d182081) SHA1(475b3d417785da4bc512cce2b274bb00d4cc6792) )
+ROM_END
+
/* B-Board 90629B */
ROM_START( kod )
ROM_REGION( CODE_SIZE, "main", 0 ) /* 68000 code */
@@ -8337,6 +8390,7 @@ GAME( 1991, sf2jc, sf2, cps1_10MHz, sf2j, cps1, ROT0, "Capcom"
GAME( 1991, 3wonders, 0, cps1_10MHz, 3wonders, cps1, ROT0, "Capcom", "Three Wonders (World 910520)" , 0) // "ETC"
GAME( 1991, 3wonderu, 3wonders, cps1_10MHz, 3wonders, cps1, ROT0, "Capcom", "Three Wonders (US 910520)", 0 )
GAME( 1991, wonder3, 3wonders, cps1_10MHz, 3wonders, cps1, ROT0, "Capcom", "Wonder 3 (Japan 910520)", 0 )
+GAME( 1991, 3wonderh, 3wonders, cps1_10MHz, 3wonders, cps1, ROT0, "bootleg","Three Wonders (hack?)", 0 )
GAME( 1991, kod, 0, cps1_10MHz, kod, cps1, ROT0, "Capcom", "The King of Dragons (World 910711)" , 0) // "ETC"
GAME( 1991, kodu, kod, cps1_10MHz, kodj, cps1, ROT0, "Capcom", "The King of Dragons (US 910910)", 0 )
GAME( 1991, kodj, kod, cps1_10MHz, kodj, cps1, ROT0, "Capcom", "The King of Dragons (Japan 910805)", 0 )
diff --git a/src/mame/drivers/cps2.c b/src/mame/drivers/cps2.c
index 3d002d26452..a444cebf962 100644
--- a/src/mame/drivers/cps2.c
+++ b/src/mame/drivers/cps2.c
@@ -3891,6 +3891,37 @@ ROM_END
ROM_START( mvsc )
ROM_REGION( CODE_SIZE, "main", 0 ) /* 68000 code */
+ ROM_LOAD16_WORD_SWAP( "mvce.03a", 0x000000, 0x80000, CRC(824e4a90) SHA1(5c79c166d988d8a75d9941f4ee6fa4d6476e55e1) )
+ ROM_LOAD16_WORD_SWAP( "mvce.04a", 0x080000, 0x80000, CRC(cac02153) SHA1(ee9f9da6fda53f21ba7b74367612c90281269690) )
+ ROM_LOAD16_WORD_SWAP( "mvc.05a", 0x100000, 0x80000, CRC(2d8c8e86) SHA1(b07d640a734c5d336054ed05195786224c9a6cd4) )
+ ROM_LOAD16_WORD_SWAP( "mvc.06a", 0x180000, 0x80000, CRC(8528e1f5) SHA1(cd065c05268ab581b05676da544baf6af642acac) )
+ ROM_LOAD16_WORD_SWAP( "mvc.07", 0x200000, 0x80000, CRC(c3baa32b) SHA1(d35589847e0753e869ffcd7c3abed925bfdb0fa2) )
+ ROM_LOAD16_WORD_SWAP( "mvc.08", 0x280000, 0x80000, CRC(bc002fcd) SHA1(0b6735a071a9274f7ab25c743271fc30411fe819) )
+ ROM_LOAD16_WORD_SWAP( "mvc.09", 0x300000, 0x80000, CRC(c67b26df) SHA1(6e9969246c57269d7ba0992a5cc319c8910bf8a9) )
+ ROM_LOAD16_WORD_SWAP( "mvc.10", 0x380000, 0x80000, CRC(0fdd1e26) SHA1(5fa684d823b4f4eec61ed9e9b8938af5272ae1ed) )
+
+ ROM_REGION( 0x2000000, "gfx", 0 )
+ ROMX_LOAD( "mvc.13m", 0x0000000, 0x400000, CRC(fa5f74bc) SHA1(79a619248938a85ce4f7794a704647b9cf564fbc) , ROM_GROUPWORD | ROM_SKIP(6) )
+ ROMX_LOAD( "mvc.15m", 0x0000002, 0x400000, CRC(71938a8f) SHA1(6982f7203458c1c46a1c1c13c0d0f2a5e109d271) , ROM_GROUPWORD | ROM_SKIP(6) )
+ ROMX_LOAD( "mvc.17m", 0x0000004, 0x400000, CRC(92741d07) SHA1(ddfd70eab7c983ab452194b1860059f8ad694459) , ROM_GROUPWORD | ROM_SKIP(6) )
+ ROMX_LOAD( "mvc.19m", 0x0000006, 0x400000, CRC(bcb72fc6) SHA1(46ab98dcdf6f5d611646a22a7355939ef5b2bbe5) , ROM_GROUPWORD | ROM_SKIP(6) )
+ ROMX_LOAD( "mvc.14m", 0x1000000, 0x400000, CRC(7f1df4e4) SHA1(ede92b31c1fe87f91b4fe74ac211f2fb5f863bc2) , ROM_GROUPWORD | ROM_SKIP(6) )
+ ROMX_LOAD( "mvc.16m", 0x1000002, 0x400000, CRC(90bd3203) SHA1(ed83208c486ea0f407b7e5d16a8cf242a6f73774) , ROM_GROUPWORD | ROM_SKIP(6) )
+ ROMX_LOAD( "mvc.18m", 0x1000004, 0x400000, CRC(67aaf727) SHA1(e0e69104e31d2c41e18c0d24e9ab962406a7ca9a) , ROM_GROUPWORD | ROM_SKIP(6) )
+ ROMX_LOAD( "mvc.20m", 0x1000006, 0x400000, CRC(8b0bade8) SHA1(c5732361bb4bf284c4d12a82ac2c5750b1f9d441) , ROM_GROUPWORD | ROM_SKIP(6) )
+
+ ROM_REGION( QSOUND_SIZE, "audio", 0 ) /* 64k for the audio CPU (+banks) */
+ ROM_LOAD( "mvc.01", 0x00000, 0x08000, CRC(41629e95) SHA1(36925c05b5fdcbe43283a882d021e5360c947061) )
+ ROM_CONTINUE( 0x10000, 0x18000 )
+ ROM_LOAD( "mvc.02", 0x28000, 0x20000, CRC(963abf6b) SHA1(6b784870e338701cefabbbe4669984b5c4e8a9a5) )
+
+ ROM_REGION( 0x800000, "qsound", 0 ) /* QSound samples */
+ ROM_LOAD16_WORD_SWAP( "mvc.11m", 0x000000, 0x400000, CRC(850fe663) SHA1(81e519d05a08855f242ea2e17ee0859b449db895) )
+ ROM_LOAD16_WORD_SWAP( "mvc.12m", 0x400000, 0x400000, CRC(7ccb1896) SHA1(74caadf3282fcc6acffb1bbe3734106f81124121) )
+ROM_END
+
+ROM_START( mvscr1 )
+ ROM_REGION( CODE_SIZE, "main", 0 ) /* 68000 code */
ROM_LOAD16_WORD_SWAP( "mvce.03", 0x000000, 0x80000, CRC(e0633fc0) SHA1(d2feffb5505a2f8940192ae267f49561fc580b87) )
ROM_LOAD16_WORD_SWAP( "mvce.04", 0x080000, 0x80000, CRC(a450a251) SHA1(1e34fa55bb93c7573ab0205f8c5620a51765d3eb) )
ROM_LOAD16_WORD_SWAP( "mvc.05", 0x100000, 0x80000, CRC(7db71ce9) SHA1(a0097109e9f4aba40791932269d600c0ffa099a7) )
@@ -7381,7 +7412,8 @@ GAME( 1997, sgemfh, sgemf, cps2, cps2_2p3b, cps2, ROT0, "Capcom", "Su
GAME( 1997, vhunt2, 0, cps2, cps2_2p6b, cps2, ROT0, "Capcom", "Vampire Hunter 2: Darkstalkers Revenge (Japan 970929)", 0 )
GAME( 1997, vhunt2r1, vhunt2, cps2, cps2_2p6b, cps2, ROT0, "Capcom", "Vampire Hunter 2: Darkstalkers Revenge (Japan 970913)", 0 )
GAME( 1997, vsav2, 0, cps2, cps2_2p6b, cps2, ROT0, "Capcom", "Vampire Savior 2: The Lord of Vampire (Japan 970913)", 0 )
-GAME( 1998, mvsc, 0, cps2, cps2_2p6b, cps2, ROT0, "Capcom", "Marvel Vs. Capcom: Clash of Super Heroes (Euro 980112)", 0 )
+GAME( 1998, mvsc, 0, cps2, cps2_2p6b, cps2, ROT0, "Capcom", "Marvel Vs. Capcom: Clash of Super Heroes (Euro 980123)", 0 )
+GAME( 1998, mvscr1, mvsc, cps2, cps2_2p6b, cps2, ROT0, "Capcom", "Marvel Vs. Capcom: Clash of Super Heroes (Euro 980112)", 0 )
GAME( 1998, mvscu, mvsc, cps2, cps2_2p6b, cps2, ROT0, "Capcom", "Marvel Vs. Capcom: Clash of Super Heroes (USA 980123)", 0 )
GAME( 1998, mvscj, mvsc, cps2, cps2_2p6b, cps2, ROT0, "Capcom", "Marvel Vs. Capcom: Clash of Super Heroes (Japan 980123)", 0 )
GAME( 1998, mvscjr1, mvsc, cps2, cps2_2p6b, cps2, ROT0, "Capcom", "Marvel Vs. Capcom: Clash of Super Heroes (Japan 980112)", 0 )
diff --git a/src/mame/machine/cps2crpt.c b/src/mame/machine/cps2crpt.c
index eb86efc9a3c..6a1e14f1e73 100644
--- a/src/mame/machine/cps2crpt.c
+++ b/src/mame/machine/cps2crpt.c
@@ -915,6 +915,7 @@ static const struct game_keys keys_table[] =
{ "vsavh", { 0xb2d37c8d,0xd3b7aadd }, 0x100000 }, // 0C80 726A 4BAF cmpi.l #$726A4BAF,D0
{ "vsav2", { 0xd681e4f4,0x60371edf }, 0x100000 }, // 0C80 0692 0760 cmpi.l #$06920760,D0
{ "mvsc", { 0x48025ade,0x1c697b27 }, 0x100000 }, // 0C81 1972 0121 cmpi.l #$19720121,D1
+ { "mvscr1", { 0x48025ade,0x1c697b27 }, 0x100000 }, // 0C81 1972 0121 cmpi.l #$19720121,D1
{ "mvscu", { 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
diff --git a/src/mame/mamedriv.c b/src/mame/mamedriv.c
index 2bfadd0b9ea..f68d396f198 100644
--- a/src/mame/mamedriv.c
+++ b/src/mame/mamedriv.c
@@ -2449,6 +2449,7 @@ V-V TP-027
DRIVER( 3wonders ) /* 20/05/1991 (c) 1991 (World) */
DRIVER( 3wonderu ) /* 20/05/1991 (c) 1991 (US) */
DRIVER( wonder3 ) /* 20/05/1991 (c) 1991 (Japan) */
+ DRIVER( 3wonderh ) /* hack? */
DRIVER( kod ) /* 11/07/1991 (c) 1991 (World) */
DRIVER( kodu ) /* 10/09/1991 (c) 1991 (US) */
DRIVER( kodj ) /* 05/08/1991 (c) 1991 (Japan) */
@@ -2689,7 +2690,8 @@ V-V TP-027
DRIVER( vhunt2r1 ) /* 13/09/1997 (c) 1997 (Japan) */
DRIVER( vhunt2 ) /* 29/09/1997 (c) 1997 (Japan) */
DRIVER( vsav2 ) /* 13/09/1997 (c) 1997 (Japan) */
- DRIVER( mvsc ) /* 12/01/1998 (c) 1998 (Euro) */
+ DRIVER( mvsc ) /* 23/01/1998 (c) 1998 (Euro) */
+ DRIVER( mvscr1 ) /* 12/01/1998 (c) 1998 (Euro) */
DRIVER( mvscu ) /* 23/01/1998 (c) 1998 (US) */
DRIVER( mvscj ) /* 23/01/1998 (c) 1998 (Japan) */
DRIVER( mvscjr1 ) /* 12/01/1998 (c) 1998 (Japan) */
diff --git a/src/mame/video/cps1.c b/src/mame/video/cps1.c
index ae207cab550..e8853969122 100644
--- a/src/mame/video/cps1.c
+++ b/src/mame/video/cps1.c
@@ -1258,6 +1258,7 @@ static const struct CPS1config cps1_config_table[]=
{"3wonders", CPS_B_21_BT1, mapper_RT24B },
{"3wonderu", CPS_B_21_BT1, mapper_RT24B },
{"wonder3", CPS_B_21_BT1, mapper_RT22B }, // equivalent to RT24B
+ {"3wonderh", CPS_B_02 , mapper_RT24B }, /* Not 100% sure of the CPS B-ID */
{"kod", CPS_B_21_BT2, mapper_KD29B, 0x36, 0, 0x34 },
{"kodu", CPS_B_21_BT2, mapper_KD29B, 0x36, 0, 0x34 },
{"kodj", CPS_B_21_BT2, mapper_KD29B, 0x36, 0, 0x34 },