From d6261d705a64731fecf6da9c9ebf9d69df2defb8 Mon Sep 17 00:00:00 2001
From: Scott Stone <tafoid@gmail.com>
Date: Thu, 29 Dec 2016 18:26:38 -0500
Subject: [PATCH] New clones added ---------------- Robo Army (NGM-032 ~
 NGH-032)  [JacKc] Saulabi Spirits / Jin Saulabi Tu Hon (Korean release of
 Samurai Shodown II, set 2)  [JacKc]

---
 hash/neogeo.xml              | 69 ++++++++++++++++++++++++++++++++++++
 src/mame/drivers/neodriv.hxx | 54 ++++++++++++++++++++++++++--
 src/mame/mame.lst            |  2 ++
 3 files changed, 123 insertions(+), 2 deletions(-)

diff --git a/hash/neogeo.xml b/hash/neogeo.xml
index c120e19a027..bf5ed43e34f 100644
--- a/hash/neogeo.xml
+++ b/hash/neogeo.xml
@@ -1760,6 +1760,37 @@
 		</part>
 	</software>
 
+	<software name="roboarmya">
+		<description>Robo Army</description>
+		<year>1991</year>
+		<publisher>SNK</publisher>
+		<info name="serial" value="NGM-032 (MVS), NGH-032 (AES)"/>
+		<info name="release" value="19911030 (MVS), 19911220 (AES)"/>
+		<info name="alt_title" value="ロボアーミー"/>
+		<sharedfeat name="release" value="MVS,AES" />
+		<sharedfeat name="compatibility" value="MVS,AES" />
+		<part name="cart" interface="neo_cart">
+			<dataarea name="maincpu" width="16" endianness="big" size="0x100000">
+				<rom loadflag="load16_word_swap" name="032-epr.p1" offset="0x000000" size="0x080000" crc="27c773cb" sha1="597ca73f142b1129cc7780540bb9cfacd47bc6ce" />   <!-- D27C4000 -->
+			</dataarea>
+			<dataarea name="fixed" size="0x040000">
+				<rom offset="0x000000" size="0x020000" name="032-s1.s1" crc="ac0daa1b" sha1="93bae4697dc403fce19422752a514326ccf66a91" />   <!-- TC531000 -->
+			</dataarea>
+			<dataarea name="audiocpu" size="0x020000">
+				<rom offset="0x000000" size="0x020000" name="032-m1.m1" crc="35ec952d" sha1="8aed30e26d7e2c70dbce5de752df416091066f7b" />   <!-- TC531001 -->
+			</dataarea>
+			<dataarea name="ymsnd" size="0x200000">
+				<rom name="032-v1.v1" offset="0x000000" size="0x100000" crc="63791533" sha1="4479e9308cdc906b9e03b985303f4ebedd00512f" />   <!-- TC538200 -->
+				<rom name="032-v2.v2" offset="0x100000" size="0x100000" crc="eb95de70" sha1="b34885201116d2b3bbdee15ec7b5961cf5c069e1" />   <!-- TC538200 -->
+			</dataarea>
+			<dataarea name="sprites" size="0x300000">
+				<rom loadflag="load16_byte" name="032-c1.c1" offset="0x000000" size="0x100000" crc="97984c6c" sha1="deea59c0892f05dc7db98cb57b3eb83688dc57f0" />    <!-- TC538200 -->
+				<rom loadflag="load16_byte" name="032-c2.c2" offset="0x000001" size="0x100000" crc="65773122" sha1="2c0162a8e971e5e57933e4ae16040bf824ffdefe" />    <!-- TC538200 -->
+				<rom loadflag="load16_byte" name="032-c3.c3" offset="0x200000" size="0x080000" crc="40adfccd" sha1="b11f866dd70ba0ed9123424508355cb948b19bdc" />    <!-- TC534200 -->
+				<rom loadflag="load16_byte" name="032-c4.c4" offset="0x200001" size="0x080000" crc="462571de" sha1="5c3d610d492f91564423873b3b434dcda700373f" />    <!-- TC534200 -->
+			</dataarea>
+		</part>
+	</software>
 
 	<!--
 	ID-0033
