From 13eb7bb7d8dbac11c4ecc93194c6e04969657fd0 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Mon, 23 Aug 2021 16:45:30 +1000 Subject: Fix a duplicate #include and an indendation error --- src/devices/sound/ks0164.cpp | 2 +- src/lib/netlist/plib/pfunction.cpp | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/devices/sound/ks0164.cpp b/src/devices/sound/ks0164.cpp index 8fdcbf026ba..3431c49c0f7 100644 --- a/src/devices/sound/ks0164.cpp +++ b/src/devices/sound/ks0164.cpp @@ -421,7 +421,7 @@ u16 ks0164_device::uncomp_8_16(u8 value) s16 o = (0x10 | (value & 0xf)) << 10; o = o >> xp; if(value & 0x10) - o = -o; + o = -o; return o; } diff --git a/src/lib/netlist/plib/pfunction.cpp b/src/lib/netlist/plib/pfunction.cpp index f6b17941e0c..362615468e5 100644 --- a/src/lib/netlist/plib/pfunction.cpp +++ b/src/lib/netlist/plib/pfunction.cpp @@ -11,7 +11,6 @@ #include #include -#include #include #include #include -- cgit v1.2.3 From 747fdee749cefc35769f57bfcd7e66ac224b28a6 Mon Sep 17 00:00:00 2001 From: hap Date: Mon, 23 Aug 2021 12:17:10 +0200 Subject: cv1k: split espgal2 recent u4 dump (cherry picked from commit f21ffcf4eb27b7bb7aa1417d9d401ebea514e609) --- src/mame/drivers/cv1k.cpp | 174 ++++++++++++++++++++++-------------------- src/mame/drivers/namcos22.cpp | 28 +++---- src/mame/mame.lst | 1 + 3 files changed, 108 insertions(+), 95 deletions(-) diff --git a/src/mame/drivers/cv1k.cpp b/src/mame/drivers/cv1k.cpp index b58e729c2d4..8276de513e3 100644 --- a/src/mame/drivers/cv1k.cpp +++ b/src/mame/drivers/cv1k.cpp @@ -532,11 +532,11 @@ All roms are flash roms with no labels, so keep the ROM_START( mushisam ) ROM_REGION( 0x400000, "maincpu", ROMREGION_ERASEFF) - ROM_LOAD16_WORD_SWAP("mushisam_u4", 0x000000, 0x200000, CRC(15321b30) SHA1(d2cd714ff2299eeab6f9a7c219dfb559c8f98b45) ) /* (2004/10/12.MASTER VER.) */ + ROM_LOAD16_WORD_SWAP("mushisam_u4", 0x000000, 0x200000, CRC(15321b30) SHA1(d2cd714ff2299eeab6f9a7c219dfb559c8f98b45) ) // (2004/10/12.MASTER VER.) ROM_RELOAD(0x200000,0x200000) ROM_REGION( 0x8400000, "game", ROMREGION_ERASEFF) - ROM_LOAD("mushisam_u2", 0x000000, 0x8400000, CRC(4f0a842a) SHA1(33f3550ec676a7088b6348cd72c16cc6594afb84) ) /* (2004/10/12.MASTER VER.) */ + ROM_LOAD("mushisam_u2", 0x000000, 0x8400000, CRC(4f0a842a) SHA1(33f3550ec676a7088b6348cd72c16cc6594afb84) ) // (2004/10/12.MASTER VER.) ROM_REGION( 0x800000, "ymz770", ROMREGION_ERASEFF) ROM_LOAD16_WORD_SWAP("u23", 0x000000, 0x400000, CRC(138e2050) SHA1(9e86489a4e65af5efb5495adf6d4b3e01d5b2816) ) @@ -545,11 +545,11 @@ ROM_END ROM_START( mushisama ) ROM_REGION( 0x400000, "maincpu", ROMREGION_ERASEFF) - ROM_LOAD16_WORD_SWAP("mushisama_u4", 0x000000, 0x200000, CRC(0b5b30b2) SHA1(35fd1bb1561c30b311b4325bc8f4628f2fccd20b) ) /* (2004/10/12 MASTER VER.) */ + ROM_LOAD16_WORD_SWAP("mushisama_u4", 0x000000, 0x200000, CRC(0b5b30b2) SHA1(35fd1bb1561c30b311b4325bc8f4628f2fccd20b) ) // (2004/10/12 MASTER VER.) ROM_RELOAD(0x200000,0x200000) ROM_REGION( 0x8400000, "game", ROMREGION_ERASEFF) - ROM_LOAD("mushisam_u2", 0x000000, 0x8400000, CRC(4f0a842a) SHA1(33f3550ec676a7088b6348cd72c16cc6594afb84) ) /* (2004/10/12.MASTER VER.) */ + ROM_LOAD("mushisam_u2", 0x000000, 0x8400000, CRC(4f0a842a) SHA1(33f3550ec676a7088b6348cd72c16cc6594afb84) ) // (2004/10/12.MASTER VER.) ROM_REGION( 0x800000, "ymz770", ROMREGION_ERASEFF) ROM_LOAD16_WORD_SWAP("u23", 0x000000, 0x400000, CRC(138e2050) SHA1(9e86489a4e65af5efb5495adf6d4b3e01d5b2816) ) @@ -558,11 +558,11 @@ ROM_END ROM_START( mushisamb ) ROM_REGION( 0x400000, "maincpu", ROMREGION_ERASEFF) - ROM_LOAD16_WORD_SWAP("mushisamb_u4", 0x000000, 0x200000, CRC(9f1c7f51) SHA1(f82ae72ec03687904ca7516887080be92365a5f3) ) /* (2004/10/12 MASTER VER) */ + ROM_LOAD16_WORD_SWAP("mushisamb_u4", 0x000000, 0x200000, CRC(9f1c7f51) SHA1(f82ae72ec03687904ca7516887080be92365a5f3) ) // (2004/10/12 MASTER VER) ROM_RELOAD(0x200000,0x200000) ROM_REGION( 0x8400000, "game", ROMREGION_ERASEFF) - ROM_LOAD("mushisam_u2", 0x000000, 0x8400000, CRC(4f0a842a) SHA1(33f3550ec676a7088b6348cd72c16cc6594afb84) ) /* (2004/10/12.MASTER VER.) */ + ROM_LOAD("mushisam_u2", 0x000000, 0x8400000, CRC(4f0a842a) SHA1(33f3550ec676a7088b6348cd72c16cc6594afb84) ) // (2004/10/12.MASTER VER.) ROM_REGION( 0x800000, "ymz770", ROMREGION_ERASEFF) ROM_LOAD16_WORD_SWAP("u23", 0x000000, 0x400000, CRC(138e2050) SHA1(9e86489a4e65af5efb5495adf6d4b3e01d5b2816) ) @@ -571,12 +571,24 @@ ROM_END ROM_START( espgal2 ) ROM_REGION( 0x400000, "maincpu", ROMREGION_ERASEFF) - ROM_LOAD16_WORD_SWAP( "u4_alt", 0x000000, 0x200000, CRC(843608b8) SHA1(2f5fcd38e76df531a923cd9956104cef5185aaa9) ) // newer PCB revision, updated FPGA firmware, no changes in game code or data - ROM_LOAD16_WORD_SWAP( "u4", 0x000000, 0x200000, CRC(09c908bb) SHA1(7d6031fd3542b3e1d296ff218feb40502fd78694) ) /* (2005/11/14 MASTER VER) */ + ROM_LOAD16_WORD_SWAP( "espgal2_u4", 0x000000, 0x200000, CRC(843608b8) SHA1(2f5fcd38e76df531a923cd9956104cef5185aaa9) ) // (2005/11/14 MASTER VER) - newer PCB revision, updated FPGA firmware, no changes in game code or data ROM_RELOAD(0x200000,0x200000) ROM_REGION( 0x8400000, "game", ROMREGION_ERASEFF) - ROM_LOAD( "u2", 0x000000, 0x8400000, CRC(222f58c7) SHA1(d47a5085a1debd9cb8c61d88cd39e4f5036d1797) ) /* (2005/11/14 MASTER VER) */ + ROM_LOAD( "u2", 0x000000, 0x8400000, CRC(222f58c7) SHA1(d47a5085a1debd9cb8c61d88cd39e4f5036d1797) ) // (2005/11/14 MASTER VER) + + ROM_REGION( 0x800000, "ymz770", ROMREGION_ERASEFF) + ROM_LOAD16_WORD_SWAP( "u23", 0x000000, 0x400000, CRC(b9a10c22) SHA1(4561f95c6018c9716077224bfe9660e61fb84681) ) + ROM_LOAD16_WORD_SWAP( "u24", 0x400000, 0x400000, CRC(c76b1ec4) SHA1(b98a53d41a995d968e0432ed824b0b06d93dcea8) ) +ROM_END + +ROM_START( espgal2a ) + ROM_REGION( 0x400000, "maincpu", ROMREGION_ERASEFF) + ROM_LOAD16_WORD_SWAP( "espgal2a_u4", 0x000000, 0x200000, CRC(09c908bb) SHA1(7d6031fd3542b3e1d296ff218feb40502fd78694) ) // (2005/11/14 MASTER VER) + ROM_RELOAD(0x200000,0x200000) + + ROM_REGION( 0x8400000, "game", ROMREGION_ERASEFF) + ROM_LOAD( "u2", 0x000000, 0x8400000, CRC(222f58c7) SHA1(d47a5085a1debd9cb8c61d88cd39e4f5036d1797) ) // (2005/11/14 MASTER VER) ROM_REGION( 0x800000, "ymz770", ROMREGION_ERASEFF) ROM_LOAD16_WORD_SWAP( "u23", 0x000000, 0x400000, CRC(b9a10c22) SHA1(4561f95c6018c9716077224bfe9660e61fb84681) ) @@ -585,11 +597,11 @@ ROM_END ROM_START( mushitam ) ROM_REGION( 0x400000, "maincpu", ROMREGION_ERASEFF) - ROM_LOAD16_WORD_SWAP("mushitam_u4", 0x000000, 0x200000, CRC(c49eb6b1) SHA1(c40ee5de89e3f1cb49ac19687657dd2b42a88d81) ) /* (2005/09/09.MASTER VER) */ + ROM_LOAD16_WORD_SWAP("mushitam_u4", 0x000000, 0x200000, CRC(c49eb6b1) SHA1(c40ee5de89e3f1cb49ac19687657dd2b42a88d81) ) // (2005/09/09.MASTER VER) ROM_RELOAD(0x200000,0x200000) ROM_REGION( 0x8400000, "game", ROMREGION_ERASEFF) - ROM_LOAD("mushitam_u2", 0x000000, 0x8400000, CRC(8ba498ab) SHA1(459c0b4ab831bbe019bdd5b0ac56955948b9e3a6) ) /* (2005/09/09.MASTER VER) */ + ROM_LOAD("mushitam_u2", 0x000000, 0x8400000, CRC(8ba498ab) SHA1(459c0b4ab831bbe019bdd5b0ac56955948b9e3a6) ) // (2005/09/09.MASTER VER) ROM_REGION( 0x800000, "ymz770", ROMREGION_ERASEFF) ROM_LOAD16_WORD_SWAP("u23", 0x000000, 0x400000, CRC(701a912a) SHA1(85c198946fb693d99928ea2595c84ba4d9dc8157) ) @@ -598,12 +610,12 @@ ROM_END ROM_START( mushitama ) ROM_REGION( 0x400000, "maincpu", ROMREGION_ERASEFF) - ROM_LOAD16_WORD_SWAP("mushitama_u4", 0x000000, 0x200000, CRC(4a23e6c8) SHA1(d44c287bb88e6d413a8d35d75bc1b4928ad52cdf) ) /* (2005/09/09 MASTER VER) */ + ROM_LOAD16_WORD_SWAP("mushitama_u4", 0x000000, 0x200000, CRC(4a23e6c8) SHA1(d44c287bb88e6d413a8d35d75bc1b4928ad52cdf) ) // (2005/09/09 MASTER VER) ROM_RELOAD(0x200000,0x200000) ROM_REGION( 0x8400000, "game", ROMREGION_ERASEFF) // ROM_LOAD("mushitama_u2", 0x000000, 0x8400000, CRC(3f93ff82) SHA1(6f6c250aa7134016ffb288d056bc937ea311f538) ) // recycled ROM - only unused areas differ - ROM_LOAD("mushitam_u2", 0x000000, 0x8400000, CRC(8ba498ab) SHA1(459c0b4ab831bbe019bdd5b0ac56955948b9e3a6) ) /* (2005/09/09.MASTER VER) */ + ROM_LOAD("mushitam_u2", 0x000000, 0x8400000, CRC(8ba498ab) SHA1(459c0b4ab831bbe019bdd5b0ac56955948b9e3a6) ) // (2005/09/09.MASTER VER) ROM_REGION( 0x800000, "ymz770", ROMREGION_ERASEFF) ROM_LOAD16_WORD_SWAP("u23", 0x000000, 0x400000, CRC(701a912a) SHA1(85c198946fb693d99928ea2595c84ba4d9dc8157) ) @@ -612,11 +624,11 @@ ROM_END ROM_START( futari15 ) ROM_REGION( 0x400000, "maincpu", ROMREGION_ERASEFF) - ROM_LOAD16_WORD_SWAP("futari15_u4", 0x000000, 0x200000, CRC(e8c5f128) SHA1(45fb8066fdbecb83fdc2e14555c460d0c652cd5f) ) /* (2006/12/8.MAST VER. 1.54.) */ + ROM_LOAD16_WORD_SWAP("futari15_u4", 0x000000, 0x200000, CRC(e8c5f128) SHA1(45fb8066fdbecb83fdc2e14555c460d0c652cd5f) ) // (2006/12/8.MAST VER. 1.54.) ROM_RELOAD(0x200000,0x200000) ROM_REGION( 0x8400000, "game", ROMREGION_ERASEFF) - ROM_LOAD("futari15_u2", 0x000000, 0x8400000, CRC(b9eae1fc) SHA1(410f8e7cfcbfd271b41fb4f8d049a13a3191a1f9) ) /* (2006/12/8.MAST VER. 1.54.) */ + ROM_LOAD("futari15_u2", 0x000000, 0x8400000, CRC(b9eae1fc) SHA1(410f8e7cfcbfd271b41fb4f8d049a13a3191a1f9) ) // (2006/12/8.MAST VER. 1.54.) ROM_REGION( 0x800000, "ymz770", ROMREGION_ERASEFF) ROM_LOAD16_WORD_SWAP("u23", 0x000000, 0x400000, CRC(39f1e1f4) SHA1(53d12f59a56df35c705408c76e6e02118da656f1) ) @@ -625,12 +637,12 @@ ROM_END ROM_START( futari15a ) ROM_REGION( 0x400000, "maincpu", ROMREGION_ERASEFF) - ROM_LOAD16_WORD_SWAP("futari15a_u4", 0x000000, 0x200000, CRC(a609cf89) SHA1(56752fae9f42fa852af8ee2eae79e25ec7f17953) ) /* (2006/12/8 MAST VER 1.54) */ + ROM_LOAD16_WORD_SWAP("futari15a_u4", 0x000000, 0x200000, CRC(a609cf89) SHA1(56752fae9f42fa852af8ee2eae79e25ec7f17953) ) // (2006/12/8 MAST VER 1.54) ROM_RELOAD(0x200000,0x200000) ROM_REGION( 0x8400000, "game", ROMREGION_ERASEFF) // ROM_LOAD("futari15a_u2", 0x000000, 0x8400000, CRC(b9d815f9) SHA1(6b6f668b0bbb087ffac65e4f0d8bd9d5b28eeb28) ) // recycled ROM - only unused areas differ - ROM_LOAD("futari15_u2", 0x000000, 0x8400000, CRC(b9eae1fc) SHA1(410f8e7cfcbfd271b41fb4f8d049a13a3191a1f9) ) /* (2006/12/8.MAST VER. 1.54.) */ + ROM_LOAD("futari15_u2", 0x000000, 0x8400000, CRC(b9eae1fc) SHA1(410f8e7cfcbfd271b41fb4f8d049a13a3191a1f9) ) // (2006/12/8.MAST VER. 1.54.) ROM_REGION( 0x800000, "ymz770", ROMREGION_ERASEFF) ROM_LOAD16_WORD_SWAP("u23", 0x000000, 0x400000, CRC(39f1e1f4) SHA1(53d12f59a56df35c705408c76e6e02118da656f1) ) @@ -639,20 +651,20 @@ ROM_END ROM_START( futari10 ) ROM_REGION( 0x400000, "maincpu", ROMREGION_ERASEFF) - ROM_LOAD16_WORD_SWAP( "futari10_u4", 0x000000, 0x200000, CRC(b127dca7) SHA1(e1f518bc72fc1cdf69aefa89eafa4edaf4e84778) ) /* (2006/10/23 MASTER VER.) */ + ROM_LOAD16_WORD_SWAP( "futari10_u4", 0x000000, 0x200000, CRC(b127dca7) SHA1(e1f518bc72fc1cdf69aefa89eafa4edaf4e84778) ) // (2006/10/23 MASTER VER.) ROM_RELOAD(0x200000,0x200000) ROM_REGION( 0x8400000, "game", ROMREGION_ERASEFF) - ROM_LOAD( "futari10_u2", 0x000000, 0x8400000, CRC(78ffcd0c) SHA1(0e2937edec15ce3f5741b72ebd3bbaaefffb556e) ) /* (2006/10/23 MASTER VER.) */ + ROM_LOAD( "futari10_u2", 0x000000, 0x8400000, CRC(78ffcd0c) SHA1(0e2937edec15ce3f5741b72ebd3bbaaefffb556e) ) // (2006/10/23 MASTER 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( 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_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_LOAD16_WORD_SWAP( "futaribli_u4", 0x000000, 0x200000, CRC(1971dd16) SHA1(e75993f2978cbaaf925b4b8bb33d094a5a7cebf0) ) // (2009/11/27 INTERNATIONAL BL) ROM_RELOAD(0x200000,0x200000) ROM_REGION( 0x8400000, "game", ROMREGION_ERASEFF) @@ -665,11 +677,11 @@ ROM_END ROM_START( futariblj ) ROM_REGION( 0x400000, "maincpu", ROMREGION_ERASEFF) - ROM_LOAD16_WORD_SWAP( "futariblk_u4", 0x000000, 0x200000, CRC(b9467b6d) SHA1(64782807fe69acb4ae028e36c5c689d8bd9b7857) ) /* (2007/12/11 BLACK LABEL VER) */ + ROM_LOAD16_WORD_SWAP( "futariblk_u4", 0x000000, 0x200000, CRC(b9467b6d) SHA1(64782807fe69acb4ae028e36c5c689d8bd9b7857) ) // (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_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) ) @@ -678,50 +690,50 @@ 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..) */ + ROM_LOAD16_WORD_SWAP( "u4", 0x000000, 0x200000, CRC(8e6c155d) SHA1(38ac2107dc7824836e2b4e04c7180d5ae43c9b79) ) // (2005/03/22 MASTER VER..) ROM_RELOAD(0x200000,0x200000) ROM_REGION( 0x8400000, "game", ROMREGION_ERASEFF) - ROM_LOAD( "u2", 0x000000, 0x8400000, CRC(55840976) SHA1(4982bdce84f9603adfed7a618f18bc80359ab81e) ) /* (2005/03/22 MASTER VER..) */ + ROM_LOAD( "u2", 0x000000, 0x8400000, CRC(55840976) SHA1(4982bdce84f9603adfed7a618f18bc80359ab81e) ) // (2005/03/22 MASTER VER..) ROM_REGION( 0x800000, "ymz770", ROMREGION_ERASEFF) ROM_LOAD16_WORD_SWAP( "u23", 0x000000, 0x400000, CRC(ee5e585d) SHA1(7eeba4ee693060e927f8c46b16e39227c6a62392) ) ROM_LOAD16_WORD_SWAP( "u24", 0x400000, 0x400000, CRC(f0aa3cb6) SHA1(f9d137cd879e718811b2d21a0af2a9c6b7dca2f9) ) ROM_END -ROM_START( ibarablk ) /* Title screen shows (c) 2005 despite the 2006 "master" date */ +ROM_START( ibarablk ) // Title screen shows (c) 2005 despite the 2006 "master" date ROM_REGION( 0x400000, "maincpu", ROMREGION_ERASEFF) - ROM_LOAD16_WORD_SWAP( "ibarablk_u4", 0x000000, 0x200000, CRC(ee1f1f77) SHA1(ac276f3955aa4dde2544af4912819a7ae6bcf8dd) ) /* (2006/02/06. MASTER VER.) */ + ROM_LOAD16_WORD_SWAP( "ibarablk_u4", 0x000000, 0x200000, CRC(ee1f1f77) SHA1(ac276f3955aa4dde2544af4912819a7ae6bcf8dd) ) // (2006/02/06. MASTER VER.) ROM_RELOAD(0x200000,0x200000) ROM_REGION( 0x8400000, "game", ROMREGION_ERASEFF) - ROM_LOAD( "ibarablk_u2", 0x000000, 0x8400000, CRC(5e46be44) SHA1(bed5f1bf452f2cac58747ecabec3c4392566a3a7) ) /* (2006/02/06. MASTER VER.) */ + ROM_LOAD( "ibarablk_u2", 0x000000, 0x8400000, CRC(5e46be44) SHA1(bed5f1bf452f2cac58747ecabec3c4392566a3a7) ) // (2006/02/06. MASTER VER.) ROM_REGION( 0x800000, "ymz770", ROMREGION_ERASEFF) - ROM_LOAD16_WORD_SWAP( "u23", 0x000000, 0x400000, CRC(a436bb22) SHA1(0556e771cc02638bf8814315ba671c2d442594f1) ) /* (2006/02/06 MASTER VER.) */ - ROM_LOAD16_WORD_SWAP( "u24", 0x400000, 0x400000, CRC(d11ab6b6) SHA1(2132191cbe847e2560423e4545c969f21f8ff825) ) /* (2006/02/06 MASTER VER.) */ + ROM_LOAD16_WORD_SWAP( "u23", 0x000000, 0x400000, CRC(a436bb22) SHA1(0556e771cc02638bf8814315ba671c2d442594f1) ) // (2006/02/06 MASTER VER.) + ROM_LOAD16_WORD_SWAP( "u24", 0x400000, 0x400000, CRC(d11ab6b6) SHA1(2132191cbe847e2560423e4545c969f21f8ff825) ) // (2006/02/06 MASTER VER.) ROM_END -ROM_START( ibarablka ) /* Title screen shows (c) 2005 despite the 2006 "master" date */ +ROM_START( ibarablka ) // Title screen shows (c) 2005 despite the 2006 "master" date ROM_REGION( 0x400000, "maincpu", ROMREGION_ERASEFF) - ROM_LOAD16_WORD_SWAP( "ibarablka_u4", 0x000000, 0x200000, CRC(a9d43839) SHA1(507696e616608c05893c7ac2814b3365e9cb0720) ) /* (2006/02/06 MASTER VER.) */ + ROM_LOAD16_WORD_SWAP( "ibarablka_u4", 0x000000, 0x200000, CRC(a9d43839) SHA1(507696e616608c05893c7ac2814b3365e9cb0720) ) // (2006/02/06 MASTER VER.) ROM_RELOAD(0x200000,0x200000) ROM_REGION( 0x8400000, "game", ROMREGION_ERASEFF) - ROM_LOAD( "ibarablka_u2", 0x000000, 0x8400000, CRC(33400d96) SHA1(09c22b5431ac3726bf88c56efd970f56793f825a) ) /* (2006/02/06 MASTER VER.) */ + ROM_LOAD( "ibarablka_u2", 0x000000, 0x8400000, CRC(33400d96) SHA1(09c22b5431ac3726bf88c56efd970f56793f825a) ) // (2006/02/06 MASTER VER.) ROM_REGION( 0x800000, "ymz770", ROMREGION_ERASEFF) - ROM_LOAD16_WORD_SWAP( "u23", 0x000000, 0x400000, CRC(a436bb22) SHA1(0556e771cc02638bf8814315ba671c2d442594f1) ) /* (2006/02/06 MASTER VER.) */ - ROM_LOAD16_WORD_SWAP( "u24", 0x400000, 0x400000, CRC(d11ab6b6) SHA1(2132191cbe847e2560423e4545c969f21f8ff825) ) /* (2006/02/06 MASTER VER.) */ + ROM_LOAD16_WORD_SWAP( "u23", 0x000000, 0x400000, CRC(a436bb22) SHA1(0556e771cc02638bf8814315ba671c2d442594f1) ) // (2006/02/06 MASTER VER.) + ROM_LOAD16_WORD_SWAP( "u24", 0x400000, 0x400000, CRC(d11ab6b6) SHA1(2132191cbe847e2560423e4545c969f21f8ff825) ) // (2006/02/06 MASTER VER.) ROM_END ROM_START( deathsml ) ROM_REGION( 0x400000, "maincpu", ROMREGION_ERASEFF) - ROM_LOAD16_WORD_SWAP( "u4", 0x000000, 0x200000, CRC(1a7b98bf) SHA1(07798a4a846e5802756396b34df47d106895c1f1) ) /* (2007/10/09 MASTER VER) */ + ROM_LOAD16_WORD_SWAP( "u4", 0x000000, 0x200000, CRC(1a7b98bf) SHA1(07798a4a846e5802756396b34df47d106895c1f1) ) // (2007/10/09 MASTER VER) ROM_RELOAD(0x200000,0x200000) ROM_REGION( 0x8400000, "game", ROMREGION_ERASEFF) - ROM_LOAD( "u2", 0x000000, 0x8400000, CRC(59ef5d78) SHA1(426e506b6d88948aa55aec71c0db6e91da3d490d) ) /* (2007/10/09 MASTER VER) */ + ROM_LOAD( "u2", 0x000000, 0x8400000, CRC(59ef5d78) SHA1(426e506b6d88948aa55aec71c0db6e91da3d490d) ) // (2007/10/09 MASTER VER) ROM_REGION( 0x800000, "ymz770", ROMREGION_ERASEFF) ROM_LOAD16_WORD_SWAP( "u23", 0x000000, 0x400000, CRC(aab718c8) SHA1(0e636c46d06151abd6f73232bc479dafcafe5327) ) @@ -730,11 +742,11 @@ ROM_END ROM_START( mmpork ) ROM_REGION( 0x400000, "maincpu", ROMREGION_ERASEFF) - ROM_LOAD16_WORD_SWAP( "u4", 0x000000, 0x200000, CRC(d06cfa42) SHA1(5707feb4b3e5265daf5926f38c38612b24106f1f) ) /* (2007/ 4/17 MASTER VER.) */ + ROM_LOAD16_WORD_SWAP( "u4", 0x000000, 0x200000, CRC(d06cfa42) SHA1(5707feb4b3e5265daf5926f38c38612b24106f1f) ) // (2007/ 4/17 MASTER VER.) ROM_RELOAD(0x200000,0x200000) ROM_REGION( 0x8400000, "game", ROMREGION_ERASEFF) - ROM_LOAD( "u2", 0x000000, 0x8400000, CRC(1ee961b8) SHA1(81a2eba704ac1cf7fc44fa7c6a3f50e3570c104f) ) /* (2007/ 4/17 MASTER VER.) */ + ROM_LOAD( "u2", 0x000000, 0x8400000, CRC(1ee961b8) SHA1(81a2eba704ac1cf7fc44fa7c6a3f50e3570c104f) ) // (2007/ 4/17 MASTER VER.) ROM_REGION( 0x800000, "ymz770", ROMREGION_ERASEFF) ROM_LOAD16_WORD_SWAP( "u23", 0x000000, 0x400000, CRC(4a4b36df) SHA1(5db5ce6fa47e5ca3263d4bd19315890c6d29df66) ) @@ -743,11 +755,11 @@ ROM_END ROM_START( mmmbanc ) ROM_REGION( 0x400000, "maincpu", ROMREGION_ERASEFF) - ROM_LOAD16_WORD_SWAP( "u4", 0x0000, 0x200000, CRC(5589d8c6) SHA1(43fbdb0effe2bc0e7135698757b6ee50200aecde) ) /* (2007/06/05 MASTER VER.) */ + ROM_LOAD16_WORD_SWAP( "u4", 0x0000, 0x200000, CRC(5589d8c6) SHA1(43fbdb0effe2bc0e7135698757b6ee50200aecde) ) // (2007/06/05 MASTER VER.) ROM_RELOAD(0x200000,0x200000) ROM_REGION( 0x8400000, "game", ROMREGION_ERASEFF) - ROM_LOAD( "u2", 0x000000, 0x8400000, CRC(2e38965a) SHA1(2b58d1cd1a3dbc261d4a46805d2ea015fe22c444) ) /* (2007/06/05 MASTER VER.) */ + ROM_LOAD( "u2", 0x000000, 0x8400000, CRC(2e38965a) SHA1(2b58d1cd1a3dbc261d4a46805d2ea015fe22c444) ) // (2007/06/05 MASTER VER.) ROM_REGION( 0x800000, "ymz770", ROMREGION_ERASEFF) ROM_LOAD16_WORD_SWAP( "u23", 0x000000, 0x400000, CRC(4caaa1bf) SHA1(9b92c13eac05601da4d9bb3eb727c156974e9f0c) ) @@ -756,11 +768,11 @@ ROM_END ROM_START( pinkswts ) ROM_REGION( 0x400000, "maincpu", ROMREGION_ERASEFF) - ROM_LOAD16_WORD_SWAP( "pinkswts_u4", 0x0000, 0x200000, CRC(5d812c9e) SHA1(db821ec3892fd150513749d64a8b60bf147f3275) ) /* (2006/04/06 MASTER VER....) */ + ROM_LOAD16_WORD_SWAP( "pinkswts_u4", 0x0000, 0x200000, CRC(5d812c9e) SHA1(db821ec3892fd150513749d64a8b60bf147f3275) ) // (2006/04/06 MASTER VER....) ROM_RELOAD(0x200000,0x200000) ROM_REGION( 0x8400000, "game", ROMREGION_ERASEFF) - ROM_LOAD( "pinkswts_u2", 0x000000, 0x8400000, CRC(a2fa5363) SHA1(5be327534840871592df523ac82ee1927bd79d67) ) /* (2006/04/06 MASTER VER....) */ + ROM_LOAD( "pinkswts_u2", 0x000000, 0x8400000, CRC(a2fa5363) SHA1(5be327534840871592df523ac82ee1927bd79d67) ) // (2006/04/06 MASTER VER....) ROM_REGION( 0x800000, "ymz770", ROMREGION_ERASEFF) ROM_LOAD16_WORD_SWAP( "u23", 0x000000, 0x400000, CRC(4b82d250) SHA1(ee98dbc3f791efb6d58f3945bcb2044667ae7978) ) @@ -769,11 +781,11 @@ ROM_END ROM_START( pinkswtsa ) ROM_REGION( 0x400000, "maincpu", ROMREGION_ERASEFF) - ROM_LOAD16_WORD_SWAP( "pnkswtsa_u4", 0x0000, 0x200000, CRC(ee3339b2) SHA1(995988d370731a7074b49ce8752525dadf06a954) ) /* (2006/04/06 MASTER VER...) */ + ROM_LOAD16_WORD_SWAP( "pnkswtsa_u4", 0x0000, 0x200000, CRC(ee3339b2) SHA1(995988d370731a7074b49ce8752525dadf06a954) ) // (2006/04/06 MASTER VER...) ROM_RELOAD(0x200000,0x200000) ROM_REGION( 0x8400000, "game", ROMREGION_ERASEFF) - ROM_LOAD( "pnkswtsa_u2", 0x000000, 0x8400000, CRC(829a862e) SHA1(8c0ee2a0eb33b68869252fd68aed74820a904287) ) /* (2006/04/06 MASTER VER...) */ + ROM_LOAD( "pnkswtsa_u2", 0x000000, 0x8400000, CRC(829a862e) SHA1(8c0ee2a0eb33b68869252fd68aed74820a904287) ) // (2006/04/06 MASTER VER...) ROM_REGION( 0x800000, "ymz770", ROMREGION_ERASEFF) ROM_LOAD16_WORD_SWAP( "u23", 0x000000, 0x400000, CRC(4b82d250) SHA1(ee98dbc3f791efb6d58f3945bcb2044667ae7978) ) @@ -782,11 +794,11 @@ ROM_END ROM_START( pinkswtsb ) ROM_REGION( 0x400000, "maincpu", ROMREGION_ERASEFF) - ROM_LOAD16_WORD_SWAP( "pnkswtsb_u4", 0x0000, 0x200000, CRC(68bcc009) SHA1(2fef544b93c61161a37365f868b431d8262e4b21) ) /* (2006/04/06 MASTER VER.) */ + ROM_LOAD16_WORD_SWAP( "pnkswtsb_u4", 0x0000, 0x200000, CRC(68bcc009) SHA1(2fef544b93c61161a37365f868b431d8262e4b21) ) // (2006/04/06 MASTER VER.) ROM_RELOAD(0x200000,0x200000) ROM_REGION( 0x8400000, "game", ROMREGION_ERASEFF) -// ROM_LOAD( "pnkswtsb_u2", 0x000000, 0x8400000, BAD_DUMP CRC(a5666ed9) SHA1(682e06c84990225bc6bb0c9f38b5f46c4e36b430) ) /* (2006/04/06 MASTER VER.) */ +// ROM_LOAD( "pnkswtsb_u2", 0x000000, 0x8400000, BAD_DUMP CRC(a5666ed9) SHA1(682e06c84990225bc6bb0c9f38b5f46c4e36b430) ) // (2006/04/06 MASTER VER.) ROM_LOAD( "pnkswtsx_u2", 0x000000, 0x8400000, CRC(91e4deb2) SHA1(893cb10d6f805df7cb4a1bb709a3ea6de147b7e9) ) // (2006/xx/xx MASTER VER.) and (2006/04/06 MASTER VER.) ROM_REGION( 0x800000, "ymz770", ROMREGION_ERASEFF) @@ -823,10 +835,10 @@ ROM_END ROM_START( ddpdfk ) ROM_REGION( 0x400000, "maincpu", ROMREGION_ERASEFF) - ROM_LOAD16_WORD_SWAP( "ddpdfk_u4", 0x0000, 0x400000, CRC(9976d699) SHA1(9dfe9d1daf6f638cafce8cdc5230209e2bcb7522) ) /* (2008/06/23 MASTER VER 1.5) */ + ROM_LOAD16_WORD_SWAP( "ddpdfk_u4", 0x0000, 0x400000, CRC(9976d699) SHA1(9dfe9d1daf6f638cafce8cdc5230209e2bcb7522) ) // (2008/06/23 MASTER VER 1.5) ROM_REGION( 0x8400000, "game", ROMREGION_ERASEFF) - ROM_LOAD( "ddpdfk_u2", 0x000000, 0x8400000, CRC(84a51a4f) SHA1(291a6279c0746d2eb8630e7d6d886043f0cfdd94) ) /* (2008/06/23 MASTER VER 1.5) */ + ROM_LOAD( "ddpdfk_u2", 0x000000, 0x8400000, CRC(84a51a4f) SHA1(291a6279c0746d2eb8630e7d6d886043f0cfdd94) ) // (2008/06/23 MASTER VER 1.5) ROM_REGION( 0x800000, "ymz770", ROMREGION_ERASEFF) ROM_LOAD16_WORD_SWAP( "u23", 0x000000, 0x400000, CRC(27032cde) SHA1(5b58d0140d72b91db4e763ca4af93060d36ac74d) ) @@ -835,10 +847,10 @@ ROM_END ROM_START( ddpdfk10 ) ROM_REGION( 0x400000, "maincpu", ROMREGION_ERASEFF) - ROM_LOAD16_WORD_SWAP( "ddpdfk10_u4", 0x0000, 0x400000, CRC(a3d650b2) SHA1(46a7551760e18c2cecd372c3f4be16f6600efc2c) ) /* (2008/05/16 MASTER VER) */ + ROM_LOAD16_WORD_SWAP( "ddpdfk10_u4", 0x0000, 0x400000, CRC(a3d650b2) SHA1(46a7551760e18c2cecd372c3f4be16f6600efc2c) ) // (2008/05/16 MASTER VER) ROM_REGION( 0x8400000, "game", ROMREGION_ERASEFF) - ROM_LOAD( "ddpdfk10_u2", 0x000000, 0x8400000, CRC(d349cb2a) SHA1(c364c36b69b93f8f62390f185d044f51056669ff) ) /* (2008/05/16 MASTER VER) */ + ROM_LOAD( "ddpdfk10_u2", 0x000000, 0x8400000, CRC(d349cb2a) SHA1(c364c36b69b93f8f62390f185d044f51056669ff) ) // (2008/05/16 MASTER VER) ROM_REGION( 0x800000, "ymz770", ROMREGION_ERASEFF) ROM_LOAD16_WORD_SWAP( "u23", 0x000000, 0x400000, CRC(27032cde) SHA1(5b58d0140d72b91db4e763ca4af93060d36ac74d) ) @@ -847,10 +859,10 @@ ROM_END ROM_START( dsmbl ) ROM_REGION( 0x400000, "maincpu", ROMREGION_ERASEFF) - ROM_LOAD16_WORD_SWAP( "u4", 0x000000, 0x400000, CRC(77fc5ad1) SHA1(afe044fc16e9494143c876879b033caccd08cf22) ) /* (2008/10/06 MEGABLACK LABEL VER) */ + ROM_LOAD16_WORD_SWAP( "u4", 0x000000, 0x400000, CRC(77fc5ad1) SHA1(afe044fc16e9494143c876879b033caccd08cf22) ) // (2008/10/06 MEGABLACK LABEL VER) ROM_REGION( 0x8400000, "game", ROMREGION_ERASEFF) - ROM_LOAD( "u2", 0x000000, 0x8400000, CRC(d6b85b7a) SHA1(4674f6ad07f6a03904ca3d05060816b8fe061add) ) /* (2008/10/06 MEGABLACK LABEL VER) */ + ROM_LOAD( "u2", 0x000000, 0x8400000, CRC(d6b85b7a) SHA1(4674f6ad07f6a03904ca3d05060816b8fe061add) ) // (2008/10/06 MEGABLACK LABEL VER) ROM_REGION( 0x800000, "ymz770", ROMREGION_ERASEFF) ROM_LOAD16_WORD_SWAP( "u23", 0x000000, 0x400000, CRC(a9536a6a) SHA1(4b9dcaf6803b1fcfdf73ae9daabc4508fec71631) ) @@ -859,7 +871,7 @@ ROM_END ROM_START( dfkbl ) ROM_REGION( 0x400000, "maincpu", ROMREGION_ERASEFF) - ROM_LOAD16_WORD_SWAP( "u4", 0x000000, 0x400000, CRC(8092ca9d) SHA1(75e16cd7c8d0f9c715115ce12da5c245fbcd2416) ) /* (2010/1/18 BLACK LABEL) */ + ROM_LOAD16_WORD_SWAP( "u4", 0x000000, 0x400000, CRC(8092ca9d) SHA1(75e16cd7c8d0f9c715115ce12da5c245fbcd2416) ) // (2010/1/18 BLACK LABEL) ROM_REGION( 0x8400000, "game", ROMREGION_ERASEFF) ROM_LOAD( "u2", 0x000000, 0x8400000, CRC(29f9d73a) SHA1(ed978ab5e3ad8c05e7778a91bfb5aaa17b0f72d9) ) @@ -943,63 +955,63 @@ void cv1k_state::init_dpddfk() install_speedups(0x02310, 0xc1d1346, true); } -#define GAME_FLAGS (MACHINE_IMPERFECT_TIMING) // The black label versions are intentionally not set as clones, they were re-releases with different game codes, not bugfixes. // CA011 Mushihime-Sama -GAME( 2004, mushisam, 0, cv1k, cv1k, cv1k_state, init_mushisam, ROT270, "Cave (AMI license)", "Mushihime-Sama (2004/10/12.MASTER VER.)", GAME_FLAGS ) -GAME( 2004, mushisama, mushisam, cv1k, cv1k, cv1k_state, init_ibara, ROT270, "Cave (AMI license)", "Mushihime-Sama (2004/10/12 MASTER VER.)", GAME_FLAGS ) -GAME( 2004, mushisamb, mushisam, cv1k, cv1k, cv1k_state, init_mushisam, ROT270, "Cave (AMI license)", "Mushihime-Sama (2004/10/12 MASTER VER)", GAME_FLAGS ) +GAME( 2004, mushisam, 0, cv1k, cv1k, cv1k_state, init_mushisam, ROT270, "Cave (AMI license)", "Mushihime-Sama (2004/10/12.MASTER VER.)", MACHINE_IMPERFECT_TIMING ) +GAME( 2004, mushisama, mushisam, cv1k, cv1k, cv1k_state, init_ibara, ROT270, "Cave (AMI license)", "Mushihime-Sama (2004/10/12 MASTER VER.)", MACHINE_IMPERFECT_TIMING ) +GAME( 2004, mushisamb, mushisam, cv1k, cv1k, cv1k_state, init_mushisam, ROT270, "Cave (AMI license)", "Mushihime-Sama (2004/10/12 MASTER VER)", MACHINE_IMPERFECT_TIMING ) // CA012 Ibara -GAME( 2005, ibara, 0, cv1k, cv1ks,cv1k_state, init_ibara, ROT270, "Cave (AMI license)", "Ibara (2005/03/22 MASTER VER..)", GAME_FLAGS ) +GAME( 2005, ibara, 0, cv1k, cv1ks,cv1k_state, init_ibara, ROT270, "Cave (AMI license)", "Ibara (2005/03/22 MASTER VER..)", MACHINE_IMPERFECT_TIMING ) // CA012B Ibara Kuro Black Label -GAME( 2006, ibarablk, 0, cv1k, cv1ks,cv1k_state, init_pinkswts, ROT270, "Cave (AMI license)", "Ibara Kuro Black Label (2006/02/06. MASTER VER.)", GAME_FLAGS ) -GAME( 2006, ibarablka, ibarablk, cv1k, cv1ks,cv1k_state, init_pinkswts, ROT270, "Cave (AMI license)", "Ibara Kuro Black Label (2006/02/06 MASTER VER.)", GAME_FLAGS ) +GAME( 2006, ibarablk, 0, cv1k, cv1ks,cv1k_state, init_pinkswts, ROT270, "Cave (AMI license)", "Ibara Kuro Black Label (2006/02/06. MASTER VER.)", MACHINE_IMPERFECT_TIMING ) +GAME( 2006, ibarablka, ibarablk, cv1k, cv1ks,cv1k_state, init_pinkswts, ROT270, "Cave (AMI license)", "Ibara Kuro Black Label (2006/02/06 MASTER VER.)", MACHINE_IMPERFECT_TIMING ) // CA013 Espgaluda II -GAME( 2005, espgal2, 0, cv1k, cv1k, cv1k_state, init_espgal2, ROT270, "Cave (AMI license)", "Espgaluda II (2005/11/14 MASTER VER)", GAME_FLAGS ) +GAME( 2005, espgal2, 0, cv1k, cv1k, cv1k_state, init_espgal2, ROT270, "Cave (AMI license)", "Espgaluda II (2005/11/14 MASTER VER)", MACHINE_IMPERFECT_TIMING ) +GAME( 2005, espgal2a, espgal2, cv1k, cv1k, cv1k_state, init_espgal2, ROT270, "Cave (AMI license)", "Espgaluda II (2005/11/14 MASTER VER, older FPGA microcode)", MACHINE_IMPERFECT_TIMING ) // CA??? Puzzle! Mushihime-Tama -GAME( 2005, mushitam, 0, cv1k, cv1k, cv1k_state, init_mushitam, ROT0, "Cave (AMI license)", "Puzzle! Mushihime-Tama (2005/09/09.MASTER VER)", GAME_FLAGS ) -GAME( 2005, mushitama, mushitam, cv1k, cv1k, cv1k_state, init_mushitam, ROT0, "Cave (AMI license)", "Puzzle! Mushihime-Tama (2005/09/09 MASTER VER)", GAME_FLAGS ) +GAME( 2005, mushitam, 0, cv1k, cv1k, cv1k_state, init_mushitam, ROT0, "Cave (AMI license)", "Puzzle! Mushihime-Tama (2005/09/09.MASTER VER)", MACHINE_IMPERFECT_TIMING ) +GAME( 2005, mushitama, mushitam, cv1k, cv1k, cv1k_state, init_mushitam, ROT0, "Cave (AMI license)", "Puzzle! Mushihime-Tama (2005/09/09 MASTER VER)", MACHINE_IMPERFECT_TIMING ) // CA014 Pink Sweets: Ibara Sorekara -GAME( 2006, pinkswts, 0, cv1k, cv1ks,cv1k_state, init_pinkswts, ROT270, "Cave (AMI license)", "Pink Sweets: Ibara Sorekara (2006/04/06 MASTER VER....)", GAME_FLAGS ) -GAME( 2006, pinkswtsa, pinkswts, cv1k, cv1ks,cv1k_state, init_pinkswts, ROT270, "Cave (AMI license)", "Pink Sweets: Ibara Sorekara (2006/04/06 MASTER VER...)", GAME_FLAGS ) -GAME( 2006, pinkswtsb, pinkswts, cv1k, cv1ks,cv1k_state, init_pinkswts, ROT270, "Cave (AMI license)", "Pink Sweets: Ibara Sorekara (2006/04/06 MASTER VER.)", GAME_FLAGS ) -GAME( 2006, pinkswtsx, pinkswts, cv1k, cv1ks,cv1k_state, init_pinkswts, ROT270, "Cave (AMI license)", "Pink Sweets: Ibara Sorekara (2006/xx/xx MASTER VER.)", GAME_FLAGS ) // defaults to freeplay, possibly bootlegged from show/dev version? -GAME( 2006, pinkswtssc, pinkswts, cv1k, cv1ks,cv1k_state, init_pinkswts, ROT270, "bootleg", "Pink Sweets: Suicide Club (2017/10/31 SUICIDECLUB VER., bootleg)",GAME_FLAGS ) +GAME( 2006, pinkswts, 0, cv1k, cv1ks,cv1k_state, init_pinkswts, ROT270, "Cave (AMI license)", "Pink Sweets: Ibara Sorekara (2006/04/06 MASTER VER....)", MACHINE_IMPERFECT_TIMING ) +GAME( 2006, pinkswtsa, pinkswts, cv1k, cv1ks,cv1k_state, init_pinkswts, ROT270, "Cave (AMI license)", "Pink Sweets: Ibara Sorekara (2006/04/06 MASTER VER...)", MACHINE_IMPERFECT_TIMING ) +GAME( 2006, pinkswtsb, pinkswts, cv1k, cv1ks,cv1k_state, init_pinkswts, ROT270, "Cave (AMI license)", "Pink Sweets: Ibara Sorekara (2006/04/06 MASTER VER.)", MACHINE_IMPERFECT_TIMING ) +GAME( 2006, pinkswtsx, pinkswts, cv1k, cv1ks,cv1k_state, init_pinkswts, ROT270, "Cave (AMI license)", "Pink Sweets: Ibara Sorekara (2006/xx/xx MASTER VER.)", MACHINE_IMPERFECT_TIMING ) // defaults to freeplay, possibly bootlegged from show/dev version? +GAME( 2006, pinkswtssc, pinkswts, cv1k, cv1ks,cv1k_state, init_pinkswts, ROT270, "bootleg", "Pink Sweets: Suicide Club (2017/10/31 SUICIDECLUB VER., bootleg)",MACHINE_IMPERFECT_TIMING ) // CA015 Mushihime-Sama Futari -GAME( 2006, futari15, 0, cv1k, cv1k, cv1k_state, init_pinkswts, ROT270, "Cave (AMI license)", "Mushihime-Sama Futari Ver 1.5 (2006/12/8.MASTER VER. 1.54.)", GAME_FLAGS ) -GAME( 2006, futari15a, futari15, cv1k, cv1k, cv1k_state, init_pinkswts, ROT270, "Cave (AMI license)", "Mushihime-Sama Futari Ver 1.5 (2006/12/8 MASTER VER 1.54)", GAME_FLAGS ) -GAME( 2006, futari10, futari15, cv1k, cv1k, cv1k_state, init_pinkswts, ROT270, "Cave (AMI license)", "Mushihime-Sama Futari Ver 1.0 (2006/10/23 MASTER VER.)", GAME_FLAGS ) +GAME( 2006, futari15, 0, cv1k, cv1k, cv1k_state, init_pinkswts, ROT270, "Cave (AMI license)", "Mushihime-Sama Futari Ver 1.5 (2006/12/8.MASTER VER. 1.54.)", MACHINE_IMPERFECT_TIMING ) +GAME( 2006, futari15a, futari15, cv1k, cv1k, cv1k_state, init_pinkswts, ROT270, "Cave (AMI license)", "Mushihime-Sama Futari Ver 1.5 (2006/12/8 MASTER VER 1.54)", MACHINE_IMPERFECT_TIMING ) +GAME( 2006, futari10, futari15, cv1k, cv1k, cv1k_state, init_pinkswts, ROT270, "Cave (AMI license)", "Mushihime-Sama Futari Ver 1.0 (2006/10/23 MASTER VER.)", MACHINE_IMPERFECT_TIMING ) // CA015B Mushihime-Sama Futari Black Label -GAME( 2007, futaribl, 0, cv1k, cv1k, cv1k_state, init_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, init_pinkswts, ROT270, "Cave (AMI license)", "Mushihime-Sama Futari Black Label (2007/12/11 BLACK LABEL VER)", GAME_FLAGS ) +GAME( 2007, futaribl, 0, cv1k, cv1k, cv1k_state, init_pinkswts, ROT270, "Cave (AMI license)", "Mushihime-Sama Futari Black Label - Another Ver (2009/11/27 INTERNATIONAL BL)", MACHINE_IMPERFECT_TIMING ) // re-released for Chinese market +GAME( 2007, futariblj, futaribl, cv1k, cv1k, cv1k_state, init_pinkswts, ROT270, "Cave (AMI license)", "Mushihime-Sama Futari Black Label (2007/12/11 BLACK LABEL VER)", MACHINE_IMPERFECT_TIMING ) // CA016 Muchi Muchi Pork! -GAME( 2007, mmpork, 0, cv1k, cv1ks,cv1k_state, init_pinkswts, ROT270, "Cave (AMI license)", "Muchi Muchi Pork! (2007/ 4/17 MASTER VER.)", GAME_FLAGS ) +GAME( 2007, mmpork, 0, cv1k, cv1ks,cv1k_state, init_pinkswts, ROT270, "Cave (AMI license)", "Muchi Muchi Pork! (2007/ 4/17 MASTER VER.)", MACHINE_IMPERFECT_TIMING ) // CA017 Deathsmiles -GAME( 2007, deathsml, 0, cv1k, cv1k, cv1k_state, init_deathsml, ROT0, "Cave (AMI license)", "Deathsmiles (2007/10/09 MASTER VER)", GAME_FLAGS ) +GAME( 2007, deathsml, 0, cv1k, cv1k, cv1k_state, init_deathsml, ROT0, "Cave (AMI license)", "Deathsmiles (2007/10/09 MASTER VER)", MACHINE_IMPERFECT_TIMING ) // CA017B Deathsmiles Black Label -GAME( 2008, dsmbl, 0, cv1k_d, cv1k, cv1k_state, init_dpddfk, ROT0, "Cave (AMI license)", "Deathsmiles MegaBlack Label (2008/10/06 MEGABLACK LABEL VER)", GAME_FLAGS ) +GAME( 2008, dsmbl, 0, cv1k_d, cv1k, cv1k_state, init_dpddfk, ROT0, "Cave (AMI license)", "Deathsmiles MegaBlack Label (2008/10/06 MEGABLACK LABEL VER)", MACHINE_IMPERFECT_TIMING ) // CA019 Do-Don-Pachi Dai-Fukkatsu -GAME( 2008, ddpdfk, 0, cv1k_d, cv1k, cv1k_state, init_dpddfk, ROT270, "Cave (AMI license)", "DoDonPachi Dai-Fukkatsu Ver 1.5 (2008/06/23 MASTER VER 1.5)", GAME_FLAGS ) -GAME( 2008, ddpdfk10, ddpdfk, cv1k_d, cv1k, cv1k_state, init_dpddfk, ROT270, "Cave (AMI license)", "DoDonPachi Dai-Fukkatsu Ver 1.0 (2008/05/16 MASTER VER)", GAME_FLAGS ) +GAME( 2008, ddpdfk, 0, cv1k_d, cv1k, cv1k_state, init_dpddfk, ROT270, "Cave (AMI license)", "DoDonPachi Dai-Fukkatsu Ver 1.5 (2008/06/23 MASTER VER 1.5)", MACHINE_IMPERFECT_TIMING ) +GAME( 2008, ddpdfk10, ddpdfk, cv1k_d, cv1k, cv1k_state, init_dpddfk, ROT270, "Cave (AMI license)", "DoDonPachi Dai-Fukkatsu Ver 1.0 (2008/05/16 MASTER VER)", MACHINE_IMPERFECT_TIMING ) // CA019B Do-Don-Pachi Dai-Fukkatsu Black Label -GAME( 2010, dfkbl, 0, cv1k_d, cv1k, cv1k_state, init_dpddfk, ROT270, "Cave (AMI license)", "DoDonPachi Dai-Fukkatsu Black Label (2010/1/18 BLACK LABEL)", GAME_FLAGS ) +GAME( 2010, dfkbl, 0, cv1k_d, cv1k, cv1k_state, init_dpddfk, ROT270, "Cave (AMI license)", "DoDonPachi Dai-Fukkatsu Black Label (2010/1/18 BLACK LABEL)", MACHINE_IMPERFECT_TIMING ) // CA021 Akai Katana -GAME( 2010, akatana, 0, cv1k_d, cv1k, cv1k_state, init_dpddfk, ROT0, "Cave (AMI license)", "Akai Katana (2010/ 8/13 MASTER VER.)", GAME_FLAGS ) +GAME( 2010, akatana, 0, cv1k_d, cv1k, cv1k_state, init_dpddfk, ROT0, "Cave (AMI license)", "Akai Katana (2010/ 8/13 MASTER VER.)", MACHINE_IMPERFECT_TIMING ) // CMDL01 Medal Mahjong Moukari Bancho GAME( 2007, mmmbanc, 0, cv1k, cv1k, cv1k_state, init_pinkswts, ROT0, "Cave (AMI license)", "Medal Mahjong Moukari Bancho (2007/06/05 MASTER VER.)", MACHINE_NOT_WORKING ) diff --git a/src/mame/drivers/namcos22.cpp b/src/mame/drivers/namcos22.cpp index 488759ff0f0..e61ae3caa6c 100644 --- a/src/mame/drivers/namcos22.cpp +++ b/src/mame/drivers/namcos22.cpp @@ -4120,6 +4120,17 @@ ROM_START( ridgeracf ) ROM_REGION16_LE( 0x80000, "mcu", 0 ) /* sound data */ ROM_LOAD( "rrf1data.6r", 0, 0x080000, CRC(ce3c6ed6) SHA1(23e033364bc967c10c49fd1d5413dda837670633) ) + /* this stuff was missing from this version, and shouldn't be the same (bad textures if we use these roms) */ + ROM_REGION( 0x200000*8, "textile", 0) /* 16x16x8bpp texture tiles */ + ROM_LOAD( "rrf1cg0.bin", 0x200000*0x4, 0x200000, BAD_DUMP CRC(b557a795) SHA1(f345486ffbe797246ad80a55d3c4a332ed6e2888) ) + ROM_LOAD( "rrf1cg1.bin", 0x200000*0x5, 0x200000, BAD_DUMP CRC(0fa212d9) SHA1(a1311de0a504e2d399044fa8ac32ec6c56ec965f) ) + ROM_LOAD( "rrf1cg2.bin", 0x200000*0x6, 0x200000, BAD_DUMP CRC(18e2d2bd) SHA1(69c2ea62eeb255f27d3c69373f6716b0a34683cc) ) + ROM_LOAD( "rrf1cg3.bin", 0x200000*0x7, 0x200000, BAD_DUMP CRC(9564488b) SHA1(6b27d1aea75d6be747c62e165cfa49ecc5d9e767) ) + + ROM_REGION16_LE( 0x280000, "textilemap", 0 ) /* texture tilemap */ + ROM_LOAD( "rrf1ccrl.bin",0x000000, 0x200000, BAD_DUMP CRC(6092d181) SHA1(52c0e3ac20aa23059a87d1a985d24ae641577310) ) + ROM_LOAD( "rrf1ccrh.bin",0x200000, 0x080000, BAD_DUMP CRC(dd332fd5) SHA1(a7d9c1d6b5a8e3a937b525c1363880e404dcd147) ) + ROM_REGION( 0x80000*6, "pointrom", 0 ) /* 3d model data */ ROM_LOAD( "rrf2potl0.l0", 0x80000*0, 0x80000, CRC(9b762e60) SHA1(50b67ff6678bacba140bad3aedda75c30851fa7a) ) ROM_LOAD( "rrf2potl1.l1", 0x80000*1, 0x80000, CRC(ab4d66b0) SHA1(59020b3dc2efff99cd528752ca7168b64ae96ac4) ) @@ -4134,21 +4145,10 @@ ROM_START( ridgeracf ) ROM_LOAD( "rrf1wave2.10n", 0x100000*1, 0x100000,CRC(4ceeae12) SHA1(ae3a6583f8912bc784c7bc63d32448228cf217ba) ) // differs from normal sets ROM_LOAD( "rrf1wave3.10l", 0x100000*3, 0x100000,CRC(c4cda1a7) SHA1(60bc96880ec79efdff3cc70c09e848692a40bea4) ) - /* this stuff was missing from this version, and shouldn't be the same (bad textures if we use these roms) */ ROM_REGION( 0x300, "gamma_proms", 0 ) - ROM_LOAD( "rrf1gam.2d", 0x0000, 0x0100, BAD_DUMP CRC(b2161bce) SHA1(d2681cc0cf8e68df0d942d392b4eb4458c4bb356) ) - ROM_LOAD( "rrf1gam.3d", 0x0100, 0x0100, BAD_DUMP CRC(b2161bce) SHA1(d2681cc0cf8e68df0d942d392b4eb4458c4bb356) ) - ROM_LOAD( "rrf1gam.4d", 0x0200, 0x0100, BAD_DUMP CRC(b2161bce) SHA1(d2681cc0cf8e68df0d942d392b4eb4458c4bb356) ) - - ROM_REGION( 0x200000*8, "textile", 0) /* 16x16x8bpp texture tiles */ - ROM_LOAD( "rrf1cg0.bin", 0x200000*0x4, 0x200000, BAD_DUMP CRC(b557a795) SHA1(f345486ffbe797246ad80a55d3c4a332ed6e2888) ) - ROM_LOAD( "rrf1cg1.bin", 0x200000*0x5, 0x200000, BAD_DUMP CRC(0fa212d9) SHA1(a1311de0a504e2d399044fa8ac32ec6c56ec965f) ) - ROM_LOAD( "rrf1cg2.bin", 0x200000*0x6, 0x200000, BAD_DUMP CRC(18e2d2bd) SHA1(69c2ea62eeb255f27d3c69373f6716b0a34683cc) ) - ROM_LOAD( "rrf1cg3.bin", 0x200000*0x7, 0x200000, BAD_DUMP CRC(9564488b) SHA1(6b27d1aea75d6be747c62e165cfa49ecc5d9e767) ) - - ROM_REGION16_LE( 0x280000, "textilemap", 0 ) /* texture tilemap */ - ROM_LOAD( "rrf1ccrl.bin",0x000000, 0x200000, BAD_DUMP CRC(6092d181) SHA1(52c0e3ac20aa23059a87d1a985d24ae641577310) ) - ROM_LOAD( "rrf1ccrh.bin",0x200000, 0x080000, BAD_DUMP CRC(dd332fd5) SHA1(a7d9c1d6b5a8e3a937b525c1363880e404dcd147) ) + ROM_LOAD( "rrf1gam.2d", 0x0000, 0x0100, CRC(b2161bce) SHA1(d2681cc0cf8e68df0d942d392b4eb4458c4bb356) ) + ROM_LOAD( "rrf1gam.3d", 0x0100, 0x0100, CRC(b2161bce) SHA1(d2681cc0cf8e68df0d942d392b4eb4458c4bb356) ) + ROM_LOAD( "rrf1gam.4d", 0x0200, 0x0100, CRC(b2161bce) SHA1(d2681cc0cf8e68df0d942d392b4eb4458c4bb356) ) ROM_END diff --git a/src/mame/mame.lst b/src/mame/mame.lst index 203bb9aa542..d9316172735 100644 --- a/src/mame/mame.lst +++ b/src/mame/mame.lst @@ -11591,6 +11591,7 @@ deathsml // (c) 2007 Cave (AMI license) - 2007/10/09 MAST dfkbl // (c) 2010 Cave (AMI license) - 2010/1/18 BLACK LABEL dsmbl // (c) 2008 Cave (AMI license) - 2008/10/06 MEGABLACK LABEL VER espgal2 // (c) 2005 Cave (AMI license) - 2005/11/14 MASTER VER +espgal2a // (c) 2005 Cave (AMI license) - 2005/11/14 MASTER VER 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 -- cgit v1.2.3 From 139bfdcf388fdc3960f8703194c8a7cbee5332c3 Mon Sep 17 00:00:00 2001 From: hap Date: Mon, 23 Aug 2021 14:17:38 +0200 Subject: cv1k: update espgal2 pcb note (cherry picked from commit eede8a794d2cb99fc1a70d5d6843fbdfb6eb3621) --- src/mame/drivers/cv1k.cpp | 12 ++++++------ src/mame/drivers/namcos22.cpp | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/mame/drivers/cv1k.cpp b/src/mame/drivers/cv1k.cpp index 8276de513e3..10ba76dcfc0 100644 --- a/src/mame/drivers/cv1k.cpp +++ b/src/mame/drivers/cv1k.cpp @@ -187,8 +187,8 @@ Common game codes: class cv1k_state : public driver_device { public: - cv1k_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + cv1k_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_blitter(*this, "blitter"), m_serflash(*this, "game"), @@ -199,7 +199,7 @@ public: m_eepromout(*this, "EEPROMOUT"), m_idleramoffs(0), m_idlepc(0) - { } + { } required_device m_maincpu; required_device m_blitter; @@ -448,7 +448,7 @@ INPUT_PORTS_END void cv1k_state::machine_reset() { - m_blitter->set_rambase (reinterpret_cast(m_ram.target())); + m_blitter->set_rambase(reinterpret_cast(m_ram.target())); m_blitter->set_is_unsafe(machine().root_device().ioport(":BLITCFG")->read()); m_blitter->install_handlers( 0x18000000, 0x18000057 ); m_blitter->reset(); @@ -569,9 +569,9 @@ ROM_START( mushisamb ) ROM_LOAD16_WORD_SWAP("u24", 0x400000, 0x400000, CRC(e3d05c9f) SHA1(130c3d62317da1729c85bd178bd51500edd73ada) ) ROM_END -ROM_START( espgal2 ) +ROM_START( espgal2 ) // newer PCB revision (still called rev B), updated FPGA firmware, no changes in game code or data ROM_REGION( 0x400000, "maincpu", ROMREGION_ERASEFF) - ROM_LOAD16_WORD_SWAP( "espgal2_u4", 0x000000, 0x200000, CRC(843608b8) SHA1(2f5fcd38e76df531a923cd9956104cef5185aaa9) ) // (2005/11/14 MASTER VER) - newer PCB revision, updated FPGA firmware, no changes in game code or data + ROM_LOAD16_WORD_SWAP( "espgal2_u4", 0x000000, 0x200000, CRC(843608b8) SHA1(2f5fcd38e76df531a923cd9956104cef5185aaa9) ) // (2005/11/14 MASTER VER) ROM_RELOAD(0x200000,0x200000) ROM_REGION( 0x8400000, "game", ROMREGION_ERASEFF) diff --git a/src/mame/drivers/namcos22.cpp b/src/mame/drivers/namcos22.cpp index e61ae3caa6c..f2f9fbb0097 100644 --- a/src/mame/drivers/namcos22.cpp +++ b/src/mame/drivers/namcos22.cpp @@ -4146,9 +4146,9 @@ ROM_START( ridgeracf ) ROM_LOAD( "rrf1wave3.10l", 0x100000*3, 0x100000,CRC(c4cda1a7) SHA1(60bc96880ec79efdff3cc70c09e848692a40bea4) ) ROM_REGION( 0x300, "gamma_proms", 0 ) - ROM_LOAD( "rrf1gam.2d", 0x0000, 0x0100, CRC(b2161bce) SHA1(d2681cc0cf8e68df0d942d392b4eb4458c4bb356) ) - ROM_LOAD( "rrf1gam.3d", 0x0100, 0x0100, CRC(b2161bce) SHA1(d2681cc0cf8e68df0d942d392b4eb4458c4bb356) ) - ROM_LOAD( "rrf1gam.4d", 0x0200, 0x0100, CRC(b2161bce) SHA1(d2681cc0cf8e68df0d942d392b4eb4458c4bb356) ) + ROM_LOAD( "rr1gam.2d", 0x0000, 0x0100, CRC(b2161bce) SHA1(d2681cc0cf8e68df0d942d392b4eb4458c4bb356) ) + ROM_LOAD( "rr1gam.3d", 0x0100, 0x0100, CRC(b2161bce) SHA1(d2681cc0cf8e68df0d942d392b4eb4458c4bb356) ) + ROM_LOAD( "rr1gam.4d", 0x0200, 0x0100, CRC(b2161bce) SHA1(d2681cc0cf8e68df0d942d392b4eb4458c4bb356) ) ROM_END -- cgit v1.2.3 From cc5f802f13341ad7cd14bce4676970318d8e6370 Mon Sep 17 00:00:00 2001 From: hap Date: Mon, 23 Aug 2021 15:46:50 +0200 Subject: cv1k: add note about CV1000-B (cherry picked from commit 107ca8394da870d1a40c5a40f20c2715dfe70b55) --- src/mame/drivers/cv1k.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/mame/drivers/cv1k.cpp b/src/mame/drivers/cv1k.cpp index 10ba76dcfc0..abae51143b1 100644 --- a/src/mame/drivers/cv1k.cpp +++ b/src/mame/drivers/cv1k.cpp @@ -131,6 +131,8 @@ Misc: Note: * The Altera EPM7032 usually stamped / labeled with the Cave game ID number as listed above. * Actual flash ROMs will vary by manufacturer but will be compatible with flash ROM listed. + * There are two known CV1000-B PCB revisions. The newer one uses an updated FPGA firmware + and has some minor hardware differences. * The CV1000-D revision PCB has double the RAM at U1, double the ROM at U4 and no battery. The CV1000-D is used for Dodonpachi Daifukkatsu and later games. Commonly referred to as SH3B PCB. @@ -569,7 +571,7 @@ ROM_START( mushisamb ) ROM_LOAD16_WORD_SWAP("u24", 0x400000, 0x400000, CRC(e3d05c9f) SHA1(130c3d62317da1729c85bd178bd51500edd73ada) ) ROM_END -ROM_START( espgal2 ) // newer PCB revision (still called rev B), updated FPGA firmware, no changes in game code or data +ROM_START( espgal2 ) // newer CV1000-B PCB revision, updated FPGA firmware, no changes in game code or data ROM_REGION( 0x400000, "maincpu", ROMREGION_ERASEFF) ROM_LOAD16_WORD_SWAP( "espgal2_u4", 0x000000, 0x200000, CRC(843608b8) SHA1(2f5fcd38e76df531a923cd9956104cef5185aaa9) ) // (2005/11/14 MASTER VER) ROM_RELOAD(0x200000,0x200000) @@ -971,8 +973,8 @@ GAME( 2006, ibarablk, 0, cv1k, cv1ks,cv1k_state, init_pinkswts, ROT27 GAME( 2006, ibarablka, ibarablk, cv1k, cv1ks,cv1k_state, init_pinkswts, ROT270, "Cave (AMI license)", "Ibara Kuro Black Label (2006/02/06 MASTER VER.)", MACHINE_IMPERFECT_TIMING ) // CA013 Espgaluda II -GAME( 2005, espgal2, 0, cv1k, cv1k, cv1k_state, init_espgal2, ROT270, "Cave (AMI license)", "Espgaluda II (2005/11/14 MASTER VER)", MACHINE_IMPERFECT_TIMING ) -GAME( 2005, espgal2a, espgal2, cv1k, cv1k, cv1k_state, init_espgal2, ROT270, "Cave (AMI license)", "Espgaluda II (2005/11/14 MASTER VER, older FPGA microcode)", MACHINE_IMPERFECT_TIMING ) +GAME( 2005, espgal2, 0, cv1k, cv1k, cv1k_state, init_espgal2, ROT270, "Cave (AMI license)", "Espgaluda II (2005/11/14 MASTER VER, newer CV1000-B PCB)", MACHINE_IMPERFECT_TIMING ) +GAME( 2005, espgal2a, espgal2, cv1k, cv1k, cv1k_state, init_espgal2, ROT270, "Cave (AMI license)", "Espgaluda II (2005/11/14 MASTER VER, original CV1000-B PCB)", MACHINE_IMPERFECT_TIMING ) // CA??? Puzzle! Mushihime-Tama GAME( 2005, mushitam, 0, cv1k, cv1k, cv1k_state, init_mushitam, ROT0, "Cave (AMI license)", "Puzzle! Mushihime-Tama (2005/09/09.MASTER VER)", MACHINE_IMPERFECT_TIMING ) -- cgit v1.2.3 From 07f8452101f38f4647cdc058ce1c917bb7719d76 Mon Sep 17 00:00:00 2001 From: hap Date: Mon, 23 Aug 2021 17:49:18 +0200 Subject: hh_tms1k: correct ti5100 machine category (cherry picked from commit 895ff8ef028b5597eda26300bb3e0a4e216fb6fd) --- src/mame/drivers/hh_tms1k.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mame/drivers/hh_tms1k.cpp b/src/mame/drivers/hh_tms1k.cpp index 8493a40b9a5..0e3a2a83e41 100644 --- a/src/mame/drivers/hh_tms1k.cpp +++ b/src/mame/drivers/hh_tms1k.cpp @@ -13269,7 +13269,7 @@ COMP( 1975, ti1250, 0, 0, ti1250, ti1250, ti1250_state, emp COMP( 1976, ti125076, ti1250, 0, ti1270, ti1250, ti1250_state, empty_init, "Texas Instruments", "TI-1250 (1976 version)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW ) COMP( 1976, ti1270, 0, 0, ti1270, ti1270, ti1250_state, empty_init, "Texas Instruments", "TI-1270", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW ) COMP( 1976, ti25503, 0, 0, ti25503, ti25503, ti25503_state, empty_init, "Texas Instruments", "TI-2550 III", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW ) -CONS( 1976, ti5100, 0, 0, ti5100, ti5100, ti5100_state, empty_init, "Texas Instruments", "TI-5100", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW ) +COMP( 1976, ti5100, 0, 0, ti5100, ti5100, ti5100_state, empty_init, "Texas Instruments", "TI-5100", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW ) COMP( 1976, ti30, 0, 0, ti30, ti30, ti30_state, empty_init, "Texas Instruments", "TI-30", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW ) COMP( 1976, tibusan, 0, 0, ti30, tibusan, ti30_state, empty_init, "Texas Instruments", "TI Business Analyst", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW ) COMP( 1977, tiprog, 0, 0, ti30, tiprog, ti30_state, empty_init, "Texas Instruments", "TI Programmer", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW ) -- cgit v1.2.3 From 95325c6400b999aad358284df977fdb795e32a5d Mon Sep 17 00:00:00 2001 From: MooglyGuy Date: Tue, 24 Aug 2021 16:33:47 +0200 Subject: -bgfx: Revised fs_blit_palette16 to not use pixel rounding. Fixes issues in carpolo, kncljoe, and others. [Ryan Holtz] (#8488) --- .../shaders/dx11/chains/misc/fs_blit_palette16.bin | Bin 1020 -> 672 bytes bgfx/shaders/dx9/chains/misc/fs_blit_palette16.bin | Bin 805 -> 481 bytes .../shaders/essl/chains/misc/fs_blit_palette16.bin | Bin 1063 -> 445 bytes .../shaders/glsl/chains/misc/fs_blit_palette16.bin | Bin 1000 -> 422 bytes .../metal/chains/misc/fs_blit_palette16.bin | Bin 1476 -> 958 bytes .../spirv/chains/misc/fs_blit_palette16.bin | Bin 2628 -> 1660 bytes .../bgfx/shaders/chains/misc/fs_blit_palette16.sc | 19 ++---------- src/osd/modules/render/bgfxutil.cpp | 33 +++++++++++++++++++-- 8 files changed, 32 insertions(+), 20 deletions(-) diff --git a/bgfx/shaders/dx11/chains/misc/fs_blit_palette16.bin b/bgfx/shaders/dx11/chains/misc/fs_blit_palette16.bin index c32a68b09a6..91a4aaf2d29 100644 Binary files a/bgfx/shaders/dx11/chains/misc/fs_blit_palette16.bin and b/bgfx/shaders/dx11/chains/misc/fs_blit_palette16.bin differ diff --git a/bgfx/shaders/dx9/chains/misc/fs_blit_palette16.bin b/bgfx/shaders/dx9/chains/misc/fs_blit_palette16.bin index 136f81cdd47..59f3c6dce27 100644 Binary files a/bgfx/shaders/dx9/chains/misc/fs_blit_palette16.bin and b/bgfx/shaders/dx9/chains/misc/fs_blit_palette16.bin differ diff --git a/bgfx/shaders/essl/chains/misc/fs_blit_palette16.bin b/bgfx/shaders/essl/chains/misc/fs_blit_palette16.bin index 5ce09d13b32..d82fc7f6fbc 100644 Binary files a/bgfx/shaders/essl/chains/misc/fs_blit_palette16.bin and b/bgfx/shaders/essl/chains/misc/fs_blit_palette16.bin differ diff --git a/bgfx/shaders/glsl/chains/misc/fs_blit_palette16.bin b/bgfx/shaders/glsl/chains/misc/fs_blit_palette16.bin index f9a7910a249..aadd6349d8c 100644 Binary files a/bgfx/shaders/glsl/chains/misc/fs_blit_palette16.bin and b/bgfx/shaders/glsl/chains/misc/fs_blit_palette16.bin differ diff --git a/bgfx/shaders/metal/chains/misc/fs_blit_palette16.bin b/bgfx/shaders/metal/chains/misc/fs_blit_palette16.bin index b541e7f9cb6..58d7bbdde95 100644 Binary files a/bgfx/shaders/metal/chains/misc/fs_blit_palette16.bin and b/bgfx/shaders/metal/chains/misc/fs_blit_palette16.bin differ diff --git a/bgfx/shaders/spirv/chains/misc/fs_blit_palette16.bin b/bgfx/shaders/spirv/chains/misc/fs_blit_palette16.bin index c3afa18867a..44f887fa945 100644 Binary files a/bgfx/shaders/spirv/chains/misc/fs_blit_palette16.bin and b/bgfx/shaders/spirv/chains/misc/fs_blit_palette16.bin differ diff --git a/src/osd/modules/render/bgfx/shaders/chains/misc/fs_blit_palette16.sc b/src/osd/modules/render/bgfx/shaders/chains/misc/fs_blit_palette16.sc index c152bfa8fe3..e87f8a76315 100644 --- a/src/osd/modules/render/bgfx/shaders/chains/misc/fs_blit_palette16.sc +++ b/src/osd/modules/render/bgfx/shaders/chains/misc/fs_blit_palette16.sc @@ -15,22 +15,7 @@ uniform vec4 u_inv_tex_size1; void main() { - // Logic taken from fs_blit_yuy16.sc - we need to do this, because - // the D3D9 BGFX backend claims to support RG8, but does so in - // a faulty way by using A8L8, which is not an appropriate format - // for representing an RG8 texture. - - vec2 half_texel = u_inv_tex_size0.xy * vec2(0.5, 0.5); - - vec2 original_uv = v_texcoord0.xy * u_tex_size0.xy; - float mod_val = mod(original_uv.x, 2.0); - vec2 rounded_uv = vec2(original_uv.x - mod_val, original_uv.y); - vec4 srcpix = texture2D(s_tex, rounded_uv * u_inv_tex_size0.xy + half_texel.x); - - vec2 palette_uv = (srcpix.ra * vec2(256.0, 256.0)) * u_inv_tex_size1.xy; - if (mod_val < 1.0) - palette_uv = (srcpix.bg * vec2(256.0, 256.0)) * u_inv_tex_size1.xy; - + vec4 srcpix = texture2D(s_tex, v_texcoord0.xy); + vec2 palette_uv = (srcpix.bg * vec2(256.0, 256.0)) * u_inv_tex_size1.xy; gl_FragColor = vec4(texture2D(s_pal, palette_uv).rgb, 1.0) * v_color0; - //gl_FragColor = texture2D(s_tex, v_texcoord0) * v_color0; } diff --git a/src/osd/modules/render/bgfxutil.cpp b/src/osd/modules/render/bgfxutil.cpp index f0d01e4fa86..88d2fbf399a 100644 --- a/src/osd/modules/render/bgfxutil.cpp +++ b/src/osd/modules/render/bgfxutil.cpp @@ -17,23 +17,50 @@ const bgfx::Memory* bgfx_util::mame_texture_data_to_bgfx_texture_data(bgfx::TextureFormat::Enum &dst_format, uint32_t src_format, int rowpixels, int height, const rgb_t *palette, void *base, uint16_t &out_pitch, int &convert_stride) { bgfx::TextureInfo info; + const bgfx::Memory *data = nullptr; + switch (src_format) { - case PRIMFLAG_TEXFORMAT(TEXFORMAT_PALETTE16): case PRIMFLAG_TEXFORMAT(TEXFORMAT_YUY16): dst_format = bgfx::TextureFormat::BGRA8; convert_stride = 2; out_pitch = rowpixels * 2; + bgfx::calcTextureSize(info, rowpixels / convert_stride, height, 1, false, false, 1, dst_format); + + data = bgfx::copy(base, info.storageSize); + break; + case PRIMFLAG_TEXFORMAT(TEXFORMAT_PALETTE16): + { + dst_format = bgfx::TextureFormat::BGRA8; + convert_stride = 1; + out_pitch = rowpixels * 4; + bgfx::calcTextureSize(info, rowpixels / convert_stride, height, 1, false, false, 1, dst_format); + + uint16_t *src = (uint16_t *)base; + uint16_t *dst_data = new uint16_t[rowpixels * 2 * height]; + uint16_t *dst = dst_data; + for (int i = 0; i < rowpixels * height; i++, src++) + { + *dst++ = *src; + *dst++ = 0; + } + + data = bgfx::copy(dst_data, info.storageSize); + delete [] dst_data; break; + } case PRIMFLAG_TEXFORMAT(TEXFORMAT_ARGB32): case PRIMFLAG_TEXFORMAT(TEXFORMAT_RGB32): dst_format = bgfx::TextureFormat::BGRA8; convert_stride = 1; out_pitch = rowpixels * 4; + bgfx::calcTextureSize(info, rowpixels / convert_stride, height, 1, false, false, 1, dst_format); + + data = bgfx::copy(base, info.storageSize); break; } - bgfx::calcTextureSize(info, rowpixels / convert_stride, height, 1, false, false, 1, dst_format); - return bgfx::copy(base, info.storageSize); + + return data; } const bgfx::Memory* bgfx_util::mame_texture_data_to_bgra32(uint32_t src_format, int width, int height, int rowpixels, const rgb_t *palette, void *base) -- cgit v1.2.3 From 2e9297ee05f40b0ab31ef5b89a424b5f8c758a53 Mon Sep 17 00:00:00 2001 From: hap Date: Wed, 25 Aug 2021 12:31:42 +0200 Subject: kncljoe: fix off-by-1 with sprite layer clip (cherry picked from commit 3cadc4f688ba4172a1e19195c4999c0265bd3f53) --- src/mame/drivers/kncljoe.cpp | 9 ++++++--- src/mame/video/kncljoe.cpp | 6 +++--- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/mame/drivers/kncljoe.cpp b/src/mame/drivers/kncljoe.cpp index c0eed4f5049..7edfb93b483 100644 --- a/src/mame/drivers/kncljoe.cpp +++ b/src/mame/drivers/kncljoe.cpp @@ -14,10 +14,13 @@ The video hardware is pretty much like Irem games too. The only strange thing is that the screen is flipped vertically. TODO: +- sprite-sprite priorities are imperfect (simply reversing them won't fix it, + motorcycle level will get much worse) - accurate screen timing (raw params), attract mode doesn't 1:1 match PCB BTANB: - attract mode demo play stops playing and lets the timer run out +- heads of baddies clip off when you defeat them on the lowest floor - player sprite 1-scanline glitch at the lower part of motorcycle level - player sprite may briefly turn into garbage after a boss fight @@ -67,10 +70,10 @@ void kncljoe_state::m6803_port1_w(uint8_t data) void kncljoe_state::m6803_port2_w(uint8_t data) { - /* write latch */ + // write latch if ((m_port2 & 0x01) && !(data & 0x01)) { - /* control or data port? */ + // control or data port? if (m_port2 & 0x08) m_ay8910->data_address_w(m_port2 >> 2, m_port1); } @@ -96,7 +99,7 @@ void kncljoe_state::sound_irq_ack_w(uint8_t data) void kncljoe_state::unused_w(uint8_t data) { - //unused - no MSM on the pcb + // unused - no MSM on the pcb } void kncljoe_state::sound_map(address_map &map) diff --git a/src/mame/video/kncljoe.cpp b/src/mame/video/kncljoe.cpp index 8293836e2ce..1edd294cf12 100644 --- a/src/mame/video/kncljoe.cpp +++ b/src/mame/video/kncljoe.cpp @@ -171,8 +171,8 @@ void kncljoe_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprec { // clip vertical strip for each layer rectangle clip = cliprect; - clip.min_y = m_flipscreen ? (192 - i * 64) : (i * 64 + 1); - clip.max_y = clip.min_y + 64; + clip.min_y = m_flipscreen ? (191 - i * 64) : (i * 64 + 1); + clip.max_y = clip.min_y + 63; clip &= cliprect; for (int j = 0x7c; j >= 0; j -= 4) @@ -191,7 +191,7 @@ void kncljoe_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprec flipx = !flipx; flipy = !flipy; sx = 240 - sx; - sy = 241 - sy; + sy = 240 - sy; } if (sx >= 256-8) -- cgit v1.2.3 From bdbf452e91a80598026bfc7671c0b5339676f237 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Thu, 26 Aug 2021 15:48:15 +1000 Subject: util/zippath.cpp: OSD_WINDOWS isn't a safe way to detect Windows target, and OSD_* macros must not be used outside libocore/libosd. --- src/lib/util/zippath.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/lib/util/zippath.cpp b/src/lib/util/zippath.cpp index 023484010b8..7e8e804ad42 100644 --- a/src/lib/util/zippath.cpp +++ b/src/lib/util/zippath.cpp @@ -48,7 +48,9 @@ int is_path_separator(char c) bool is_root(std::string_view path) { -#if defined(OSD_WINDOWS) +#if defined(WIN32) + // FIXME: don't assume paths are DOS-like - UNC paths, \\?\ long path prefix, etc. complicate this + // skip drive letter if (path.length() >= 2 && isalpha(path[0]) && (path[1] == ':')) path.remove_prefix(2); @@ -56,6 +58,7 @@ bool is_root(std::string_view path) // skip path separators return path.find_first_not_of(PATH_SEPARATOR) == std::string_view::npos; #else + // FIXME: handle multiple successive path separators, current directory references, parent directory references return (path.length() == 1) && (path[0] == '/'); #endif } -- cgit v1.2.3 From ec9ba6fa76c3941272786e20232a1fcfc68594f3 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Thu, 26 Aug 2021 16:44:17 +1000 Subject: Bump version to 0.235 --- android-project/app/src/main/AndroidManifest.xml | 4 ++-- makefile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/android-project/app/src/main/AndroidManifest.xml b/android-project/app/src/main/AndroidManifest.xml index 1c86e915138..9c3fb9d5c21 100644 --- a/android-project/app/src/main/AndroidManifest.xml +++ b/android-project/app/src/main/AndroidManifest.xml @@ -4,8 +4,8 @@ --> diff --git a/makefile b/makefile index 62d72e8c459..bc5147e6b01 100644 --- a/makefile +++ b/makefile @@ -1755,14 +1755,14 @@ endif ifeq (posix,$(SHELLTYPE)) $(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS) - @echo '#define BARE_BUILD_VERSION "0.234"' > $@ + @echo '#define BARE_BUILD_VERSION "0.235"' > $@ @echo 'extern const char bare_build_version[];' >> $@ @echo 'extern const char build_version[];' >> $@ @echo 'const char bare_build_version[] = BARE_BUILD_VERSION;' >> $@ @echo 'const char build_version[] = BARE_BUILD_VERSION " ($(NEW_GIT_VERSION))";' >> $@ else $(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS) - @echo #define BARE_BUILD_VERSION "0.234" > $@ + @echo #define BARE_BUILD_VERSION "0.235" > $@ @echo extern const char bare_build_version[]; >> $@ @echo extern const char build_version[]; >> $@ @echo const char bare_build_version[] = BARE_BUILD_VERSION; >> $@ -- cgit v1.2.3