Merge pull request finalburnneo#9 from libretro/master

Able to merge.
SumavisionQ5 · Feb 26, 2021 · 1d02dcb · 1d02dcb
2 parents 9d1c88a + 899a9f7
commit 1d02dcb
Show file tree

Hide file tree

Showing 31 changed files with 10,415 additions and 193 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -97,12 +97,16 @@ libretro-build-linux-i686:
 
 # MacOS 64-bit
 libretro-build-osx-x64:
+  tags:
+    - macosx-packaging
   extends:
     - .libretro-osx-x64-make-default
     - .core-defs
 
 # MacOS ARM 64-bit
 libretro-build-osx-arm64:
+  tags:
+    - macosx-packaging
   extends:
     - .libretro-osx-arm64-make-default
     - .core-defs
@@ -134,6 +138,8 @@ android-x86:
 
 # iOS 9
 libretro-build-ios-9:
+  tags:
+    - macosx-packaging
   extends:
     - .libretro-ios9-make-default
     - .core-defs

diff --git a/dats/FinalBurn Neo (ClrMame Pro XML, Arcade only).dat b/dats/FinalBurn Neo (ClrMame Pro XML, Arcade only).dat
diff --git a/dats/FinalBurn Neo (ClrMame Pro XML, NES Games only).dat b/dats/FinalBurn Neo (ClrMame Pro XML, NES Games only).dat
@@ -68,6 +68,20 @@
 		<rom name="8-Bit Rhythm Land (HB).nes" size="786448" crc="48859a73"/>
 		<driver status="good"/>
 	</game>
+	<game name="atrainj" cloneof="atrain" romof="atrain">
+		<description>A Ressha de Ikou (Japan)</description>
+		<year>1991</year>
+		<manufacturer>Pony Canyon</manufacturer>
+		<rom name="a ressha de ikou (japan).nes" size="147472" crc="58fe5467"/>
+		<driver status="good"/>
+	</game>
+	<game name="atrain">
+		<description>A Ressha de Ikou (T-Eng) [Hack]</description>
+		<year>1989 ?</year>
+		<manufacturer>Nintendo</manufacturer>
+		<rom name="a ressha de ikou (t-eng).nes" size="147472" crc="fd7bc532"/>
+		<driver status="good"/>
+	</game>
 	<game name="abadox">
 		<description>Abadox - The Deadly Inner War (USA)</description>
 		<year>1990</year>
@@ -3561,6 +3575,20 @@
 		<rom name="Exploding Fist (USA, Prototype).nes" size="65552" crc="c52ea831"/>
 		<driver status="good"/>
 	</game>
+	<game name="f1hero">
+		<description>F-1 Hero (Japan)</description>
+		<year>1988</year>
+		<manufacturer>Varie</manufacturer>
+		<rom name="F-1 Hero (Japan).nes" size="262160" crc="ab82d025"/>
+		<driver status="good"/>
+	</game>
+	<game name="f1hero2">
+		<description>F-1 Hero 2 (Japan)</description>
+		<year>1991</year>
+		<manufacturer>Varie</manufacturer>
+		<rom name="F-1 Hero 2 (Japan).nes" size="262160" crc="36b9506d"/>
+		<driver status="good"/>
+	</game>
 	<game name="f1race">
 		<description>F-1 Race (Japan)</description>
 		<year>1984</year>
@@ -4688,6 +4716,13 @@
 		<rom name="Gran Aventura Submarina, La (Spain).nes" size="65552" crc="6483756a"/>
 		<driver status="good"/>
 	</game>
+	<game name="grandmasterjc" cloneof="grandmaster" romof="grandmaster">
+		<description>Grand Master (Japan) - Castellano [Hack]</description>
+		<year>1989 ?</year>
+		<manufacturer>Nintendo</manufacturer>
+		<rom name="grand master (japan) - castellano.nes" size="393232" crc="3ad512ce"/>
+		<driver status="good"/>
+	</game>
 	<game name="grandmasterj" cloneof="grandmaster" romof="grandmaster">
 		<description>Grand Master (Japan)</description>
 		<year>1989?</year>
@@ -7789,6 +7824,13 @@
 		<rom name="Nantettatte!! Baseball (T-eng).nes" size="262160" crc="294713b4"/>
 		<driver status="good"/>
 	</game>