@@ -3396,6 +3427,44 @@
 		</part>
 	</software>
 
+	<software name="samsho2ka" cloneof="samsho2">
+		<description>Saulabi Spirits / Jin Saulabi Tu Hon (Korean release of Samurai Shodown II)</description>
+		<year>1994</year>
+		<publisher>SNK</publisher>
+		<sharedfeat name="release" value="MVS" /> <!-- Unknown if it was also released on AES -->
+		<sharedfeat name="compatibility" value="MVS,AES" />
+		<part name="cart" interface="neo_cart">
+			<!-- This has corrupt text if used with the Japan bios due to the replacement of the s1 rom to contain the new logo -->
+			<dataarea name="maincpu" width="16" endianness="big" size="0x200000">
+				<rom loadflag="load16_word_swap" name="063-p1-kan.p1" offset="0x100000" size="0x100000" crc="147cc6d7" sha1="8e22305f41a0688786ff55437c25948e6c8fda58" />
+				<rom size="0x100000" offset="0x000000" loadflag="continue" />
+	<!-- Basically samsho2k without loading ep1 and ep2 over p1-kan ; The game has been confirmed to exist in this state -->
+
+			<dataarea name="fixed" size="0x040000">
+				<rom offset="0x000000" size="0x020000" name="063-s1-kan.s1" crc="ff08f80b" sha1="240c6a1c52edebb49cc99ea08484c6a2d61ebf84" />
+			</dataarea>
+			<dataarea name="audiocpu" size="0x020000">
+				<rom offset="0x000000" size="0x020000" name="063-m1.m1" crc="56675098" sha1="90429fc40d056d480d0e2bbefbc691d9fa260fc4" />   <!-- TC531001 -->
+			</dataarea>
+			<dataarea name="ymsnd" size="0x700000">
+				<rom name="063-v1.v1" offset="0x000000" size="0x200000" crc="37703f91" sha1="a373ebef4c33ba1d8340e826981a58769aada238" />   <!-- TC5316200 -->
+				<rom name="063-v2.v2" offset="0x200000" size="0x200000" crc="0142bde8" sha1="0be6c53acac44802bf70b6925452f70289a139d9" />   <!-- TC5316200 -->
+				<rom name="063-v3.v3" offset="0x400000" size="0x200000" crc="d07fa5ca" sha1="1da7f081f8b8fc86a91feacf900f573218d82676" />   <!-- TC5316200 -->
+				<rom name="063-v4.v4" offset="0x600000" size="0x100000" crc="24aab4bb" sha1="10ee4c5b3579865b93dcc1e4079963276aa700a6" />   <!-- TC538200 -->
+			</dataarea>
+			<dataarea name="sprites" size="0x1000000">
+				<rom loadflag="load16_byte" name="063-c1.c1" offset="0x000000" size="0x200000" crc="86cd307c" sha1="0d04336f7c436d74638d8c1cd8651faf436a6bec" />    <!-- TC5316200 -->
+				<rom loadflag="load16_byte" name="063-c2.c2" offset="0x000001" size="0x200000" crc="cdfcc4ca" sha1="179dc81432424d68cefedd20cc1c4b2a95deb891" />    <!-- TC5316200 -->
+				<rom loadflag="load16_byte" name="063-c3.c3" offset="0x400000" size="0x200000" crc="7a63ccc7" sha1="49d97c543bc2860d493a353ab0d059088c6fbd21" />    <!-- TC5316200 -->
+				<rom loadflag="load16_byte" name="063-c4.c4" offset="0x400001" size="0x200000" crc="751025ce" sha1="e1bbaa7cd67fd04e4aab7f7ea77f63ae1cbc90d0" />    <!-- TC5316200 -->
+				<rom loadflag="load16_byte" name="063-c5.c5" offset="0x800000" size="0x200000" crc="20d3a475" sha1="28da44a136bd14c73c62c147c3f6e6bcfa1066de" />    <!-- TC5316200 -->
+				<rom loadflag="load16_byte" name="063-c6.c6" offset="0x800001" size="0x200000" crc="ae4c0a88" sha1="cc8a7d11daa3821f83a6fd0942534706f939e576" />    <!-- TC5316200 -->
+				<rom loadflag="load16_byte" name="063-c7.c7" offset="0xc00000" size="0x200000" crc="2df3cbcf" sha1="e54f9022359963711451c2025825b862d36c6975" />    <!-- TC5316200 -->
+				<rom loadflag="load16_byte" name="063-c8.c8" offset="0xc00001" size="0x200000" crc="1ffc6dfa" sha1="acea18aca76c072e0bac2a364fc96d49cfc86e77" />    <!-- TC5316200 -->
+			</dataarea>
+		</part>
+	</software>
+
 
 	<!--
 	ID-0064
