From 04792cd0bdc118bc8caf628157007b1eff60f3eb Mon Sep 17 00:00:00 2001
From: David Haywood <mamehaze@users.noreply.github.com>
Date: Tue, 27 Oct 2015 13:13:35 +0000
Subject: [PATCH] sync with smspower (nw)

---
 hash/sg1000.xml | 43 ++++++++++++++++++++++++++++----
 hash/sms.xml    | 65 ++++++++++++++++++++++++++++++++++++++++++++++---
 2 files changed, 100 insertions(+), 8 deletions(-)

diff --git a/hash/sg1000.xml b/hash/sg1000.xml
index ab40de24377..8f2aecaa907 100644
--- a/hash/sg1000.xml
+++ b/hash/sg1000.xml
@@ -1283,7 +1283,7 @@ A135 : 森林歷險記 / Sēnlín lìxiǎn jì -> Pitfall II (same as R-049 by A
 		</part>
 	</software>
 
-	<software name="herot" cloneof="hero">
+	<software name="herot" cloneof="hero"> <!-- Taiwanese logo version -->
 		<description>Qing Feng Xia (Tw)</description>
 		<year>1985?</year>
 		<publisher>&lt;unknown&gt;</publisher>
@@ -1296,7 +1296,18 @@ A135 : 森林歷險記 / Sēnlín lìxiǎn jì -> Pitfall II (same as R-049 by A
 		</part>
 	</software>
 
-	<software name="homemj">
+  <software name="herotw" cloneof="hero"> <!-- English logo version -->
+    <description>H.E.R.O. (Tw)</description>
+    <year>1985</year>
+    <publisher>Aaronix</publisher>
+    <part name="cart" interface="sg1000_cart">
+      <dataarea name="rom" size="32768">
+        <rom name="H.E.R.O. [english logo] (TW).sg" size="32768" crc="96f09c6d" sha1="82b530feef7c011361e21b62d2c359c626ab8a9c" offset="000000" />
+      </dataarea>
+    </part>
+  </software>
+
+  <software name="homemj">
 		<description>Home Mahjong (Jpn, v1)</description>
 		<year>1984</year>
 		<publisher>Sega</publisher>
@@ -1347,7 +1358,18 @@ A135 : 森林歷險記 / Sēnlín lìxiǎn jì -> Pitfall II (same as R-049 by A
 		</part>
 	</software>
 
-	<software name="hyperspt">
+  <software name="hustletw" cloneof="hustle">
+    <description>Hustle Chumy / Wanpi shu (Tw)</description>
+    <year>1984</year>
+    <publisher>Aaronix</publisher>
+    <part name="cart" interface="sg1000_cart">
+      <dataarea name="rom" size="16384">
+        <rom name="Hustle Chumy (TW).sg" size="16384" crc="c4ed1fd9" sha1="e7800d107ef0a7773eea2d482b5db9d866ba74f9" offset="000000" />
+      </dataarea>
+    </part>
+  </software>
+
+  <software name="hyperspt">
 		<description>Hyper Sports (Jpn)</description>
 		<year>1985</year>
 		<publisher>Sega / Konami</publisher>
@@ -2066,7 +2088,7 @@ A135 : 森林歷險記 / Sēnlín lìxiǎn jì -> Pitfall II (same as R-049 by A
 		</part>
 	</software>
 
-	<software name="motianda" cloneof="rocknbol">
+	<software name="motianda" cloneof="rocknbol"> <!-- Taiwanese logo version -->
 		<description>Mo Tian Da Lou (Tw)</description>
 		<year>1985?</year>
 		<publisher>Aaronix</publisher>
@@ -2079,7 +2101,18 @@ A135 : 森林歷險記 / Sēnlín lìxiǎn jì -> Pitfall II (same as R-049 by A
 		</part>
 	</software>
 
-	<software name="safarihu" supported="no">
+  <software name="rocknboltw" cloneof="rocknbol"> <!-- English logo version -->
+    <description>Rock n' Bolt (Tw)</description>
+    <year>1985</year>
+    <publisher>Aaronix</publisher>
+    <part name="cart" interface="sg1000_cart">
+      <dataarea name="rom" size="32768">
+        <rom name="Rock n' Bolt [english logo] (TW).sg" size="32768" crc="09a82af7" sha1="e3be08bda8459fc60836abe332e9864e7c596202" offset="000000" />
+      </dataarea>
+    </part>
+  </software>
+
+  <software name="safarihu" supported="no">
 		<description>Safari Hunting (Jpn)</description>
 		<year>1983</year>
 		<publisher>Sega</publisher>
diff --git a/hash/sms.xml b/hash/sms.xml
index bd3eabeb1ae..8ca17a6c605 100644
--- a/hash/sms.xml
+++ b/hash/sms.xml
@@ -120,7 +120,19 @@
 		</part>
 	</software>
 
-	<software name="addfam">
+  <software name="actionfgtw" cloneof="actionfg">
+    <description>Action Fighter / Mo zhan che (Taiwan)</description>
+    <year>1986</year>
+    <publisher>&lt;unknown&gt;</publisher>
+    <part name="cart" interface="sms_cart">
+      <dataarea name="rom" size="131072">
+        <rom name="Action Fighter (TW).sms" size="131072" crc="8418f438" sha1="4f514dc568466f6b0424086edeb3fa0014f9c887" offset="000000" />
+      </dataarea>
+    </part>
+  </software>
+
+
+  <software name="addfam">
 		<description>The Addams Family (Euro)</description>
 		<year>1993</year>
 		<publisher>Flying Edge</publisher>
@@ -2091,7 +2103,43 @@
 		</part>
 	</software>
 
-	<software name="excdizzy" supported="no">
+  <software name="eswatp0" cloneof="eswatc"> <!-- early build, alt subtitle -->
+    <description>E-SWAT - The Ultimate Battle In The Factor Against Crime (prototype 0)</description>
+    <year>1990</year>
+    <publisher>Sega</publisher>
+    <info name="serial" value="7042"/>
+    <part name="cart" interface="sms_cart">
+      <dataarea name="rom" size="262144">
+        <rom name="E-SWAT [Proto 0].sms" size="262144" crc="4f20694a" sha1="855c2f54b700663cedd6484aab396d849dcb5290" offset="000000" />
+      </dataarea>
+    </part>
+  </software>
+
+  <software name="eswatp1" cloneof="eswatc">
+    <description>E-SWAT - City Under Siege (prototype 1)</description>
+    <year>1990</year>
+    <publisher>Sega</publisher>
+    <info name="serial" value="7042"/>
+    <part name="cart" interface="sms_cart">
+      <dataarea name="rom" size="262144">
+        <rom name="E-SWAT [Proto 1].sms" size="262144" crc="f7ca9801" sha1="12c5005f8a0d78c75704b61bf87961875b9d29d4" offset="000000" />
+      </dataarea>
+    </part>
+  </software>
+
+  <software name="eswatp2" cloneof="eswatc">
+    <description>E-SWAT - City Under Siege (prototype 2)</description>
+    <year>1990</year>
+    <publisher>Sega</publisher>
+    <info name="serial" value="7042"/>
+    <part name="cart" interface="sms_cart">
+      <dataarea name="rom" size="262144">
+        <rom name="E-SWAT [Proto 2].sms" size="262144" crc="fd91cc7e" sha1="63fa1fcbf941b0e0ce601b3094c6c31f997c95d8" offset="000000" />
+      </dataarea>
+    </part>
+  </software>
+
+  <software name="excdizzy" supported="no">
 		<description>The Excellent Dizzy Collection (Euro, USA, Prototype)</description>
 		<year>19??</year>
 		<publisher>Codemasters</publisher>
@@ -5681,7 +5729,18 @@
 		</part>
 	</software>
 
-	<software name="smgp">
+  <software name="supcol">
+    <description>Super Columns &amp; Tetris (Kor)</description>
+    <year>1990</year>
+    <publisher>Hi-Com</publisher>
+    <part name="cart" interface="sms_cart">
+      <dataarea name="rom" size="262144">
+        <rom name="Super Columns (KR).sms" size="32768" crc="6ce7f694" sha1="9d696b6eda1d13b8d439509beeb64210987e308e" offset="000000" />
+      </dataarea>
+    </part>
+  </software>
+
+  <software name="smgp">
 		<description>Super Monaco GP (Euro, Bra)</description>
 		<year>1990</year>
 		<publisher>Sega</publisher>