+	<game name="napoleonsenki">
+		<description>Napoleon Senki (Japan)</description>
+		<year>1988</year>
+		<manufacturer>Irem</manufacturer>
+		<rom name="Napoleon Senki (Japan).nes" size="163856" crc="9fea33c2"/>
+		<driver status="good"/>
+	</game>
 	<game name="narc">
 		<description>NARC (USA)</description>
 		<year>1990</year>
@@ -10141,6 +10183,20 @@
 		<rom name="Spy vs Spy (USA).nes" size="40976" crc="23d23dcc"/>
 		<driver status="good"/>
 	</game>
+	<game name="spyvsspyislcaj" cloneof="spyvsspyislca" romof="spyvsspyislca">
+		<description>Spy vs Spy - The Island Caper (Japan)</description>
+		<year>1987</year>
+		<manufacturer>Kemco</manufacturer>
+		<rom name="Spy vs Spy - The Island Caper (Japan).nes" size="131088" crc="23dff27d"/>
+		<driver status="good"/>
+	</game>
+	<game name="spyvsspyislca">
+		<description>Spy vs Spy - The Island Caper (T-Eng)</description>
+		<year>1989?</year>
+		<manufacturer>Nintendo</manufacturer>
+		<rom name="Spy vs Spy - The Island Caper (T-Eng).nes" size="131088" crc="f9e51c93"/>
+		<driver status="good"/>
+	</game>
 	<game name="sqoon">
 		<description>Sqoon (USA)</description>
 		<year>1987</year>
@@ -10785,6 +10841,13 @@
 		<rom name="Superman (USA).nes" size="262160" crc="721be58a"/>
 		<driver status="good"/>
 	</game>
+	<game name="super16in1">
+		<description>Supervision 16-in-1 (Unl)</description>
+		<year>1989?</year>
+		<manufacturer>Nintendo</manufacturer>
+		<rom name="Supervision 16-in-1 (Unl).nes" size="2129936" crc="48017a49"/>
+		<driver status="good"/>
+	</game>
 	<game name="swampthing">
 		<description>Swamp Thing (USA)</description>
 		<year>1992</year>

diff --git a/dats/FinalBurn Neo (ClrMame Pro XML, Neogeo only).dat b/dats/FinalBurn Neo (ClrMame Pro XML, Neogeo only).dat
@@ -15358,22 +15358,21 @@
 	</game>
 	<game name="teot" romof="neogeo">
 		<description>The Eye of Typhoon Demo [Demo, Homebrew]</description>
-		<year>2020</year>
+		<year>2021</year>
 		<manufacturer>OzzyOuzo</manufacturer>
-		<rom name="teot-p1.bin" size="1048576" crc="759b68d3"/>
+		<rom name="teot-p1.bin" size="1048576" crc="3ab0b686"/>
+		<rom name="teot-p2.bin" size="1048576" crc="258909d5"/>
 		<rom name="teot-s1.bin" size="131072" crc="a545b593"/>
-		<rom name="teot-c1.bin" size="8388608" crc="76b8e9ae"/>
-		<rom name="teot-c2.bin" size="8388608" crc="b0c6b4d0"/>
-		<rom name="teot-m1.bin" size="65536" crc="2b5738dc"/>
-		<rom name="teot-v1.bin" size="1048576" crc="ac261416"/>
-		<rom name="teot-v2.bin" size="1048576" crc="95ea979a"/>
-		<rom name="teot-v3.bin" size="1048576" crc="493223d3"/>
-		<rom name="teot-v4.bin" size="1048576" crc="fbf00c96"/>
-		<rom name="teot-v5.bin" size="1048576" crc="9b2031d4"/>
-		<rom name="teot-v6.bin" size="1048576" crc="107cfc89"/>
-		<rom name="teot-v7.bin" size="1048576" crc="0703b761"/>
-		<rom name="teot-v8.bin" size="1048576" crc="8d525588"/>
-		<rom name="teot-v9.bin" size="1048576" crc="97f073b6"/>
+		<rom name="teot-c1.bin" size="8388608" crc="94080cf2"/>
+		<rom name="teot-c2.bin" size="8388608" crc="fb5116b6"/>
+		<rom name="teot-m1.bin" size="65536" crc="62bd5336"/>
+		<rom name="teot-v1.bin" size="1048576" crc="a0906304"/>
+		<rom name="teot-v2.bin" size="1048576" crc="c5e10c1a"/>
+		<rom name="teot-v3.bin" size="1048576" crc="cb78034b"/>
+		<rom name="teot-v4.bin" size="1048576" crc="4a2d0d6d"/>
+		<rom name="teot-v5.bin" size="1048576" crc="51285019"/>
+		<rom name="teot-v6.bin" size="1048576" crc="03641f40"/>
+		<rom name="teot-v7.bin" size="1048576" crc="e425eff3"/>
 		<rom name="sp-s3.sp1" merge="sp-s3.sp1" size="131072" crc="91b64be3"/>
 		<rom name="sp-s2.sp1" merge="sp-s2.sp1" size="131072" crc="9036d879"/>
 		<rom name="sp-s.sp1" merge="sp-s.sp1" size="131072" crc="c7f2fa45"/>