diff --git a/src/mame/drivers/neodriv.hxx b/src/mame/drivers/neodriv.hxx
index 24360853f0f..e635e7e8640 100644
--- a/src/mame/drivers/neodriv.hxx
+++ b/src/mame/drivers/neodriv.hxx
@@ -1657,7 +1657,27 @@ ROM_END
 ROM_START( roboarmy )
 	ROM_REGION( 0x100000, "cslot1:maincpu", ROMREGION_BE|ROMREGION_16BIT )
 	ROM_LOAD16_WORD_SWAP( "032-p1.p1", 0x000000, 0x080000, CRC(cd11cbd4) SHA1(23163e3da2f07e830a7f4a02aea1cb01a54ccbf3) ) /* TC534200 */
-	/* also found AES and MVS set with p1 on eprom on NEO-AEG PROG42G-1 and NEO-MVS PROG42G-COM; correct chip label unknown */
+
+	NEO_SFIX_128K( "032-s1.s1", CRC(ac0daa1b) SHA1(93bae4697dc403fce19422752a514326ccf66a91) ) /* TC531000 */
+ 
+	NEO_BIOS_AUDIO_128K( "032-m1.m1", CRC(35ec952d) SHA1(8aed30e26d7e2c70dbce5de752df416091066f7b) ) /* TC531001 */
+
+	ROM_REGION( 0x200000, "cslot1:ymsnd", 0 )
+	ROM_LOAD( "032-v1.v1", 0x000000, 0x100000, CRC(63791533) SHA1(4479e9308cdc906b9e03b985303f4ebedd00512f) ) /* TC538200 */
+	ROM_LOAD( "032-v2.v2", 0x100000, 0x100000, CRC(eb95de70) SHA1(b34885201116d2b3bbdee15ec7b5961cf5c069e1) ) /* TC538200 */
+
+	ROM_REGION( 0x300000, "cslot1:sprites", 0 )
+	ROM_LOAD16_BYTE( "032-c1.c1", 0x000000, 0x100000, CRC(97984c6c) SHA1(deea59c0892f05dc7db98cb57b3eb83688dc57f0) ) /* Plane 0,1 */ /* TC538200 */
+	ROM_LOAD16_BYTE( "032-c2.c2", 0x000001, 0x100000, CRC(65773122) SHA1(2c0162a8e971e5e57933e4ae16040bf824ffdefe) ) /* Plane 2,3 */ /* TC538200 */
+	ROM_LOAD16_BYTE( "032-c3.c3", 0x200000, 0x080000, CRC(40adfccd) SHA1(b11f866dd70ba0ed9123424508355cb948b19bdc) ) /* Plane 0,1 */ /* TC534200 */
+	ROM_LOAD16_BYTE( "032-c4.c4", 0x200001, 0x080000, CRC(462571de) SHA1(5c3d610d492f91564423873b3b434dcda700373f) ) /* Plane 2,3 */ /* TC534200 */
+ROM_END
+
+ROM_START( roboarma ) /* MVS AND AES VERSION*/
+	ROM_REGION( 0x100000, "cslot1:maincpu", ROMREGION_BE|ROMREGION_16BIT )
+	ROM_LOAD16_WORD_SWAP( "032-epr.p1", 0x000000, 0x080000, CRC(27c773cb) SHA1(597ca73f142b1129cc7780540bb9cfacd47bc6ce) ) /* D27C4000 */
+	/* Found on legitimate Robo Army MVS and AES Carts. Debug code button which check control a sound test has been patched out because in a multislot situation that code could have been enabled 
+	that would stop roboarmy from working, sending it into an infinite loop ; correct chip label unknown */
 
 	NEO_SFIX_128K( "032-s1.s1", CRC(ac0daa1b) SHA1(93bae4697dc403fce19422752a514326ccf66a91) ) /* TC531000 */
 
