From 8ca8b2fcef93aa4badaf881c30e661ce8e92fd9f Mon Sep 17 00:00:00 2001 From: briantro Date: Sun, 17 Dec 2017 10:44:44 -0600 Subject: [PATCH] cv1k.cpp: discussions with other dev reveals the International "other rev" should remain the parent. (nw) --- src/mame/drivers/cv1k.cpp | 32 ++++++++++++++++---------------- src/mame/mame.lst | 4 ++-- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/mame/drivers/cv1k.cpp b/src/mame/drivers/cv1k.cpp index c47d9476056..6137a3ada09 100644 --- a/src/mame/drivers/cv1k.cpp +++ b/src/mame/drivers/cv1k.cpp @@ -644,20 +644,7 @@ ROM_START( futari10 ) ROM_LOAD16_WORD_SWAP( "u24", 0x400000, 0x400000, CRC(c631a766) SHA1(8bb6934a2f5b8a9841c3dcf85192b1743773dd8b) ) ROM_END -ROM_START( futaribl ) - ROM_REGION( 0x400000, "maincpu", ROMREGION_ERASEFF) - ROM_LOAD16_WORD_SWAP( "futariblk_u4", 0x000000, 0x200000, CRC(6db13c62) SHA1(6a53ce7f70b754936ccbb3a4674d4b2f03979644) ) /* (2007/12/11 BLACK LABEL VER) */ - ROM_RELOAD(0x200000,0x200000) - - ROM_REGION( 0x8400000, "game", ROMREGION_ERASEFF) - ROM_LOAD( "futariblk_u2", 0x000000, 0x8400000, CRC(08c6fd62) SHA1(e1fc386b2b0e41906c724287cbf82304297e0150) ) /* (2007/12/11 BLACK LABEL VER) */ - - ROM_REGION( 0x800000, "ymz770", ROMREGION_ERASEFF) - ROM_LOAD16_WORD_SWAP( "u23", 0x000000, 0x400000, CRC(39f1e1f4) SHA1(53d12f59a56df35c705408c76e6e02118da656f1) ) - ROM_LOAD16_WORD_SWAP( "u24", 0x400000, 0x400000, CRC(c631a766) SHA1(8bb6934a2f5b8a9841c3dcf85192b1743773dd8b) ) -ROM_END - -ROM_START( futariblav ) /* Title screen shows (c) 2007 despite the 2009 "master" date - Also prints "Another Ver" to the title screen - reworked & re-released for the Chinese market */ +ROM_START( futaribl ) /* Title screen shows (c) 2007 despite the 2009 "master" date - Also prints "Another Ver" to the title screen - reworked & re-released for the Chinese market */ ROM_REGION( 0x400000, "maincpu", ROMREGION_ERASEFF) ROM_LOAD16_WORD_SWAP( "futaribli_u4", 0x000000, 0x200000, CRC(1971dd16) SHA1(e75993f2978cbaaf925b4b8bb33d094a5a7cebf0) ) /* (2009/11/27 INTERNATIONAL BL) */ ROM_RELOAD(0x200000,0x200000) @@ -670,6 +657,19 @@ ROM_START( futariblav ) /* Title screen shows (c) 2007 despite the 2009 "master" ROM_LOAD16_WORD_SWAP( "u24", 0x400000, 0x400000, CRC(c631a766) SHA1(8bb6934a2f5b8a9841c3dcf85192b1743773dd8b) ) ROM_END +ROM_START( futariblj ) + ROM_REGION( 0x400000, "maincpu", ROMREGION_ERASEFF) + ROM_LOAD16_WORD_SWAP( "futariblk_u4", 0x000000, 0x200000, CRC(6db13c62) SHA1(6a53ce7f70b754936ccbb3a4674d4b2f03979644) ) /* (2007/12/11 BLACK LABEL VER) */ + ROM_RELOAD(0x200000,0x200000) + + ROM_REGION( 0x8400000, "game", ROMREGION_ERASEFF) + ROM_LOAD( "futariblk_u2", 0x000000, 0x8400000, CRC(08c6fd62) SHA1(e1fc386b2b0e41906c724287cbf82304297e0150) ) /* (2007/12/11 BLACK LABEL VER) */ + + ROM_REGION( 0x800000, "ymz770", ROMREGION_ERASEFF) + ROM_LOAD16_WORD_SWAP( "u23", 0x000000, 0x400000, CRC(39f1e1f4) SHA1(53d12f59a56df35c705408c76e6e02118da656f1) ) + ROM_LOAD16_WORD_SWAP( "u24", 0x400000, 0x400000, CRC(c631a766) SHA1(8bb6934a2f5b8a9841c3dcf85192b1743773dd8b) ) +ROM_END + ROM_START( ibara ) ROM_REGION( 0x400000, "maincpu", ROMREGION_ERASEFF) ROM_LOAD16_WORD_SWAP( "u4", 0x000000, 0x200000, CRC(8e6c155d) SHA1(38ac2107dc7824836e2b4e04c7180d5ae43c9b79) ) /* (2005/03/22 MASTER VER..) */ @@ -958,8 +958,8 @@ GAME( 2006, futari15a, futari15, cv1k, cv1k, cv1k_state, pinkswts, ROT270, " GAME( 2006, futari10, futari15, cv1k, cv1k, cv1k_state, pinkswts, ROT270, "Cave (AMI license)", "Mushihime-Sama Futari Ver 1.0 (2006/10/23 MASTER VER.)", GAME_FLAGS ) // CA015B Mushihime-Sama Futari Black Label -GAME( 2007, futaribl, 0, cv1k, cv1k, cv1k_state, pinkswts, ROT270, "Cave (AMI license)", "Mushihime-Sama Futari Black Label (2007/12/11 BLACK LABEL VER)", GAME_FLAGS ) -GAME( 2007, futariblav, futaribl, cv1k, cv1k, cv1k_state, pinkswts, ROT270, "Cave (AMI license)", "Mushihime-Sama Futari Black Label - Another Ver (2009/11/27 INTERNATIONAL BL)", GAME_FLAGS ) // re-released for Chinese market +GAME( 2007, futaribl, 0, cv1k, cv1k, cv1k_state, pinkswts, ROT270, "Cave (AMI license)", "Mushihime-Sama Futari Black Label - Another Ver (2009/11/27 INTERNATIONAL BL)", GAME_FLAGS ) // re-released for Chinese market +GAME( 2007, futariblj, futaribl, cv1k, cv1k, cv1k_state, pinkswts, ROT270, "Cave (AMI license)", "Mushihime-Sama Futari Black Label (2007/12/11 BLACK LABEL VER)", GAME_FLAGS ) // CA016 Muchi Muchi Pork! GAME( 2007, mmpork, 0, cv1k, cv1ks,cv1k_state, pinkswts, ROT270, "Cave (AMI license)", "Muchi Muchi Pork! (2007/ 4/17 MASTER VER.)", GAME_FLAGS ) diff --git a/src/mame/mame.lst b/src/mame/mame.lst index 57d9c7b9239..ac1c741cb24 100644 --- a/src/mame/mame.lst +++ b/src/mame/mame.lst @@ -10683,8 +10683,8 @@ espgal2 // (c) 2005 Cave (AMI license) - 2005/11/14 MAST futari10 // (c) 2006 Cave (AMI license) - 2006/10/23 MASTER VER. futari15 // (c) 2006 Cave (AMI license) - 2006/12/8.MASTER VER. 1.54. futari15a // (c) 2006 Cave (AMI license) - 2006/12/8 MASTER VER 1.54 -futaribl // (c) 2007 Cave (AMI license) - 2007/12/11 BLACK LABEL VER -futariblav // (c) 2007 Cave (AMI license) - 2009/11/27 INTERNATIONAL BL - Another Ver +futaribl // (c) 2007 Cave (AMI license) - 2009/11/27 INTERNATIONAL BL - Another Ver +futariblj // (c) 2007 Cave (AMI license) - 2007/12/11 BLACK LABEL VER ibara // (c) 2005 Cave (AMI license) - 2005/03/22 MASTER VER.. ibarablk // (c) 2005 Cave (AMI license) - 2006/02/06. MASTER VER. ibarablka // (c) 2005 Cave (AMI license) - 2006/02/06 MASTER VER.