diff --git a/dats/FinalBurn Neo (ClrMame Pro XML, ZX Spectrum Games only).dat b/dats/FinalBurn Neo (ClrMame Pro XML, ZX Spectrum Games only).dat
@@ -537,6 +537,15 @@
 		<rom name="zx128_1.rom" merge="zx128_1.rom" size="16384" crc="b96a36be"/>
 		<driver status="good"/>
 	</game>
+	<game name="anteater" romof="spec128">
+		<description>AntEater</description>
+		<year>2021</year>
+		<manufacturer>Defb</manufacturer>
+		<rom name="AntEater (2021)(Defb).tap" size="44819" crc="31e117c5"/>
+		<rom name="zx128_0.rom" merge="zx128_0.rom" size="16384" crc="e76799d2"/>
+		<rom name="zx128_1.rom" merge="zx128_1.rom" size="16384" crc="b96a36be"/>
+		<driver status="good"/>
+	</game>
 	<game name="apb" romof="spec128">
 		<description>APB - All Points Bulletin (128K)</description>
 		<year>1989</year>
@@ -2235,6 +2244,15 @@
 		<rom name="zx128_1.rom" merge="zx128_1.rom" size="16384" crc="b96a36be"/>
 		<driver status="good"/>
 	</game>
+	<game name="darklostpages" romof="spec128">
+		<description>Dark, The - Lost Pages</description>
+		<year>2021</year>
+		<manufacturer>Zosya Entertainment</manufacturer>
+		<rom name="Dark, The - Lost Pages (2021)(Zosya Entertainment).tap" size="55037" crc="4ee940ee"/>
+		<rom name="zx128_0.rom" merge="zx128_0.rom" size="16384" crc="e76799d2"/>
+		<rom name="zx128_1.rom" merge="zx128_1.rom" size="16384" crc="b96a36be"/>
+		<driver status="good"/>
+	</game>
 	<game name="darkman" romof="spec128">
 		<description>Darkman (128K)</description>
 		<year>1991</year>
@@ -2420,6 +2438,24 @@
 		<rom name="zx128_1.rom" merge="zx128_1.rom" size="16384" crc="b96a36be"/>
 		<driver status="good"/>
 	</game>
+	<game name="dizzy1extrus" cloneof="dizzy1ext" romof="dizzy1ext">
+		<description>Dizzy 1 Extended (Russian)</description>
+		<year>2021</year>
+		<manufacturer>Titus</manufacturer>
+		<rom name="Dizzy 1 Extended (2021)(Titus)(Rus).tap" size="38214" crc="9df57a5a"/>
+		<rom name="zx128_0.rom" merge="zx128_0.rom" size="16384" crc="e76799d2"/>
+		<rom name="zx128_1.rom" merge="zx128_1.rom" size="16384" crc="b96a36be"/>
+		<driver status="good"/>
+	</game>
+	<game name="dizzy1ext" romof="spec128">
+		<description>Dizzy 1 Extended</description>
+		<year>2021</year>
+		<manufacturer>Titus</manufacturer>
+		<rom name="Dizzy 1 Extended (2021)(Titus).tap" size="38104" crc="d4393e5e"/>
+		<rom name="zx128_0.rom" merge="zx128_0.rom" size="16384" crc="e76799d2"/>
+		<rom name="zx128_1.rom" merge="zx128_1.rom" size="16384" crc="b96a36be"/>
+		<driver status="good"/>
+	</game>
 	<game name="dizzy3andahalf" romof="spec128">
 		<description>Dizzy 3 &amp; a Half</description>
 		<year>1988</year>