@@ -2802,6 +2822,34 @@ ROM_START( samsho2k ) /* KOREAN VERSION */
 	ROM_LOAD16_BYTE( "063-c8.c8", 0xc00001, 0x200000, CRC(1ffc6dfa) SHA1(acea18aca76c072e0bac2a364fc96d49cfc86e77) ) /* Plane 2,3 */ /* TC5316200 */
 ROM_END
 
+ROM_START( samsho2ka ) /* KOREAN VERSION */
+	// This has corrupt text if used with the Japan bios due to the replacement of the s1 rom to contain the new logo
+	ROM_REGION( 0x200000, "cslot1:maincpu", ROMREGION_BE|ROMREGION_16BIT )
+	ROM_LOAD16_WORD_SWAP( "063-p1-kan.p1", 0x100000, 0x100000, CRC(147cc6d7) SHA1(8e22305f41a0688786ff55437c25948e6c8fda58) )
+	ROM_CONTINUE( 0x000000, 0x100000 )
+	// Basically samsho2k without loading ep1 and ep2 over p1-kan ; The game has been confirmed to exist in this state
+	
+	NEO_SFIX_128K( "063-s1-kan.s1", CRC(ff08f80b) SHA1(240c6a1c52edebb49cc99ea08484c6a2d61ebf84) )
+
+	NEO_BIOS_AUDIO_128K( "063-m1.m1", CRC(56675098) SHA1(90429fc40d056d480d0e2bbefbc691d9fa260fc4) ) /* TC531001 */
+
+	ROM_REGION( 0x700000, "cslot1:ymsnd", 0 )
+	ROM_LOAD( "063-v1.v1", 0x000000, 0x200000, CRC(37703f91) SHA1(a373ebef4c33ba1d8340e826981a58769aada238) ) /* TC5316200 */
+	ROM_LOAD( "063-v2.v2", 0x200000, 0x200000, CRC(0142bde8) SHA1(0be6c53acac44802bf70b6925452f70289a139d9) ) /* TC5316200 */
+	ROM_LOAD( "063-v3.v3", 0x400000, 0x200000, CRC(d07fa5ca) SHA1(1da7f081f8b8fc86a91feacf900f573218d82676) ) /* TC5316200 */
+	ROM_LOAD( "063-v4.v4", 0x600000, 0x100000, CRC(24aab4bb) SHA1(10ee4c5b3579865b93dcc1e4079963276aa700a6) ) /* TC538200 */
+
+	ROM_REGION( 0x1000000, "cslot1:sprites", 0 )
+	ROM_LOAD16_BYTE( "063-c1.c1", 0x000000, 0x200000, CRC(86cd307c) SHA1(0d04336f7c436d74638d8c1cd8651faf436a6bec) ) /* Plane 0,1 */ /* TC5316200 */
+	ROM_LOAD16_BYTE( "063-c2.c2", 0x000001, 0x200000, CRC(cdfcc4ca) SHA1(179dc81432424d68cefedd20cc1c4b2a95deb891) ) /* Plane 2,3 */ /* TC5316200 */
+	ROM_LOAD16_BYTE( "063-c3.c3", 0x400000, 0x200000, CRC(7a63ccc7) SHA1(49d97c543bc2860d493a353ab0d059088c6fbd21) ) /* Plane 0,1 */ /* TC5316200 */
+	ROM_LOAD16_BYTE( "063-c4.c4", 0x400001, 0x200000, CRC(751025ce) SHA1(e1bbaa7cd67fd04e4aab7f7ea77f63ae1cbc90d0) ) /* Plane 2,3 */ /* TC5316200 */
+	ROM_LOAD16_BYTE( "063-c5.c5", 0x800000, 0x200000, CRC(20d3a475) SHA1(28da44a136bd14c73c62c147c3f6e6bcfa1066de) ) /* Plane 0,1 */ /* TC5316200 */
+	ROM_LOAD16_BYTE( "063-c6.c6", 0x800001, 0x200000, CRC(ae4c0a88) SHA1(cc8a7d11daa3821f83a6fd0942534706f939e576) ) /* Plane 2,3 */ /* TC5316200 */
+	ROM_LOAD16_BYTE( "063-c7.c7", 0xc00000, 0x200000, CRC(2df3cbcf) SHA1(e54f9022359963711451c2025825b862d36c6975) ) /* Plane 0,1 */ /* TC5316200 */
+	ROM_LOAD16_BYTE( "063-c8.c8", 0xc00001, 0x200000, CRC(1ffc6dfa) SHA1(acea18aca76c072e0bac2a364fc96d49cfc86e77) ) /* Plane 2,3 */ /* TC5316200 */
+ROM_END
+
 /****************************************
  ID-0064
  . ADM-007
@@ -8719,6 +8767,7 @@ GAME( 1991, socbrawl,   neogeo,   neobase,   neogeo, neogeo_state,   neogeo,   R
 GAME( 1991, socbrawlh,  socbrawl, neobase,   neogeo, neogeo_state,   neogeo,   ROT0, "SNK", "Soccer Brawl (NGH-031)", MACHINE_SUPPORTS_SAVE )
 GAME( 1991, fatfury1,   neogeo,   neobase,   neogeo, neogeo_state,   neogeo,   ROT0, "SNK", "Fatal Fury - King of Fighters / Garou Densetsu - Shukumei no Tatakai (NGM-033 ~ NGH-033)", MACHINE_SUPPORTS_SAVE )
 GAME( 1991, roboarmy,   neogeo,   neobase,   neogeo, neogeo_state,   neogeo,   ROT0, "SNK", "Robo Army", MACHINE_SUPPORTS_SAVE )
+GAME( 1991, roboarma,   roboarmy, neobase,   neogeo, neogeo_state,   neogeo,   ROT0, "SNK", "Robo Army (NGM-032 ~ NGH-032)", MACHINE_SUPPORTS_SAVE )
 GAME( 1992, fbfrenzy,   neogeo,   neobase,   neogeo, neogeo_state,   neogeo,   ROT0, "SNK", "Football Frenzy (NGM-034 ~ NGH-034)", MACHINE_SUPPORTS_SAVE )
 GAME( 1992, kotm2,      neogeo,   neobase,   neogeo, neogeo_state,   neogeo,   ROT0, "SNK", "King of the Monsters 2 - The Next Thing (NGM-039 ~ NGH-039)", MACHINE_SUPPORTS_SAVE )
 GAME( 1992, kotm2a,     kotm2,    neobase,   neogeo, neogeo_state,   neogeo,   ROT0, "SNK", "King of the Monsters 2 - The Next Thing (older)", MACHINE_SUPPORTS_SAVE )
@@ -8742,7 +8791,8 @@ GAME( 1993, fatfurspa,  fatfursp, neobase,   neogeo, neogeo_state,   neogeo,   R
 GAME( 1995, savagere,   neogeo,   neobase,   neogeo, neogeo_state,   neogeo,   ROT0, "SNK", "Savage Reign / Fu'un Mokushiroku - Kakutou Sousei", MACHINE_SUPPORTS_SAVE )
 GAME( 1994, ssideki2,   neogeo,   neobase,   neogeo, neogeo_state,   neogeo,   ROT0, "SNK", "Super Sidekicks 2 - The World Championship / Tokuten Ou 2 - Real Fight Football (NGM-061 ~ NGH-061)", MACHINE_SUPPORTS_SAVE )
 GAME( 1994, samsho2,    neogeo,   neobase,   neogeo, neogeo_state,   neogeo,   ROT0, "SNK", "Samurai Shodown II / Shin Samurai Spirits - Haohmaru Jigokuhen (NGM-063 ~ NGH-063)", MACHINE_SUPPORTS_SAVE )
-GAME( 1994, samsho2k,   samsho2,  neobase,   neogeo, neogeo_state,   neogeo,   ROT0, "SNK", "Saulabi Spirits / Jin Saulabi Tu Hon (Korean release of Samurai Shodown II)", MACHINE_SUPPORTS_SAVE ) // official or hack?
+GAME( 1994, samsho2k,   samsho2,  neobase,   neogeo, neogeo_state,   neogeo,   ROT0, "SNK", "Saulabi Spirits / Jin Saulabi Tu Hon (Korean release of Samurai Shodown II, set 1)", MACHINE_SUPPORTS_SAVE ) 
+GAME( 1994, samsho2ka,  samsho2,  neobase,   neogeo, neogeo_state,   neogeo,   ROT0, "SNK", "Saulabi Spirits / Jin Saulabi Tu Hon (Korean release of Samurai Shodown II, set 2)", MACHINE_SUPPORTS_SAVE ) 
 GAME( 1995, fatfury3,   neogeo,   neobase,   neogeo, neogeo_state,   neogeo,   ROT0, "SNK", "Fatal Fury 3 - Road to the Final Victory / Garou Densetsu 3 - Haruka-naru Tatakai (NGM-069 ~ NGH-069)", MACHINE_SUPPORTS_SAVE )
 GAME( 1995, ssideki3,   neogeo,   neobase,   neogeo, neogeo_state,   neogeo,   ROT0, "SNK", "Super Sidekicks 3 - The Next Glory / Tokuten Ou 3 - Eikou e no Michi", MACHINE_SUPPORTS_SAVE )
 GAME( 1995, kof95,      neogeo,   neobase,   neogeo, neogeo_state,   neogeo,   ROT0, "SNK", "The King of Fighters '95 (NGM-084)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/mame.lst b/src/mame/mame.lst
index 13670f1e5f0..4b747ff76bc 100644
--- a/src/mame/mame.lst
+++ b/src/mame/mame.lst
@@ -28880,6 +28880,7 @@ rbffspeck                       // 0124 (c) 1996 SNK
 ridhero                         // 0006 (c) 1990 SNK
 ridheroh                        // 0006 (c) 1990 SNK
 roboarmy                        // 0032 (c) 1991 SNK
+roboarma                        // 0032 (c) 1991 SNK
 rotd                            // 0264 (c) 2002 Evoga
 rotdh                           // 0264 (c) 2002 Evoga
 s1945p                          // 0254 (c) 1999 Psikyo
@@ -28889,6 +28890,7 @@ samsh5spho                      // 0272 (c) 2004 Playmore
 samsho                          // 0045 (c) 1993 SNK
 samsho2                         // 0063 (c) 1994 SNK
 samsho2k                        // 0063 (c) 1994 SNK (Korean hack)
+samsho2ka                       // 0063 (c) 1994 SNK (Korean hack)
 samsho3                         // 0087 (c) 1995 SNK
 samsho3h                        // 0087 (c) 1995 SNK
 samsho4                         // 0222 (c) 1996 SNK