From cf1d719df426c4476d7d9e5618b7eb54210d52f7 Mon Sep 17 00:00:00 2001 From: Robbbert Date: Sat, 18 May 2024 14:33:57 +1000 Subject: [PATCH] Added sfz3mix 0.29, added yoyoshkn --- docs/release/docs/hbnew.txt | 4 ++- src/hbmame/drivers/cps2t.cpp | 63 +++++++++++++++++++++------------ src/hbmame/drivers/neogeohb.cpp | 25 +++++++++++-- src/hbmame/hbmame.lst | 2 ++ 4 files changed, 69 insertions(+), 25 deletions(-) diff --git a/docs/release/docs/hbnew.txt b/docs/release/docs/hbnew.txt index d7c0e4a299c..0ea4484771b 100644 --- a/docs/release/docs/hbnew.txt +++ b/docs/release/docs/hbnew.txt @@ -12,6 +12,8 @@ New Games - [dkong23] Donkey Kong (hitboxes and sprites) - [gladmortd] Gladmort (Demo) - [oldsps28] Oriental Legend 2 (New Revision CN) +- [sfz3mix] Street Fighter Zero 3 (Turbo Mix 0.29) [zero800] +- [yoyoshkn] Yo-Yo Shuriken @@ -32,7 +34,7 @@ New Games - [pgmcabal] Cabal (PGM) [iq_132] - [pgmsnake] PGM test program [iq_132] - [sf2ce58] Street Fighter II' (SrSreet edition) -- [sfz3mix] Street Fighter Zero 3 (Turbo Mix 0.28) [zero800] +- [sfz3mix28] Street Fighter Zero 3 (Turbo Mix 0.28) [zero800] - [ssf2tnl] Super Street Fighter II Turbo (New Legacy v0.9 beta 2024-04-02) diff --git a/src/hbmame/drivers/cps2t.cpp b/src/hbmame/drivers/cps2t.cpp index 4a376536560..37d3846d649 100644 --- a/src/hbmame/drivers/cps2t.cpp +++ b/src/hbmame/drivers/cps2t.cpp @@ -372,13 +372,13 @@ ROM_START( sfz3mix23 ) // 0.23 ROM_REGION( 0x4000000, "gfx", 0 ) ROM_LOAD( "sfz3mix23.c1", 0x0000000, 0x2000000, CRC(09f422ed) SHA1(6e85264c8871f3f12360c82baf9e939137cbb919) ) - ROM_LOAD( "sfz3mix.c2", 0x2000000, 0x2000000, CRC(cbc02909) SHA1(a3bcf2f7a2d4139024790d55e4ab5a156b36e6e3) ) + ROM_LOAD( "sfz3mix23.c2", 0x2000000, 0x2000000, CRC(cbc02909) SHA1(a3bcf2f7a2d4139024790d55e4ab5a156b36e6e3) ) ROM_REGION( 0x80000, "audiocpu", 0 ) - ROM_LOAD( "sfz3mix.m1", 0x000000, 0x080000, CRC(c6322d7b) SHA1(0530f0d7c248180478ff588397263d961b8c5c8b) ) + ROM_LOAD( "sfz3mix23.m1", 0x000000, 0x080000, CRC(c6322d7b) SHA1(0530f0d7c248180478ff588397263d961b8c5c8b) ) ROM_REGION( 0x1000000, "qsound", 0 ) - ROM_LOAD( "sfz3mix.q1", 0x000000, 0x1000000, CRC(180cbe91) SHA1(182b56517606f8a9bde0f643fcc3b164f18136f7) ) + ROM_LOAD( "sfz3mix23.q1", 0x000000, 0x1000000, CRC(180cbe91) SHA1(182b56517606f8a9bde0f643fcc3b164f18136f7) ) ROM_REGION( 0x20, "key", 0 ) ROM_LOAD( "phoenix.key", 0x00, 0x14, CRC(2cf772b0) SHA1(eff33c65a4f3862c231f9e4d6fefa7b34398dbf2) ) @@ -391,13 +391,13 @@ ROM_START( sfz3mix24 ) // 0.24 ROM_REGION( 0x4000000, "gfx", 0 ) ROM_LOAD( "sfz3mix24.c1", 0x0000000, 0x2000000, CRC(ef7f2d3f) SHA1(0ac73c75c75210f36ed1dba11f0be1e513f88378) ) - ROM_LOAD( "sfz3mix.c2", 0x2000000, 0x2000000, CRC(cbc02909) SHA1(a3bcf2f7a2d4139024790d55e4ab5a156b36e6e3) ) + ROM_LOAD( "sfz3mix23.c2", 0x2000000, 0x2000000, CRC(cbc02909) SHA1(a3bcf2f7a2d4139024790d55e4ab5a156b36e6e3) ) ROM_REGION( 0x80000, "audiocpu", 0 ) - ROM_LOAD( "sfz3mix.m1", 0x000000, 0x080000, CRC(c6322d7b) SHA1(0530f0d7c248180478ff588397263d961b8c5c8b) ) + ROM_LOAD( "sfz3mix23.m1", 0x000000, 0x080000, CRC(c6322d7b) SHA1(0530f0d7c248180478ff588397263d961b8c5c8b) ) ROM_REGION( 0x1000000, "qsound", 0 ) - ROM_LOAD( "sfz3mix.q1", 0x000000, 0x1000000, CRC(180cbe91) SHA1(182b56517606f8a9bde0f643fcc3b164f18136f7) ) + ROM_LOAD( "sfz3mix23.q1", 0x000000, 0x1000000, CRC(180cbe91) SHA1(182b56517606f8a9bde0f643fcc3b164f18136f7) ) ROM_REGION( 0x20, "key", 0 ) ROM_LOAD( "phoenix.key", 0x00, 0x14, CRC(2cf772b0) SHA1(eff33c65a4f3862c231f9e4d6fefa7b34398dbf2) ) @@ -410,13 +410,13 @@ ROM_START( sfz3mix25 ) // 0.25 ROM_REGION( 0x4000000, "gfx", 0 ) ROM_LOAD( "sfz3mix24.c1", 0x0000000, 0x2000000, CRC(ef7f2d3f) SHA1(0ac73c75c75210f36ed1dba11f0be1e513f88378) ) - ROM_LOAD( "sfz3mix.c2", 0x2000000, 0x2000000, CRC(cbc02909) SHA1(a3bcf2f7a2d4139024790d55e4ab5a156b36e6e3) ) + ROM_LOAD( "sfz3mix23.c2", 0x2000000, 0x2000000, CRC(cbc02909) SHA1(a3bcf2f7a2d4139024790d55e4ab5a156b36e6e3) ) ROM_REGION( 0x80000, "audiocpu", 0 ) - ROM_LOAD( "sfz3mix.m1", 0x000000, 0x080000, CRC(c6322d7b) SHA1(0530f0d7c248180478ff588397263d961b8c5c8b) ) + ROM_LOAD( "sfz3mix23.m1", 0x000000, 0x080000, CRC(c6322d7b) SHA1(0530f0d7c248180478ff588397263d961b8c5c8b) ) ROM_REGION( 0x1000000, "qsound", 0 ) - ROM_LOAD( "sfz3mix.q1", 0x000000, 0x1000000, CRC(180cbe91) SHA1(182b56517606f8a9bde0f643fcc3b164f18136f7) ) + ROM_LOAD( "sfz3mix23.q1", 0x000000, 0x1000000, CRC(180cbe91) SHA1(182b56517606f8a9bde0f643fcc3b164f18136f7) ) ROM_REGION( 0x20, "key", 0 ) ROM_LOAD( "phoenix.key", 0x00, 0x14, CRC(2cf772b0) SHA1(eff33c65a4f3862c231f9e4d6fefa7b34398dbf2) ) @@ -429,13 +429,13 @@ ROM_START( sfz3mix26 ) // 0.26 ROM_REGION( 0x4000000, "gfx", 0 ) ROM_LOAD( "sfz3mix26.c1", 0x0000000, 0x2000000, CRC(94a13726) SHA1(9c940dfe4e6caf7d24d6740444abc7e44355c5fe) ) - ROM_LOAD( "sfz3mix.c2", 0x2000000, 0x2000000, CRC(cbc02909) SHA1(a3bcf2f7a2d4139024790d55e4ab5a156b36e6e3) ) + ROM_LOAD( "sfz3mix23.c2", 0x2000000, 0x2000000, CRC(cbc02909) SHA1(a3bcf2f7a2d4139024790d55e4ab5a156b36e6e3) ) ROM_REGION( 0x80000, "audiocpu", 0 ) - ROM_LOAD( "sfz3mix.m1", 0x000000, 0x080000, CRC(c6322d7b) SHA1(0530f0d7c248180478ff588397263d961b8c5c8b) ) + ROM_LOAD( "sfz3mix23.m1", 0x000000, 0x080000, CRC(c6322d7b) SHA1(0530f0d7c248180478ff588397263d961b8c5c8b) ) ROM_REGION( 0x1000000, "qsound", 0 ) - ROM_LOAD( "sfz3mix.q1", 0x000000, 0x1000000, CRC(180cbe91) SHA1(182b56517606f8a9bde0f643fcc3b164f18136f7) ) + ROM_LOAD( "sfz3mix23.q1", 0x000000, 0x1000000, CRC(180cbe91) SHA1(182b56517606f8a9bde0f643fcc3b164f18136f7) ) ROM_REGION( 0x20, "key", 0 ) ROM_LOAD( "phoenix.key", 0x00, 0x14, CRC(2cf772b0) SHA1(eff33c65a4f3862c231f9e4d6fefa7b34398dbf2) ) @@ -448,37 +448,55 @@ ROM_START( sfz3mix27 ) // 0.27 ROM_REGION( 0x4000000, "gfx", 0 ) ROM_LOAD( "sfz3mix26.c1", 0x0000000, 0x2000000, CRC(94a13726) SHA1(9c940dfe4e6caf7d24d6740444abc7e44355c5fe) ) - ROM_LOAD( "sfz3mix.c2", 0x2000000, 0x2000000, CRC(cbc02909) SHA1(a3bcf2f7a2d4139024790d55e4ab5a156b36e6e3) ) + ROM_LOAD( "sfz3mix23.c2", 0x2000000, 0x2000000, CRC(cbc02909) SHA1(a3bcf2f7a2d4139024790d55e4ab5a156b36e6e3) ) ROM_REGION( 0x80000, "audiocpu", 0 ) - ROM_LOAD( "sfz3mix.m1", 0x000000, 0x080000, CRC(c6322d7b) SHA1(0530f0d7c248180478ff588397263d961b8c5c8b) ) + ROM_LOAD( "sfz3mix23.m1", 0x000000, 0x080000, CRC(c6322d7b) SHA1(0530f0d7c248180478ff588397263d961b8c5c8b) ) ROM_REGION( 0x1000000, "qsound", 0 ) - ROM_LOAD( "sfz3mix.q1", 0x000000, 0x1000000, CRC(180cbe91) SHA1(182b56517606f8a9bde0f643fcc3b164f18136f7) ) + ROM_LOAD( "sfz3mix23.q1", 0x000000, 0x1000000, CRC(180cbe91) SHA1(182b56517606f8a9bde0f643fcc3b164f18136f7) ) ROM_REGION( 0x20, "key", 0 ) ROM_LOAD( "phoenix.key", 0x00, 0x14, CRC(2cf772b0) SHA1(eff33c65a4f3862c231f9e4d6fefa7b34398dbf2) ) ROM_END -ROM_START( sfz3mix ) // 0.28 +ROM_START( sfz3mix28 ) // 0.28 ROM_REGION( 0x400000, "maincpu", 0 ) - ROM_LOAD( "sfz3mix.p1", 0x000000, 0x400000, CRC(3a39b20a) SHA1(86de016f23abbbc8220d53fe19e8955138194aa4) ) // 03 + ROM_LOAD( "sfz3mix28.p1", 0x000000, 0x400000, CRC(3a39b20a) SHA1(86de016f23abbbc8220d53fe19e8955138194aa4) ) // 03 ROM_IGNORE(0x200000) // empty ROM_REGION( 0x4000000, "gfx", 0 ) - ROM_LOAD( "sfz3mix.c1", 0x0000000, 0x2000000, CRC(bebc6a92) SHA1(46484d02228bd8566f9c48c067125c364bfdb8d1) ) // 13m - ROM_LOAD( "sfz3mix.c2", 0x2000000, 0x2000000, CRC(cbc02909) SHA1(a3bcf2f7a2d4139024790d55e4ab5a156b36e6e3) ) // 21m + ROM_LOAD( "sfz3mix28.c1", 0x0000000, 0x2000000, CRC(bebc6a92) SHA1(46484d02228bd8566f9c48c067125c364bfdb8d1) ) // 13m + ROM_LOAD( "sfz3mix23.c2", 0x2000000, 0x2000000, CRC(cbc02909) SHA1(a3bcf2f7a2d4139024790d55e4ab5a156b36e6e3) ) // 21m ROM_REGION( 0x80000, "audiocpu", 0 ) - ROM_LOAD( "sfz3mix.m1", 0x000000, 0x080000, CRC(c6322d7b) SHA1(0530f0d7c248180478ff588397263d961b8c5c8b) ) // 01 + ROM_LOAD( "sfz3mix23.m1", 0x000000, 0x080000, CRC(c6322d7b) SHA1(0530f0d7c248180478ff588397263d961b8c5c8b) ) // 01 ROM_REGION( 0x1000000, "qsound", 0 ) - ROM_LOAD( "sfz3mix.q1", 0x000000, 0x1000000, CRC(180cbe91) SHA1(182b56517606f8a9bde0f643fcc3b164f18136f7) ) // 11m + ROM_LOAD( "sfz3mix23.q1", 0x000000, 0x1000000, CRC(180cbe91) SHA1(182b56517606f8a9bde0f643fcc3b164f18136f7) ) // 11m ROM_REGION( 0x20, "key", 0 ) ROM_LOAD( "phoenix.key", 0x00, 0x14, CRC(2cf772b0) SHA1(eff33c65a4f3862c231f9e4d6fefa7b34398dbf2) ) ROM_END +ROM_START( sfz3mix ) // 0.29 + ROM_REGION( 0x400000, "maincpu", 0 ) + ROM_LOAD( "sfz3mix.p1", 0x000000, 0x400000, CRC(ac780a3b) SHA1(8a387233720098bc572da56753cdb9df742c3d20) ) // 03 + ROM_IGNORE(0x200000) // empty + + ROM_REGION( 0x4000000, "gfx", 0 ) + ROM_LOAD( "sfz3mix.c1", 0x0000000, 0x2000000, CRC(af3980f7) SHA1(3cb13fc3eb1845e2606e05e0d765326b1dcb8cd4) ) // 13m + ROM_LOAD( "sfz3mix.c2", 0x2000000, 0x2000000, CRC(1d9ae703) SHA1(38f2b7c958c7330b382a7ab9e77c8ac6b1aed4d2) ) // 21m + + ROM_REGION( 0x80000, "audiocpu", 0 ) + ROM_LOAD( "sfz3mix.m1", 0x000000, 0x080000, CRC(727fd776) SHA1(25e6248c1202bed684f50caa149dd22aff2376b5) ) // 01 + + ROM_REGION( 0x1000000, "qsound", 0 ) + ROM_LOAD( "sfz3mix.q1", 0x000000, 0x1000000, CRC(5d4fe046) SHA1(5e5c55f4d12cd91eb1191bf214babd05ce4fcb3f) ) // 11m + + ROM_REGION( 0x20, "key", 0 ) + ROM_LOAD( "phoenix.key", 0x00, 0x14, CRC(2cf772b0) SHA1(eff33c65a4f3862c231f9e4d6fefa7b34398dbf2) ) +ROM_END GAME( 2023, sfz3mix20, sfa3, cps2turbo, cps2_2p6b, cps2_state, init_sfz3mix, ROT0, "Zero800", "Street Fighter Zero 3 (Turbo Mix 0.20)", MACHINE_SUPPORTS_SAVE ) GAME( 2023, sfz3mix21, sfa3, cps2turbo, cps2_2p6b, cps2_state, init_sfz3mix, ROT0, "Zero800", "Street Fighter Zero 3 (Turbo Mix 0.21)", MACHINE_SUPPORTS_SAVE ) @@ -488,5 +506,6 @@ GAME( 2024, sfz3mix24, sfa3, cps2turbo, cps2_2p6b, cps2_state, init_sfz3mix, RO GAME( 2024, sfz3mix25, sfa3, cps2turbo, cps2_2p6b, cps2_state, init_sfz3mix, ROT0, "Zero800", "Street Fighter Zero 3 (Turbo Mix 0.25)", MACHINE_SUPPORTS_SAVE ) GAME( 2024, sfz3mix26, sfa3, cps2turbo, cps2_2p6b, cps2_state, init_sfz3mix, ROT0, "Zero800", "Street Fighter Zero 3 (Turbo Mix 0.26)", MACHINE_SUPPORTS_SAVE ) GAME( 2024, sfz3mix27, sfa3, cps2turbo, cps2_2p6b, cps2_state, init_sfz3mix, ROT0, "Zero800", "Street Fighter Zero 3 (Turbo Mix 0.27)", MACHINE_SUPPORTS_SAVE ) -GAME( 2024, sfz3mix, sfa3, cps2turbo, cps2_2p6b, cps2_state, init_sfz3mix, ROT0, "Zero800", "Street Fighter Zero 3 (Turbo Mix 0.28)", MACHINE_SUPPORTS_SAVE ) +GAME( 2024, sfz3mix28, sfa3, cps2turbo, cps2_2p6b, cps2_state, init_sfz3mix, ROT0, "Zero800", "Street Fighter Zero 3 (Turbo Mix 0.28)", MACHINE_SUPPORTS_SAVE ) +GAME( 2024, sfz3mix, sfa3, cps2turbo, cps2_2p6b, cps2_state, init_sfz3mix, ROT0, "Zero800", "Street Fighter Zero 3 (Turbo Mix 0.29)", MACHINE_SUPPORTS_SAVE ) diff --git a/src/hbmame/drivers/neogeohb.cpp b/src/hbmame/drivers/neogeohb.cpp index 92775c9df20..6573016c5d0 100644 --- a/src/hbmame/drivers/neogeohb.cpp +++ b/src/hbmame/drivers/neogeohb.cpp @@ -125,7 +125,7 @@ NUM GAME YEAR COMPANY TITLE 304*0304 2013 NG:DEV.Team NEO XYX 305*0305 2014 NG:DEV.Team Razion 306*0306 2015 NG:DEV.Team Kraut Buster (could be year2016) -307* 2023 Cote Gamers/LudoScience Yo-Yo Shuriken (released 2023-04-11, not free) https://drludos.itch.io/yo-yo-shuriken-neo-geo +307 DAD1 2023 LudoScience Yo-Yo Shuriken (released 2023-04-11) 316 0048 2011 Le Cortex Treasure of the Caribbean (remake) 323 1234 2022 OzzyOuzo The Eye of Typhoon (remake) 331 0008 2001 Brezzasoft Jockey Grand Prix @@ -676,6 +676,26 @@ ROM_START( lhbb ) // Last Hope with Blue Bullets (hack) ROM_END +// 307 : Yo-Yo Shuriken +ROM_START( yoyoshkn ) + ROM_REGION( 0x100000, "maincpu", 0 ) + ROM_LOAD16_WORD_SWAP( "307.p1", 0x000000, 0x100000, CRC(8a36bd7d) SHA1(5a1af3f1de96cadd9680996d3b59471dfe6768e6) ) + + NEO_SFIX_128K( "307.s1", CRC(59ce2b22) SHA1(1b5633bd9e707f035c8a3c9811c47e1ea3c74481) ) + + NEO_BIOS_AUDIO_128K( "307.m1", CRC(079ac27e) SHA1(d5c8429a80845be46de0833d3fa64f1864d2fe15) ) + + ROM_REGION( 0x600000, "ymsnd:adpcma", 0 ) + ROM_LOAD( "307.v1", 0x000000, 0x200000, CRC(79e1b73f) SHA1(a905b24f973874199803d95beff786a81cb581ba) ) + ROM_LOAD( "307.v2", 0x200000, 0x200000, CRC(4c464d41) SHA1(15ae20f3e26e7458ccfc3ad11ea99af754bf696d) ) + ROM_LOAD( "307.v3", 0x400000, 0x200000, CRC(0fbe1f09) SHA1(952045f146aad3e593cc568fbebf1c4f4cdaddf3) ) + + ROM_REGION( 0x400000, "sprites", 0 ) + ROM_LOAD16_BYTE( "307.c1", 0x000000, 0x200000, CRC(fde9b178) SHA1(21060a2695e3f1cd046322ebaacde9dbb3fb5436) ) + ROM_LOAD16_BYTE( "307.c2", 0x000001, 0x200000, CRC(780c2045) SHA1(5551c7f3010da658ac31c3478820a59eab71f5f4) ) +ROM_END + + // 316 : Treasure of the Caribbean ROM_START( totc ) ROM_REGION( 0x100000, "maincpu", 0 ) @@ -3327,12 +3347,13 @@ GAME( 1995, csw2, crswd2bl, no_watchdog, neogeo, neogeo_state, init GAME( 1995, fr2, neogeo, neogeo_noslot, neogeo, neogeo_state, init_neogeo, ROT0, "Video Systems Co.", "Idol Mahjong Final Romance 2", MACHINE_SUPPORTS_SAVE ) GAME( 1995, fr2cd, fr2, neogeo_noslot, neogeo, neogeo_state, init_fr2ch, ROT0, "Video Systems Co.", "Idol Mahjong Final Romance 2 (CD Bootleg)", MACHINE_SUPPORTS_SAVE ) GAME( 1995, fr2ch, fr2, neogeo_noslot, neogeo, neogeo_state, init_fr2ch, ROT0, "Video Systems Co.", "Idol Mahjong Final Romance 2 (CD conversion)", MACHINE_SUPPORTS_SAVE ) +GAME( 2011, totc, neogeo, neogeo_noslot, neogeo, neogeo_state, init_neogeo, ROT0, "FACE Corporation / N.C.I - Le Cortex", "Treasure of the Caribbean", MACHINE_SUPPORTS_SAVE ) +GAME( 2023, yoyoshkn, neogeo, neogeo_noslot, neogeo, neogeo_state, init_neogeo, ROT0, "Dr Ludos", "Yo-Yo Shuriken", MACHINE_SUPPORTS_SAVE ) GAME( 2009, zintrckbh, zintrckb, neogeo_noslot, neogeo, neogeo_state, init_neogeo, ROT0, "Yumeji", "ZinTricK (Enable hidden characters)", MACHINE_SUPPORTS_SAVE ) GAME( 1996, zintrkcd, zintrckb, neogeo_noslot, neogeo, neogeo_state, init_neogeo, ROT0, "Razoola", "ZinTricK (CD conversion)", MACHINE_SUPPORTS_SAVE ) GAME( 2010, zintrkm, zintrckb, neogeo_noslot, neogeo, neogeo_state, init_neogeo, ROT0, "Elrayseur", "ZinTricK (Music test)", MACHINE_SUPPORTS_SAVE ) GAME( 2014, zintrkcd1, zintrckb, neogeo_noslot, neogeo, neogeo_state, init_neogeo, ROT0, "Razoola", "ZinTricK (CD test)", MACHINE_SUPPORTS_SAVE ) GAME( 2009, zintricks01, zintrckb, neogeo_noslot, neogeo, neogeo_state, init_neogeo, ROT0, "hack", "ZinTricK (Unknown Hack)", MACHINE_SUPPORTS_SAVE ) -GAME( 2011, totc, neogeo, neogeo_noslot, neogeo, neogeo_state, init_neogeo, ROT0, "FACE Corporation / N.C.I - Le Cortex", "Treasure of the Caribbean", MACHINE_SUPPORTS_SAVE ) GAME( 2022, 240ptest, neogeo, neogeo_noslot, neogeo, neogeo_state, init_neogeo, ROT0, "Dasutin/Artemio", "240p Test Suite v0.95", MACHINE_SUPPORTS_SAVE ) GAME( 2023, 240ptest1, neogeo, neogeo_noslot, neogeo, neogeo_state, init_neogeo, ROT0, "Dasutin/Artemio", "240p Test Suite v1.0", MACHINE_SUPPORTS_SAVE ) diff --git a/src/hbmame/hbmame.lst b/src/hbmame/hbmame.lst index 36e8096e819..69d2a6b13b3 100644 --- a/src/hbmame/hbmame.lst +++ b/src/hbmame/hbmame.lst @@ -1593,6 +1593,7 @@ sfz3mix24 sfz3mix25 sfz3mix26 sfz3mix27 +sfz3mix28 sfz3mix @source:cps3.cpp @@ -6208,6 +6209,7 @@ twister // Blastar 2015 xeno xeviousn xmas2017 +yoyoshkn zintrckbh zintrkcd zintrkcd1