@@ -4619,6 +4655,24 @@
 		<rom name="zx128_1.rom" merge="zx128_1.rom" size="16384" crc="b96a36be"/>
 		<driver status="good"/>
 	</game>
+	<game name="lostcaverneasy" romof="spec128">
+		<description>Lost Cavern - Easy</description>
+		<year>2021</year>
+		<manufacturer>Isaiasdiaz</manufacturer>
+		<rom name="Lost Cavern - Easy (2021)(Isaiasdiaz).tap" size="46585" crc="37e3379b"/>
+		<rom name="zx128_0.rom" merge="zx128_0.rom" size="16384" crc="e76799d2"/>
+		<rom name="zx128_1.rom" merge="zx128_1.rom" size="16384" crc="b96a36be"/>
+		<driver status="good"/>
+	</game>
+	<game name="lostcavern" romof="spec128">
+		<description>Lost Cavern</description>
+		<year>2021</year>
+		<manufacturer>Isaiasdiaz</manufacturer>
+		<rom name="Lost Cavern (2021)(Isaiasdiaz).tap" size="46610" crc="987ec991"/>
+		<rom name="zx128_0.rom" merge="zx128_0.rom" size="16384" crc="e76799d2"/>
+		<rom name="zx128_1.rom" merge="zx128_1.rom" size="16384" crc="b96a36be"/>
+		<driver status="good"/>
+	</game>
 	<game name="lostulum" romof="spec128">
 		<description>Lost Treasures of Tulum, the (HB) [Homebrew]</description>
 		<year>2020</year>
@@ -5386,6 +5440,24 @@
 		<rom name="zx128_1.rom" merge="zx128_1.rom" size="16384" crc="b96a36be"/>
 		<driver status="good"/>
 	</game>
+	<game name="ninjapoison1" romof="spec128">
+		<description>Ninja Poison - Part 1</description>
+		<year>2021</year>
+		<manufacturer>TokuSoft</manufacturer>
+		<rom name="Ninja Poison - Part 1 (2021)(TokuSoft).tap" size="45684" crc="2cd6d37d"/>
+		<rom name="zx128_0.rom" merge="zx128_0.rom" size="16384" crc="e76799d2"/>
+		<rom name="zx128_1.rom" merge="zx128_1.rom" size="16384" crc="b96a36be"/>
+		<driver status="good"/>
+	</game>
+	<game name="ninjapoison2" romof="spec128">
+		<description>Ninja Poison - Part 2</description>
+		<year>2021</year>
+		<manufacturer>TokuSoft</manufacturer>
+		<rom name="Ninja Poison - Part 2 (2021)(TokuSoft).tap" size="48076" crc="e4cce9b9"/>
+		<rom name="zx128_0.rom" merge="zx128_0.rom" size="16384" crc="e76799d2"/>
+		<rom name="zx128_1.rom" merge="zx128_1.rom" size="16384" crc="b96a36be"/>
+		<driver status="good"/>
+	</game>
 	<game name="ninjajar" romof="spec128">
 		<description>Ninjajar (HB, v1.1) [Homebrew]</description>
 		<year>2014</year>
@@ -5552,6 +5624,15 @@
 		<rom name="spectrum.rom" merge="spectrum.rom" size="16384" crc="ddee531f"/>
 		<driver status="good"/>
 	</game>
+	<game name="organicmatter" romof="spec128">
+		<description>Organic Matter</description>
+		<year>2021</year>
+		<manufacturer>Chentzilla</manufacturer>
+		<rom name="Organic Matter (2021)(Chentzilla).tap" size="38849" crc="c4798ebb"/>
+		<rom name="zx128_0.rom" merge="zx128_0.rom" size="16384" crc="e76799d2"/>
+		<rom name="zx128_1.rom" merge="zx128_1.rom" size="16384" crc="b96a36be"/>
+		<driver status="good"/>
+	</game>
 	<game name="outrun" romof="spec128">
 		<description>Outrun (128K)</description>
 		<year>1987</year>