From 87b3a879df7e087c074259a83a75a3af8c335272 Mon Sep 17 00:00:00 2001
From: barbudreadmon <barbudreadmon@gmail.com>
Date: Fri, 27 May 2022 13:40:13 +0200
Subject: [PATCH] (libretro) update files

---
 ...urn Neo (ClrMame Pro XML, Arcade only).dat | 44 +++++++--------
 ... Neo (ClrMame Pro XML, Megadrive only).dat | 54 ++++++++++++-------
 ...urn Neo (ClrMame Pro XML, Neogeo only).dat | 42 +++++++--------
 ...o Light (ClrMame Pro XML, Arcade only).dat | 44 +++++++--------
 ...ight (ClrMame Pro XML, Megadrive only).dat | 54 ++++++++++++-------
 ...o Light (ClrMame Pro XML, Neogeo only).dat | 42 +++++++--------
 gamelist.txt                                  | 25 ++++-----
 src/dep/generated/driverlist.h                | 14 ++---
 8 files changed, 177 insertions(+), 142 deletions(-)

diff --git a/dats/FinalBurn Neo (ClrMame Pro XML, Arcade only).dat b/dats/FinalBurn Neo (ClrMame Pro XML, Arcade only).dat
index 01dc09182..1a4f039de 100644
--- a/dats/FinalBurn Neo (ClrMame Pro XML, Arcade only).dat	
+++ b/dats/FinalBurn Neo (ClrMame Pro XML, Arcade only).dat	
@@ -82303,7 +82303,7 @@
 		<rom name="v10_30ic.4" size="32768" crc="bda242d1"/>
 		<rom name="v10_30ic.3" size="32768" crc="56e36f85"/>
 		<rom name="v10_30ic.2" size="32768" crc="5b74c767"/>
-		<video orientation="vertical" width="192" height="240" aspectx="3" aspecty="4"/>
+		<video orientation="vertical" width="192" height="248" aspectx="3" aspecty="4"/>
 		<driver status="good"/>
 	</game>
 	<game name="meijinsn">
@@ -82853,7 +82853,7 @@
 		<comment>Homebrew</comment>
 		<description>Metal Slug (HB)</description>
 		<year>2022</year>
-		<manufacturer>Hack</manufacturer>
+		<manufacturer>Homebrew</manufacturer>
 		<rom name="mslug-p1hb.p1" size="4194304" crc="1e0506cf"/>
 		<rom name="mslug-p2hb.p2" size="4194304" crc="894cd3dd"/>
 		<rom name="mslug-c1hb.c1" size="8388608" crc="92a89586"/>
@@ -155563,27 +155563,27 @@
 		<video orientation="horizontal" width="304" height="224" aspectx="4" aspecty="3"/>
 		<driver status="good"/>
 	</game>
-	<game name="kof99rp2f" cloneof="kof99" romof="kof99">
+	<game name="kof99rp" cloneof="kof99" romof="kof99">
 		<comment>Hack</comment>
-		<description>The King of Fighters '99 Remix Pro V2.0 Final (Hack By FCHT)</description>
-		<year>2006</year>
-		<manufacturer>hack</manufacturer>
-		<rom name="kf99rp2f-p1.rom" size="1048576" crc="1c5fd0ad"/>
-		<rom name="kf99rp2f-p2.rom" size="4194304" crc="01e111b3"/>
-		<rom name="kf99rp2f-s1.rom" size="131072" crc="ca942904"/>
-		<rom name="kf99rp2f-c1.rom" size="8388608" crc="f0409101"/>
-		<rom name="kf99rp2f-c2.rom" size="8388608" crc="3a9eff54"/>
-		<rom name="kf99rp2f-c3.rom" size="8388608" crc="b047c9d5"/>
-		<rom name="kf99rp2f-c4.rom" size="8388608" crc="6bc8e4b1"/>
-		<rom name="kf99rp2f-c5.rom" size="8388608" crc="dd023649"/>
-		<rom name="kf99rp2f-c6.rom" size="8388608" crc="b8f60a8c"/>
-		<rom name="kf99rp2f-c7.rom" size="8388608" crc="1dfd5103"/>
-		<rom name="kf99rp2f-c8.rom" size="8388608" crc="23fe3c43"/>
-		<rom name="kf99rp2f-m1.rom" size="131072" crc="0cb24d46"/>
-		<rom name="kf99rp2f-v1.rom" size="4194304" crc="ef2eecc8"/>
-		<rom name="kf99rp2f-v2.rom" size="4194304" crc="73e211ca"/>
-		<rom name="kf99rp2f-v3.rom" size="4194304" crc="403628da"/>
-		<rom name="kf99rp2f-v4.rom" size="2097152" crc="b49e6178"/>
+		<description>The King of Fighters '99 Remix Pro (v2.01 Final)</description>
+		<year>2022</year>
+		<manufacturer>Hack</manufacturer>
+		<rom name="rp.neo-sma" size="262144" crc="173e7ac4"/>
+		<rom name="251-p1rp.p1" size="4194304" crc="effd218b"/>
+		<rom name="251-p2rp.p2" size="4194304" crc="6b8f8478"/>
+		<rom name="251-c1rp.c1" size="8388608" crc="39fbe868"/>
+		<rom name="251-c2rp.c2" size="8388608" crc="ef461a92"/>
+		<rom name="251-c3rp.c3" size="8388608" crc="c79dfe9d"/>
+		<rom name="251-c4rp.c4" size="8388608" crc="24907843"/>
+		<rom name="251-c5rp.c5" size="8388608" crc="3192738e"/>
+		<rom name="251-c6rp.c6" size="8388608" crc="0c9f4912"/>
+		<rom name="251-c7rp.c7" size="8388608" crc="54bc5d03"/>
+		<rom name="251-c8rp.c8" size="8388608" crc="4943a1c3"/>
+		<rom name="251-m1rp.m1" size="131072" crc="0cb24d46"/>
+		<rom name="251-v1.v1" merge="251-v1.v1" size="4194304" crc="ef2eecc8"/>
+		<rom name="251-v2.v2" merge="251-v2.v2" size="4194304" crc="73e211ca"/>
+		<rom name="251-v3rp.v3" size="4194304" crc="403628da"/>
+		<rom name="251-v4.v4" merge="251-v4.v4" size="2097152" crc="b49e6178"/>
 		<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, Megadrive only).dat b/dats/FinalBurn Neo (ClrMame Pro XML, Megadrive only).dat
index d628cc243..e512fdb53 100644
--- a/dats/FinalBurn Neo (ClrMame Pro XML, Megadrive only).dat	
+++ b/dats/FinalBurn Neo (ClrMame Pro XML, Megadrive only).dat	
@@ -1277,6 +1277,15 @@
 		<video orientation="horizontal" width="320" height="224" aspectx="4" aspecty="3"/>
 		<driver status="good"/>
 	</game>
+	<game name="atkpetscii">
+		<comment>Homebrew</comment>
+		<description>Attack of the Petscii Robots (HB)</description>
+		<year>2022</year>
+		<manufacturer>The 8-bit Guy</manufacturer>
+		<rom name="Attack of the Petscii Robots (2022)(The 8-bit Guy).bin" size="2097152" crc="a7004964"/>
+		<video orientation="horizontal" width="320" height="224" aspectx="4" aspecty="3"/>
+		<driver status="good"/>
+	</game>
 	<game name="austrarl">
 		<description>Australian Rugby League (Euro)</description>
 		<year>1994</year>
@@ -7070,9 +7079,10 @@
 		<driver status="good"/>
 	</game>
 	<game name="fightmass" cloneof="fightmas" romof="fightmas">
+		<comment>Hack</comment>
 		<description>Fighting Masters (Hack, Spanish)</description>
 		<year>2019</year>
-		<manufacturer>Treco</manufacturer>
+		<manufacturer>Wave</manufacturer>
 		<rom name="fighting masters (hack, spanish).bin" size="524288" crc="128cddbe"/>
 		<video orientation="horizontal" width="320" height="224" aspectx="4" aspecty="3"/>
 		<driver status="good"/>
@@ -7110,9 +7120,10 @@
 		<driver status="good"/>
 	</game>
 	<game name="fzones" cloneof="fzone" romof="fzone">
-		<description>Final Zone -- FZ Senki Axis (Hack, Spanish)</description>
+		<comment>Hack</comment>
+		<description>Final Zone ~ FZ Senki Axis (Hack, Spanish)</description>
 		<year>2019</year>
-		<manufacturer>Renovation</manufacturer>
+		<manufacturer>Wave</manufacturer>
 		<rom name="final zone -- fz senki axis (hack, spanish).bin" size="524288" crc="d0294acb"/>
 		<video orientation="horizontal" width="320" height="224" aspectx="4" aspecty="3"/>
 		<driver status="good"/>
@@ -7136,15 +7147,16 @@
 	<game name="fireshrk">
 		<description>Fire Shark (Euro)</description>
 		<year>1991</year>
-		<manufacturer>Sega</manufacturer>
+		<manufacturer>Toaplan</manufacturer>
 		<rom name="mpr-14341.bin" size="524288" crc="2351ce61"/>
 		<video orientation="horizontal" width="320" height="224" aspectx="4" aspecty="3"/>
 		<driver status="good"/>
 	</game>
 	<game name="fireshrks" cloneof="fireshrk" romof="fireshrk">
+		<comment>Hack</comment>
 		<description>Fire Shark (Hack, Spanish)</description>
 		<year>2019</year>
-		<manufacturer>DreamWorks</manufacturer>
+		<manufacturer>Wave</manufacturer>
 		<rom name="fire shark (hack, spanish).bin" size="524288" crc="9f0eca9e"/>
 		<video orientation="horizontal" width="320" height="224" aspectx="4" aspecty="3"/>
 		<driver status="good"/>
@@ -7175,17 +7187,19 @@
 		<driver status="good"/>
 	</game>
 	<game name="flashps" cloneof="flashp" romof="flashp">
-		<description>Flash Point (Hack, Spanish) ( Prototype)</description>
+		<comment>Hack</comment>
+		<description>Flash Point (Hack, Spanish)</description>
 		<year>2019</year>
-		<manufacturer>Sega</manufacturer>
+		<manufacturer>Wave</manufacturer>
 		<rom name="flash point (hack, spanish) ( prototype).bin" size="131072" crc="cedef845"/>
 		<video orientation="horizontal" width="320" height="224" aspectx="4" aspecty="3"/>
 		<driver status="good"/>
 	</game>
 	<game name="flashp">
+		<comment>Prototype</comment>
 		<description>Flash Point (Jpn, Prototype)</description>
-		<year>199?</year>
-		<manufacturer>&lt;unknown&gt;</manufacturer>
+		<year>1989</year>
+		<manufacturer>Sega</manufacturer>
 		<rom name="flash point (japan) (proto).bin" size="131072" crc="0655074d"/>
 		<video orientation="horizontal" width="320" height="224" aspectx="4" aspecty="3"/>
 		<driver status="good"/>
@@ -7207,9 +7221,10 @@
 		<driver status="good"/>
 	</game>
 	<game name="flashbs" cloneof="flashb" romof="flashb">
+		<comment>Hack</comment>
 		<description>Flashback - The Quest for Identity (Hack, Spanish)</description>
 		<year>2020</year>
-		<manufacturer>U.S. Gold</manufacturer>
+		<manufacturer>jackic</manufacturer>
 		<rom name="flashback - the quest for identity (hack, spanish).bin" size="1572864" crc="d88b3a54"/>
 		<video orientation="horizontal" width="320" height="224" aspectx="4" aspecty="3"/>
 		<driver status="good"/>
@@ -7239,21 +7254,14 @@
 		<driver status="good"/>
 	</game>
 	<game name="flickys" cloneof="flicky" romof="flicky">
+		<comment>Hack</comment>
 		<description>Flicky (Hack, Spanish)</description>
 		<year>2018</year>
-		<manufacturer>Sega</manufacturer>
+		<manufacturer>Wave</manufacturer>
 		<rom name="flicky (hack, spanish).bin" size="131072" crc="cb2072fa"/>
 		<video orientation="horizontal" width="320" height="224" aspectx="4" aspecty="3"/>
 		<driver status="good"/>
 	</game>
-	<game name="flink">
-		<description>Flink (Euro)</description>
-		<year>1994</year>
-		<manufacturer>Sony Imagesoft</manufacturer>
-		<rom name="flink (euro).bin" size="1048576" crc="bef9a4f4"/>
-		<video orientation="horizontal" width="320" height="224" aspectx="4" aspecty="3"/>
-		<driver status="good"/>
-	</game>
 	<game name="flint">
 		<description>Flintstones, The (Euro)</description>
 		<year>1993</year>
@@ -11773,6 +11781,14 @@
 		<video orientation="horizontal" width="320" height="224" aspectx="4" aspecty="3"/>
 		<driver status="good"/>
 	</game>
+	<game name="flink">
+		<description>Misadventures of Flink, The (Euro)</description>
+		<year>1994</year>
+		<manufacturer>Psygnosis</manufacturer>
+		<rom name="flink (euro).bin" size="1048576" crc="bef9a4f4"/>
+		<video orientation="horizontal" width="320" height="224" aspectx="4" aspecty="3"/>
+		<driver status="good"/>
+	</game>
 	<game name="misplaced">
 		<comment>Homebrew</comment>
 		<description>Misplaced (HB, English)</description>
diff --git a/dats/FinalBurn Neo (ClrMame Pro XML, Neogeo only).dat b/dats/FinalBurn Neo (ClrMame Pro XML, Neogeo only).dat
index 5cd3ddc10..1d0642e08 100644
--- a/dats/FinalBurn Neo (ClrMame Pro XML, Neogeo only).dat	
+++ b/dats/FinalBurn Neo (ClrMame Pro XML, Neogeo only).dat	
@@ -7547,7 +7547,7 @@
 		<comment>Homebrew</comment>
 		<description>Metal Slug (HB)</description>
 		<year>2022</year>
-		<manufacturer>Hack</manufacturer>
+		<manufacturer>Homebrew</manufacturer>
 		<rom name="mslug-p1hb.p1" size="4194304" crc="1e0506cf"/>
 		<rom name="mslug-p2hb.p2" size="4194304" crc="894cd3dd"/>
 		<rom name="mslug-c1hb.c1" size="8388608" crc="92a89586"/>
@@ -20445,27 +20445,27 @@
 		<video orientation="horizontal" width="304" height="224" aspectx="4" aspecty="3"/>
 		<driver status="good"/>
 	</game>
-	<game name="kof99rp2f" cloneof="kof99" romof="kof99">
+	<game name="kof99rp" cloneof="kof99" romof="kof99">
 		<comment>Hack</comment>
-		<description>The King of Fighters '99 Remix Pro V2.0 Final (Hack By FCHT)</description>
-		<year>2006</year>
-		<manufacturer>hack</manufacturer>
-		<rom name="kf99rp2f-p1.rom" size="1048576" crc="1c5fd0ad"/>
-		<rom name="kf99rp2f-p2.rom" size="4194304" crc="01e111b3"/>
-		<rom name="kf99rp2f-s1.rom" size="131072" crc="ca942904"/>
-		<rom name="kf99rp2f-c1.rom" size="8388608" crc="f0409101"/>
-		<rom name="kf99rp2f-c2.rom" size="8388608" crc="3a9eff54"/>
-		<rom name="kf99rp2f-c3.rom" size="8388608" crc="b047c9d5"/>
-		<rom name="kf99rp2f-c4.rom" size="8388608" crc="6bc8e4b1"/>
-		<rom name="kf99rp2f-c5.rom" size="8388608" crc="dd023649"/>
-		<rom name="kf99rp2f-c6.rom" size="8388608" crc="b8f60a8c"/>
-		<rom name="kf99rp2f-c7.rom" size="8388608" crc="1dfd5103"/>
-		<rom name="kf99rp2f-c8.rom" size="8388608" crc="23fe3c43"/>
-		<rom name="kf99rp2f-m1.rom" size="131072" crc="0cb24d46"/>
-		<rom name="kf99rp2f-v1.rom" size="4194304" crc="ef2eecc8"/>
-		<rom name="kf99rp2f-v2.rom" size="4194304" crc="73e211ca"/>
-		<rom name="kf99rp2f-v3.rom" size="4194304" crc="403628da"/>
-		<rom name="kf99rp2f-v4.rom" size="2097152" crc="b49e6178"/>
+		<description>The King of Fighters '99 Remix Pro (v2.01 Final)</description>
+		<year>2022</year>
+		<manufacturer>Hack</manufacturer>
+		<rom name="rp.neo-sma" size="262144" crc="173e7ac4"/>
+		<rom name="251-p1rp.p1" size="4194304" crc="effd218b"/>
+		<rom name="251-p2rp.p2" size="4194304" crc="6b8f8478"/>
+		<rom name="251-c1rp.c1" size="8388608" crc="39fbe868"/>
+		<rom name="251-c2rp.c2" size="8388608" crc="ef461a92"/>
+		<rom name="251-c3rp.c3" size="8388608" crc="c79dfe9d"/>
+		<rom name="251-c4rp.c4" size="8388608" crc="24907843"/>
+		<rom name="251-c5rp.c5" size="8388608" crc="3192738e"/>
+		<rom name="251-c6rp.c6" size="8388608" crc="0c9f4912"/>
+		<rom name="251-c7rp.c7" size="8388608" crc="54bc5d03"/>
+		<rom name="251-c8rp.c8" size="8388608" crc="4943a1c3"/>
+		<rom name="251-m1rp.m1" size="131072" crc="0cb24d46"/>
+		<rom name="251-v1.v1" merge="251-v1.v1" size="4194304" crc="ef2eecc8"/>
+		<rom name="251-v2.v2" merge="251-v2.v2" size="4194304" crc="73e211ca"/>
+		<rom name="251-v3rp.v3" size="4194304" crc="403628da"/>
+		<rom name="251-v4.v4" merge="251-v4.v4" size="2097152" crc="b49e6178"/>
 		<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/light/FinalBurn Neo Light (ClrMame Pro XML, Arcade only).dat b/dats/light/FinalBurn Neo Light (ClrMame Pro XML, Arcade only).dat
index b74fe66c9..24e4a0a40 100644
--- a/dats/light/FinalBurn Neo Light (ClrMame Pro XML, Arcade only).dat	
+++ b/dats/light/FinalBurn Neo Light (ClrMame Pro XML, Arcade only).dat	
@@ -66305,7 +66305,7 @@
 		<rom name="v10_30ic.4" size="32768" crc="bda242d1"/>
 		<rom name="v10_30ic.3" size="32768" crc="56e36f85"/>
 		<rom name="v10_30ic.2" size="32768" crc="5b74c767"/>
-		<video orientation="vertical" width="192" height="240" aspectx="3" aspecty="4"/>
+		<video orientation="vertical" width="192" height="248" aspectx="3" aspecty="4"/>
 		<driver status="good"/>
 	</game>
 	<game name="meijinsn">
@@ -66806,7 +66806,7 @@
 		<comment>Homebrew</comment>
 		<description>Metal Slug (HB)</description>
 		<year>2022</year>
-		<manufacturer>Hack</manufacturer>
+		<manufacturer>Homebrew</manufacturer>
 		<rom name="mslug-p1hb.p1" size="4194304" crc="1e0506cf"/>
 		<rom name="mslug-p2hb.p2" size="4194304" crc="894cd3dd"/>
 		<rom name="mslug-c1hb.c1" size="8388608" crc="92a89586"/>
@@ -126625,27 +126625,27 @@
 		<video orientation="horizontal" width="304" height="224" aspectx="4" aspecty="3"/>
 		<driver status="good"/>
 	</game>
-	<game name="kof99rp2f" cloneof="kof99" romof="kof99">
+	<game name="kof99rp" cloneof="kof99" romof="kof99">
 		<comment>Hack</comment>
-		<description>The King of Fighters '99 Remix Pro V2.0 Final (Hack By FCHT)</description>
-		<year>2006</year>
-		<manufacturer>hack</manufacturer>
-		<rom name="kf99rp2f-p1.rom" size="1048576" crc="1c5fd0ad"/>
-		<rom name="kf99rp2f-p2.rom" size="4194304" crc="01e111b3"/>
-		<rom name="kf99rp2f-s1.rom" size="131072" crc="ca942904"/>
-		<rom name="kf99rp2f-c1.rom" size="8388608" crc="f0409101"/>
-		<rom name="kf99rp2f-c2.rom" size="8388608" crc="3a9eff54"/>
-		<rom name="kf99rp2f-c3.rom" size="8388608" crc="b047c9d5"/>
-		<rom name="kf99rp2f-c4.rom" size="8388608" crc="6bc8e4b1"/>
-		<rom name="kf99rp2f-c5.rom" size="8388608" crc="dd023649"/>
-		<rom name="kf99rp2f-c6.rom" size="8388608" crc="b8f60a8c"/>
-		<rom name="kf99rp2f-c7.rom" size="8388608" crc="1dfd5103"/>
-		<rom name="kf99rp2f-c8.rom" size="8388608" crc="23fe3c43"/>
-		<rom name="kf99rp2f-m1.rom" size="131072" crc="0cb24d46"/>
-		<rom name="kf99rp2f-v1.rom" size="4194304" crc="ef2eecc8"/>
-		<rom name="kf99rp2f-v2.rom" size="4194304" crc="73e211ca"/>
-		<rom name="kf99rp2f-v3.rom" size="4194304" crc="403628da"/>
-		<rom name="kf99rp2f-v4.rom" size="2097152" crc="b49e6178"/>
+		<description>The King of Fighters '99 Remix Pro (v2.01 Final)</description>
+		<year>2022</year>
+		<manufacturer>Hack</manufacturer>
+		<rom name="rp.neo-sma" size="262144" crc="173e7ac4"/>
+		<rom name="251-p1rp.p1" size="4194304" crc="effd218b"/>
+		<rom name="251-p2rp.p2" size="4194304" crc="6b8f8478"/>
+		<rom name="251-c1rp.c1" size="8388608" crc="39fbe868"/>
+		<rom name="251-c2rp.c2" size="8388608" crc="ef461a92"/>
+		<rom name="251-c3rp.c3" size="8388608" crc="c79dfe9d"/>
+		<rom name="251-c4rp.c4" size="8388608" crc="24907843"/>
+		<rom name="251-c5rp.c5" size="8388608" crc="3192738e"/>
+		<rom name="251-c6rp.c6" size="8388608" crc="0c9f4912"/>
+		<rom name="251-c7rp.c7" size="8388608" crc="54bc5d03"/>
+		<rom name="251-c8rp.c8" size="8388608" crc="4943a1c3"/>
+		<rom name="251-m1rp.m1" size="131072" crc="0cb24d46"/>
+		<rom name="251-v1.v1" merge="251-v1.v1" size="4194304" crc="ef2eecc8"/>
+		<rom name="251-v2.v2" merge="251-v2.v2" size="4194304" crc="73e211ca"/>
+		<rom name="251-v3rp.v3" size="4194304" crc="403628da"/>
+		<rom name="251-v4.v4" merge="251-v4.v4" size="2097152" crc="b49e6178"/>
 		<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/light/FinalBurn Neo Light (ClrMame Pro XML, Megadrive only).dat b/dats/light/FinalBurn Neo Light (ClrMame Pro XML, Megadrive only).dat
index d628cc243..e512fdb53 100644
--- a/dats/light/FinalBurn Neo Light (ClrMame Pro XML, Megadrive only).dat	
+++ b/dats/light/FinalBurn Neo Light (ClrMame Pro XML, Megadrive only).dat	
@@ -1277,6 +1277,15 @@
 		<video orientation="horizontal" width="320" height="224" aspectx="4" aspecty="3"/>
 		<driver status="good"/>
 	</game>
+	<game name="atkpetscii">
+		<comment>Homebrew</comment>
+		<description>Attack of the Petscii Robots (HB)</description>
+		<year>2022</year>
+		<manufacturer>The 8-bit Guy</manufacturer>
+		<rom name="Attack of the Petscii Robots (2022)(The 8-bit Guy).bin" size="2097152" crc="a7004964"/>
+		<video orientation="horizontal" width="320" height="224" aspectx="4" aspecty="3"/>
+		<driver status="good"/>
+	</game>
 	<game name="austrarl">
 		<description>Australian Rugby League (Euro)</description>
 		<year>1994</year>
@@ -7070,9 +7079,10 @@
 		<driver status="good"/>
 	</game>
 	<game name="fightmass" cloneof="fightmas" romof="fightmas">
+		<comment>Hack</comment>
 		<description>Fighting Masters (Hack, Spanish)</description>
 		<year>2019</year>
-		<manufacturer>Treco</manufacturer>
+		<manufacturer>Wave</manufacturer>
 		<rom name="fighting masters (hack, spanish).bin" size="524288" crc="128cddbe"/>
 		<video orientation="horizontal" width="320" height="224" aspectx="4" aspecty="3"/>
 		<driver status="good"/>
@@ -7110,9 +7120,10 @@
 		<driver status="good"/>
 	</game>
 	<game name="fzones" cloneof="fzone" romof="fzone">
-		<description>Final Zone -- FZ Senki Axis (Hack, Spanish)</description>
+		<comment>Hack</comment>
+		<description>Final Zone ~ FZ Senki Axis (Hack, Spanish)</description>
 		<year>2019</year>
-		<manufacturer>Renovation</manufacturer>
+		<manufacturer>Wave</manufacturer>
 		<rom name="final zone -- fz senki axis (hack, spanish).bin" size="524288" crc="d0294acb"/>
 		<video orientation="horizontal" width="320" height="224" aspectx="4" aspecty="3"/>
 		<driver status="good"/>
@@ -7136,15 +7147,16 @@
 	<game name="fireshrk">
 		<description>Fire Shark (Euro)</description>
 		<year>1991</year>
-		<manufacturer>Sega</manufacturer>
+		<manufacturer>Toaplan</manufacturer>
 		<rom name="mpr-14341.bin" size="524288" crc="2351ce61"/>
 		<video orientation="horizontal" width="320" height="224" aspectx="4" aspecty="3"/>
 		<driver status="good"/>
 	</game>
 	<game name="fireshrks" cloneof="fireshrk" romof="fireshrk">
+		<comment>Hack</comment>
 		<description>Fire Shark (Hack, Spanish)</description>
 		<year>2019</year>
-		<manufacturer>DreamWorks</manufacturer>
+		<manufacturer>Wave</manufacturer>
 		<rom name="fire shark (hack, spanish).bin" size="524288" crc="9f0eca9e"/>
 		<video orientation="horizontal" width="320" height="224" aspectx="4" aspecty="3"/>
 		<driver status="good"/>
@@ -7175,17 +7187,19 @@
 		<driver status="good"/>
 	</game>
 	<game name="flashps" cloneof="flashp" romof="flashp">
-		<description>Flash Point (Hack, Spanish) ( Prototype)</description>
+		<comment>Hack</comment>
+		<description>Flash Point (Hack, Spanish)</description>
 		<year>2019</year>
-		<manufacturer>Sega</manufacturer>
+		<manufacturer>Wave</manufacturer>
 		<rom name="flash point (hack, spanish) ( prototype).bin" size="131072" crc="cedef845"/>
 		<video orientation="horizontal" width="320" height="224" aspectx="4" aspecty="3"/>
 		<driver status="good"/>
 	</game>
 	<game name="flashp">
+		<comment>Prototype</comment>
 		<description>Flash Point (Jpn, Prototype)</description>
-		<year>199?</year>
-		<manufacturer>&lt;unknown&gt;</manufacturer>
+		<year>1989</year>
+		<manufacturer>Sega</manufacturer>
 		<rom name="flash point (japan) (proto).bin" size="131072" crc="0655074d"/>
 		<video orientation="horizontal" width="320" height="224" aspectx="4" aspecty="3"/>
 		<driver status="good"/>
@@ -7207,9 +7221,10 @@
 		<driver status="good"/>
 	</game>
 	<game name="flashbs" cloneof="flashb" romof="flashb">
+		<comment>Hack</comment>
 		<description>Flashback - The Quest for Identity (Hack, Spanish)</description>
 		<year>2020</year>
-		<manufacturer>U.S. Gold</manufacturer>
+		<manufacturer>jackic</manufacturer>
 		<rom name="flashback - the quest for identity (hack, spanish).bin" size="1572864" crc="d88b3a54"/>
 		<video orientation="horizontal" width="320" height="224" aspectx="4" aspecty="3"/>
 		<driver status="good"/>
@@ -7239,21 +7254,14 @@
 		<driver status="good"/>
 	</game>
 	<game name="flickys" cloneof="flicky" romof="flicky">
+		<comment>Hack</comment>
 		<description>Flicky (Hack, Spanish)</description>
 		<year>2018</year>
-		<manufacturer>Sega</manufacturer>
+		<manufacturer>Wave</manufacturer>
 		<rom name="flicky (hack, spanish).bin" size="131072" crc="cb2072fa"/>
 		<video orientation="horizontal" width="320" height="224" aspectx="4" aspecty="3"/>
 		<driver status="good"/>
 	</game>
-	<game name="flink">
-		<description>Flink (Euro)</description>
-		<year>1994</year>
-		<manufacturer>Sony Imagesoft</manufacturer>
-		<rom name="flink (euro).bin" size="1048576" crc="bef9a4f4"/>
-		<video orientation="horizontal" width="320" height="224" aspectx="4" aspecty="3"/>
-		<driver status="good"/>
-	</game>
 	<game name="flint">
 		<description>Flintstones, The (Euro)</description>
 		<year>1993</year>
@@ -11773,6 +11781,14 @@
 		<video orientation="horizontal" width="320" height="224" aspectx="4" aspecty="3"/>
 		<driver status="good"/>
 	</game>
+	<game name="flink">
+		<description>Misadventures of Flink, The (Euro)</description>
+		<year>1994</year>
+		<manufacturer>Psygnosis</manufacturer>
+		<rom name="flink (euro).bin" size="1048576" crc="bef9a4f4"/>
+		<video orientation="horizontal" width="320" height="224" aspectx="4" aspecty="3"/>
+		<driver status="good"/>
+	</game>
 	<game name="misplaced">
 		<comment>Homebrew</comment>
 		<description>Misplaced (HB, English)</description>
diff --git a/dats/light/FinalBurn Neo Light (ClrMame Pro XML, Neogeo only).dat b/dats/light/FinalBurn Neo Light (ClrMame Pro XML, Neogeo only).dat
index 5cd3ddc10..1d0642e08 100644
--- a/dats/light/FinalBurn Neo Light (ClrMame Pro XML, Neogeo only).dat	
+++ b/dats/light/FinalBurn Neo Light (ClrMame Pro XML, Neogeo only).dat	
@@ -7547,7 +7547,7 @@
 		<comment>Homebrew</comment>
 		<description>Metal Slug (HB)</description>
 		<year>2022</year>
-		<manufacturer>Hack</manufacturer>
+		<manufacturer>Homebrew</manufacturer>
 		<rom name="mslug-p1hb.p1" size="4194304" crc="1e0506cf"/>
 		<rom name="mslug-p2hb.p2" size="4194304" crc="894cd3dd"/>
 		<rom name="mslug-c1hb.c1" size="8388608" crc="92a89586"/>
@@ -20445,27 +20445,27 @@
 		<video orientation="horizontal" width="304" height="224" aspectx="4" aspecty="3"/>
 		<driver status="good"/>
 	</game>
-	<game name="kof99rp2f" cloneof="kof99" romof="kof99">
+	<game name="kof99rp" cloneof="kof99" romof="kof99">
 		<comment>Hack</comment>
-		<description>The King of Fighters '99 Remix Pro V2.0 Final (Hack By FCHT)</description>
-		<year>2006</year>
-		<manufacturer>hack</manufacturer>
-		<rom name="kf99rp2f-p1.rom" size="1048576" crc="1c5fd0ad"/>
-		<rom name="kf99rp2f-p2.rom" size="4194304" crc="01e111b3"/>
-		<rom name="kf99rp2f-s1.rom" size="131072" crc="ca942904"/>
-		<rom name="kf99rp2f-c1.rom" size="8388608" crc="f0409101"/>
-		<rom name="kf99rp2f-c2.rom" size="8388608" crc="3a9eff54"/>
-		<rom name="kf99rp2f-c3.rom" size="8388608" crc="b047c9d5"/>
-		<rom name="kf99rp2f-c4.rom" size="8388608" crc="6bc8e4b1"/>
-		<rom name="kf99rp2f-c5.rom" size="8388608" crc="dd023649"/>
-		<rom name="kf99rp2f-c6.rom" size="8388608" crc="b8f60a8c"/>
-		<rom name="kf99rp2f-c7.rom" size="8388608" crc="1dfd5103"/>
-		<rom name="kf99rp2f-c8.rom" size="8388608" crc="23fe3c43"/>
-		<rom name="kf99rp2f-m1.rom" size="131072" crc="0cb24d46"/>
-		<rom name="kf99rp2f-v1.rom" size="4194304" crc="ef2eecc8"/>
-		<rom name="kf99rp2f-v2.rom" size="4194304" crc="73e211ca"/>
-		<rom name="kf99rp2f-v3.rom" size="4194304" crc="403628da"/>
-		<rom name="kf99rp2f-v4.rom" size="2097152" crc="b49e6178"/>
+		<description>The King of Fighters '99 Remix Pro (v2.01 Final)</description>
+		<year>2022</year>
+		<manufacturer>Hack</manufacturer>
+		<rom name="rp.neo-sma" size="262144" crc="173e7ac4"/>
+		<rom name="251-p1rp.p1" size="4194304" crc="effd218b"/>
+		<rom name="251-p2rp.p2" size="4194304" crc="6b8f8478"/>
+		<rom name="251-c1rp.c1" size="8388608" crc="39fbe868"/>
+		<rom name="251-c2rp.c2" size="8388608" crc="ef461a92"/>
+		<rom name="251-c3rp.c3" size="8388608" crc="c79dfe9d"/>
+		<rom name="251-c4rp.c4" size="8388608" crc="24907843"/>
+		<rom name="251-c5rp.c5" size="8388608" crc="3192738e"/>
+		<rom name="251-c6rp.c6" size="8388608" crc="0c9f4912"/>
+		<rom name="251-c7rp.c7" size="8388608" crc="54bc5d03"/>
+		<rom name="251-c8rp.c8" size="8388608" crc="4943a1c3"/>
+		<rom name="251-m1rp.m1" size="131072" crc="0cb24d46"/>
+		<rom name="251-v1.v1" merge="251-v1.v1" size="4194304" crc="ef2eecc8"/>
+		<rom name="251-v2.v2" merge="251-v2.v2" size="4194304" crc="73e211ca"/>
+		<rom name="251-v3rp.v3" size="4194304" crc="403628da"/>
+		<rom name="251-v4.v4" merge="251-v4.v4" size="2097152" crc="b49e6178"/>
 		<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/gamelist.txt b/gamelist.txt
index cb27d075d..b92b8ea5d 100644
--- a/gamelist.txt
+++ b/gamelist.txt
@@ -1,6 +1,6 @@
 This list contains all games supported by FinalBurn Neo.
 
-18497 games supported in total; X = excluded from build; D = included in debug build only; NW = not working
+18498 games supported in total; X = excluded from build; D = included in debug build only; NW = not working
 
 +---------------------------------+--------+------------------------------------------------------------------------------------------------------------------------------+-------------------------+--------------------+---------------------------------------------------------------+--------------------------------+----------------------------------------------------------------------------+
 | name                            | status | full name                                                                                                                    | parent                  | year               | company                                                       | hardware                       | remarks                                                                    |
@@ -1059,6 +1059,7 @@ This list contains all games supported by FinalBurn Neo.
 | spec_aktomatoes                 |        | Attack of the Killer Tomatoes (48K)                                                                                          |                         | 1986               | Global Software                                               | ZX Spectrum                    |                                                                            |
 | msx_aktomatoes                  |        | Attack of the Killer Tomatoes (Euro)                                                                                         |                         | 1986               | Global Software                                               | MSX                            |                                                                            |
 | nes_attackiltom                 |        | Attack of the Killer Tomatoes (USA)                                                                                          |                         | 1992               | THQ                                                           | Miscellaneous                  |                                                                            |
+| md_atkpetscii                   |        | Attack of the Petscii Robots (HB)                                                                                            |                         | 2022               | The 8-bit Guy                                                 | Sega Megadrive                 |                                                                            |
 | msx_attacked                    |        | Attacked                                                                                                                     |                         | 19xx               | Tynesoft                                                      | MSX                            |                                                                            |
 | spec_atvsim                     |        | ATV Simulator - All Terrain Vehicle (48K)                                                                                    |                         | 1987               | Codemasters                                                   | ZX Spectrum                    |                                                                            |
 | spec_aufwiemo                   |        | Auf Wiedersehen Monty (128K)                                                                                                 |                         | 1987               | Gremlin Graphics                                              | ZX Spectrum                    |                                                                            |
@@ -5289,7 +5290,7 @@ This list contains all games supported by FinalBurn Neo.
 | nes_fightinghero                |        | Fighting Hero (Unl)                                                                                                          |                         | 1991               | Mega Soft                                                     | Miscellaneous                  |                                                                            |
 | nes_fightheriii                 |        | Fighting Hero III (Unl)                                                                                                      |                         | 1993               | NTDEC                                                         | Miscellaneous                  |                                                                            |
 | cfghtice                        |        | Fighting Ice Hockey (DECO Cassette) (US)                                                                                     |                         | 1984               | Data East Corporation                                         | Cassette System                |                                                                            |
-| md_fightmass                    |        | Fighting Masters (Hack, Spanish)                                                                                             | md_fightmas             | 2019               | Treco                                                         | Sega Megadrive                 |                                                                            |
+| md_fightmass                    |        | Fighting Masters (Hack, Spanish)                                                                                             | md_fightmas             | 2019               | Wave                                                          | Sega Megadrive                 |                                                                            |
 | md_fightmasj                    |        | Fighting Masters (Jpn, Kor)                                                                                                  | md_fightmas             | 1991               | Treco                                                         | Sega Megadrive                 |                                                                            |
 | md_fightmas                     |        | Fighting Masters (USA)                                                                                                       |                         | 1992               | Treco                                                         | Sega Megadrive                 |                                                                            |
 | nes_fightingroadj               |        | Fighting Road (Japan)                                                                                                        | nes_fightingroad        | 1988               | Toei Animation                                                | Miscellaneous                  |                                                                            |
@@ -5376,7 +5377,7 @@ This list contains all games supported by FinalBurn Neo.
 | msx_fzone                       |        | Final Zone (Jpn)                                                                                                             |                         | 1986               | Nihon Telenet                                                 | MSX                            |                                                                            |
 | msx_fzonek                      |        | Final Zone (Kor)                                                                                                             | msx_fzone               | 198?               | Zemina                                                        | MSX                            |                                                                            |
 | md_fzone                        |        | Final Zone (USA) ~ FZ Senki Axis (Jpn)                                                                                       |                         | 1990               | Wolf Team                                                     | Sega Megadrive                 |                                                                            |
-| md_fzones                       |        | Final Zone -- FZ Senki Axis (Hack, Spanish)                                                                                  | md_fzone                | 2019               | Renovation                                                    | Sega Megadrive                 |                                                                            |
+| md_fzones                       |        | Final Zone ~ FZ Senki Axis (Hack, Spanish)                                                                                   | md_fzone                | 2019               | Wave                                                          | Sega Megadrive                 |                                                                            |
 | finalizrb                       |        | Finalizer - Super Transformation (bootleg)                                                                                   | finalizr                | 1985               | bootleg                                                       | GX523                          |                                                                            |
 | finalizr                        |        | Finalizer - Super Transformation (set 1)                                                                                     |                         | 1985               | Konami                                                        | GX523                          |                                                                            |
 | finalizra                       |        | Finalizer - Super Transformation (set 2)                                                                                     | finalizr                | 1985               | Konami                                                        | GX523                          |                                                                            |
@@ -5411,8 +5412,8 @@ This list contains all games supported by FinalBurn Neo.
 | msx_fireresca                   |        | Fire Rescue (Jpn, Alt)                                                                                                       | msx_fireresc            | 1984               | Hudson Soft                                                   | MSX                            |                                                                            |
 | fds_firerock                    |        | Fire Rock (Japan)                                                                                                            |                         | 1988               | System Sacom                                                  | Miscellaneous                  |                                                                            |
 | fireshrka                       |        | Fire Shark (earlier)                                                                                                         | fireshrk                | 1989               | Toaplan                                                       | Toaplan BCU-2 / FCU-2 based    |                                                                            |
-| md_fireshrk                     |        | Fire Shark (Euro)                                                                                                            |                         | 1991               | Sega                                                          | Sega Megadrive                 |                                                                            |
-| md_fireshrks                    |        | Fire Shark (Hack, Spanish)                                                                                                   | md_fireshrk             | 2019               | DreamWorks                                                    | Sega Megadrive                 |                                                                            |
+| md_fireshrk                     |        | Fire Shark (Euro)                                                                                                            |                         | 1991               | Toaplan                                                       | Sega Megadrive                 |                                                                            |
+| md_fireshrks                    |        | Fire Shark (Hack, Spanish)                                                                                                   | md_fireshrk             | 2019               | Wave                                                          | Sega Megadrive                 |                                                                            |
 | fireshrkd                       |        | Fire Shark (Korea, set 1, easier)                                                                                            | fireshrk                | 1990               | Toaplan (Dooyong license)                                     | Toaplan BCU-2 / FCU-2 based    |                                                                            |
 | fireshrkdh                      |        | Fire Shark (Korea, set 2, harder)                                                                                            | fireshrk                | 1990               | Toaplan (Dooyong license)                                     | Toaplan BCU-2 / FCU-2 based    |                                                                            |
 | md_fireshrku                    |        | Fire Shark (USA)                                                                                                             | md_fireshrk             | 1990               | Dreamworks Games                                              | Sega Megadrive                 |                                                                            |
@@ -5463,9 +5464,9 @@ This list contains all games supported by FinalBurn Neo.
 | cfboy0a1                        |        | Flash Boy (vertical) [DECO Cassette MD] (No.12/Ver.0/Set.1,Japan)                                                            |                         | 1981               | Data East Corporation                                         | Cassette System                |                                                                            |
 | spec_flashgordon                |        | Flash Gordon (48K)                                                                                                           |                         | 1987               | Mastertronic                                                  | ZX Spectrum                    |                                                                            |
 | msx_flashgor                    |        | Flash Gordon (Euro)                                                                                                          |                         | 1987               | Mastertronic Added Dimension                                  | MSX                            |                                                                            |
-| md_flashps                      |        | Flash Point (Hack, Spanish) ( Prototype)                                                                                     | md_flashp               | 2019               | Sega                                                          | Sega Megadrive                 |                                                                            |
+| md_flashps                      |        | Flash Point (Hack, Spanish)                                                                                                  | md_flashp               | 2019               | Wave                                                          | Sega Megadrive                 |                                                                            |
 | fpointbj                        |        | Flash Point (Japan, bootleg)                                                                                                 | fpoint                  | 1989               | bootleg                                                       | System 16B                     |                                                                            |
-| md_flashp                       |        | Flash Point (Jpn, Prototype)                                                                                                 |                         | 199?               | <unknown>                                                     | Sega Megadrive                 |                                                                            |
+| md_flashp                       |        | Flash Point (Jpn, Prototype)                                                                                                 |                         | 1989               | Sega                                                          | Sega Megadrive                 |                                                                            |
 | fpoint1d                        |        | Flash Point (set 1, Japan, FD1094 317-0127A decrypted)                                                                       | fpoint                  | 1989               | Sega                                                          | System 16B                     |                                                                            |
 | fpoint1                         |        | Flash Point (set 1, Japan, FD1094 317-0127A)                                                                                 | fpoint                  | 1989               | Sega                                                          | System 16B                     |                                                                            |
 | fpointd                         |        | Flash Point (set 2, Japan, FD1094 317-0127A decrypted)                                                                       | fpoint                  | 1989               | Sega                                                          | System 16B                     |                                                                            |
@@ -5475,7 +5476,7 @@ This list contains all games supported by FinalBurn Neo.
 | sms_flash                       |        | Flash, The (Euro, Bra)                                                                                                       |                         | 1993               | Sega                                                          | Sega Master System             |                                                                            |
 | md_flashb                       |        | Flashback (Euro, Rev. A)                                                                                                     |                         | 1993               | U.S. Gold                                                     | Sega Megadrive                 |                                                                            |
 | md_flashbj                      |        | Flashback (Jpn)                                                                                                              | md_flashb               | 1993               | Sunsoft                                                       | Sega Megadrive                 |                                                                            |
-| md_flashbs                      |        | Flashback - The Quest for Identity (Hack, Spanish)                                                                           | md_flashb               | 2020               | U.S. Gold                                                     | Sega Megadrive                 |                                                                            |
+| md_flashbs                      |        | Flashback - The Quest for Identity (Hack, Spanish)                                                                           | md_flashb               | 2020               | jackic                                                        | Sega Megadrive                 |                                                                            |
 | md_flashbu                      |        | Flashback - The Quest for Identity (USA)                                                                                     | md_flashb               | 1993               | U.S. Gold                                                     | Sega Megadrive                 |                                                                            |
 | md_flashbu1                     |        | Flashback - The Quest for Identity (USA, Alt)                                                                                | md_flashb               | 1993               | U.S. Gold                                                     | Sega Megadrive                 |                                                                            |
 | flashgal                        |        | Flashgal (set 1)                                                                                                             |                         | 1985               | Kyugo / Sega                                                  | Miscellaneous                  |                                                                            |
@@ -5495,7 +5496,7 @@ This list contains all games supported by FinalBurn Neo.
 | flickys1                        |        | Flicky (64k Version, 315-5051, set 2)                                                                                        | flicky                  | 1984               | Sega                                                          | System 1                       |                                                                            |
 | flickyup                        |        | Flicky (64k Version, on Up'n Down boardset)                                                                                  | flicky                  | 1984               | Sega                                                          | System 1                       |                                                                            |
 | md_flicky                       |        | Flicky (Euro, USA)                                                                                                           |                         | 1991               | Sega                                                          | Sega Megadrive                 |                                                                            |
-| md_flickys                      |        | Flicky (Hack, Spanish)                                                                                                       | md_flicky               | 2018               | Sega                                                          | Sega Megadrive                 |                                                                            |
+| md_flickys                      |        | Flicky (Hack, Spanish)                                                                                                       | md_flicky               | 2018               | Wave                                                          | Sega Megadrive                 |                                                                            |
 | cv_flicky                       |        | Flicky (HB)                                                                                                                  |                         | 1984-2018          | Mystery Man - Sega                                            | ColecoVision                   | Published by Team Pixelboy                                                 |
 | msx_flicky                      |        | Flicky (Jpn)                                                                                                                 |                         | 1986               | Micronet                                                      | MSX                            |                                                                            |
 | sg1k_flickya                    |        | Flicky (Jpn, v0)                                                                                                             | sg1k_flicky             | 1984               | Sega                                                          | Sega SG-1000                   |                                                                            |
@@ -5506,7 +5507,6 @@ This list contains all games supported by FinalBurn Neo.
 | sms_fpigarus                    |        | Flight of Pigarus (HB, v1.11)                                                                                                |                         | 2018               | Kagesan                                                       | Sega Master System             |                                                                            |
 | nes_flighint                    |        | Flight of the Intruder (USA)                                                                                                 |                         | 1991               | Mindscape                                                     | Miscellaneous                  |                                                                            |
 | msx_fsim                        |        | Flight Simulator - Gyorai Kougeki (Jpn)                                                                                      |                         | 1988               | subLOGIC                                                      | MSX                            |                                                                            |
-| md_flink                        |        | Flink (Euro)                                                                                                                 |                         | 1994               | Sony Imagesoft                                                | Sega Megadrive                 |                                                                            |
 | spec_flintstones                |        | Flintstones, the (128K)                                                                                                      |                         | 1988               | Grandslam                                                     | ZX Spectrum                    |                                                                            |
 | md_flint                        |        | Flintstones, The (Euro)                                                                                                      |                         | 1993               | Taito                                                         | Sega Megadrive                 |                                                                            |
 | msx_flintstones                 |        | Flintstones, The (Euro)                                                                                                      |                         | 1988               | Grandslam Entertainments                                      | MSX                            |                                                                            |
@@ -9354,7 +9354,7 @@ This list contains all games supported by FinalBurn Neo.
 | metlsavr                        |        | Metal Saver                                                                                                                  |                         | 1994               | First Amusement                                               | Miscellaneous                  |                                                                            |
 | nes_metalslagloj                |        | Metal Slader Glory (Japan)                                                                                                   | nes_metalslaglo         | 1991               | HAL Laboratory                                                | Miscellaneous                  |                                                                            |
 | nes_metalslaglo                 |        | Metal Slader Glory (T-Eng)                                                                                                   |                         | 2018               | Stardust Crusaders                                            | Miscellaneous                  |                                                                            |
-| mslughb                         |        | Metal Slug (HB)                                                                                                              |                         | 2022               | Hack                                                          | Neo Geo AES                    |                                                                            |
+| mslughb                         |        | Metal Slug (HB)                                                                                                              |                         | 2022               | Homebrew                                                      | Neo Geo AES                    |                                                                            |
 | mslugdg                         |        | Metal Slug (Multifunction Hack, 20180430)                                                                                    | mslug                   | 2018               | hack                                                          | Neo Geo MVS                    |                                                                            |
 | ngp_mslug1st                    |        | Metal Slug - 1st Mission (World)                                                                                             |                         | 1999               | SNK                                                           | NeoGeo Pocket Color            |                                                                            |
 | ngp_mslug2ndd                   |        | Metal Slug - 2nd Mission (Demo)                                                                                              | ngp_mslug2nd            | 2000               | SNK                                                           | NeoGeo Pocket Color            |                                                                            |
@@ -9599,6 +9599,7 @@ This list contains all games supported by FinalBurn Neo.
 | mirax                           |        | Mirax (set 1)                                                                                                                |                         | 1985               | Current Technologies                                          | Miscellaneous                  |                                                                            |
 | miraxa                          |        | Mirax (set 2)                                                                                                                | mirax                   | 1985               | Current Technologies                                          | Miscellaneous                  |                                                                            |
 | spec_miremare                   |        | Mire Mare (48K) (HB, v1.09)                                                                                                  |                         | 2020               | Luca Bordoni                                                  | ZX Spectrum                    |                                                                            |
+| md_flink                        |        | Misadventures of Flink, The (Euro)                                                                                           |                         | 1994               | Psygnosis                                                     | Sega Megadrive                 |                                                                            |
 | spec_misifucga                  |        | Misifu Remeow CGA (128K) (HB, v1.4.1)                                                                                        | spec_misifucolor        | 2021               | JSM Soft                                                      | ZX Spectrum                    | Alley Cat demake for ZX Spectrum                                           |
 | spec_misifucolor                |        | Misifu Remeow Color (128K) (HB, v1.4.1)                                                                                      |                         | 2021               | JSM Soft                                                      | ZX Spectrum                    | Alley Cat demake for ZX Spectrum                                           |
 | md_misplaced                    |        | Misplaced (HB, English)                                                                                                      |                         | 2019               | RetroSouls                                                    | Sega Megadrive                 |                                                                            |
@@ -16239,7 +16240,7 @@ This list contains all games supported by FinalBurn Neo.
 | kof99ae                         |        | The King of Fighters '99 Anniversary Edition (hack)                                                                          | kof99                   | 2020               | Yashional                                                     | Neo Geo MVS                    |                                                                            |
 | kof99eur                        |        | The King of Fighters '99 Evolution Ultra Remix (Hack By Yashional)                                                           | kof99                   | 201?               | hack                                                          | Neo Geo MVS                    |                                                                            |
 | kof99eur2                       |        | The King of Fighters '99 Evolution Ultra Remix 2015 (Hack)                                                                   | kof99                   | 2015               | hack                                                          | Neo Geo MVS                    |                                                                            |
-| kof99rp2f                       |        | The King of Fighters '99 Remix Pro V2.0 Final (Hack By FCHT)                                                                 | kof99                   | 2006               | hack                                                          | Neo Geo MVS                    |                                                                            |
+| kof99rp                         |        | The King of Fighters '99 Remix Pro (v2.01 Final)                                                                             | kof99                   | 2022               | Hack                                                          | Neo Geo MVS                    |                                                                            |
 | kof99sr                         |        | The King of Fighters '99 Summer Revolution (Hack By FCHT)                                                                    | kof99                   | 200?               | hack                                                          | Neo Geo MVS                    |                                                                            |
 | md_kof99                        |        | The King of Fighters '99                                                                                                     |                         | 199?               | <unlicensed>                                                  | Sega Megadrive                 |                                                                            |
 | ngp_kofpara                     |        | The King of Fighters - Battle de Paradise (Jpn)                                                                              |                         | 2000               | SNK                                                           | NeoGeo Pocket Color            |                                                                            |
diff --git a/src/dep/generated/driverlist.h b/src/dep/generated/driverlist.h
index 6989a81c5..786bff89a 100644
--- a/src/dep/generated/driverlist.h
+++ b/src/dep/generated/driverlist.h
@@ -1064,6 +1064,7 @@ DRV		BurnDrvMSX_mosquiton;
 DRV		BurnSpecAktomatoes;
 DRV		BurnDrvMSX_aktomatoes;
 DRV		BurnDrvnes_attackiltom;
+DRV		BurnDrvmd_atkpetscii;
 DRV		BurnDrvMSX_Attacked;
 DRV		BurnSpecatvsim;
 DRV		BurnSpecaufwiemo;
@@ -5561,7 +5562,6 @@ DRV		BurnDrvMSX_flidecka;
 DRV		BurnDrvsms_fpigarus;
 DRV		BurnDrvnes_flighint;
 DRV		BurnDrvMSX_fsim;
-DRV		BurnDrvmd_flink;
 DRV		BurnSpecFlintstones;
 DRV		BurnDrvmd_flint;
 DRV		BurnDrvMSX_flintstones;
@@ -9700,6 +9700,7 @@ DRV		BurnDrvnes_miraisen;
 DRV		BurnDrvMirax;
 DRV		BurnDrvMiraxa;
 DRV		BurnSpecMiremare;
+DRV		BurnDrvmd_flink;
 DRV		BurnSpecmisifucga;
 DRV		BurnSpecmisifucolor;
 DRV		BurnDrvmd_misplaced;
@@ -16416,7 +16417,7 @@ DRV		BurnDrvkof99p;
 DRV		BurnDrvkof99ae;
 DRV		BurnDrvkof99eur;
 DRV		BurnDrvkof99eur2;
-DRV		BurnDrvkof99rp2f;
+DRV		BurnDrvkof99rp;
 DRV		BurnDrvkof99sr;
 DRV		BurnDrvmd_kof99;
 DRV		BurnDrvngpc_kofpara;
@@ -19790,6 +19791,7 @@ static struct BurnDriver* pDriver[] = {
 	&BurnSpecAktomatoes,		// Attack of the Killer Tomatoes (48K)
 	&BurnDrvMSX_aktomatoes,		// Attack of the Killer Tomatoes (Euro)
 	&BurnDrvnes_attackiltom,	// Attack of the Killer Tomatoes (USA)
+	&BurnDrvmd_atkpetscii,		// Attack of the Petscii Robots (HB)
 	&BurnDrvMSX_Attacked,		// Attacked
 	&BurnSpecatvsim,			// ATV Simulator - All Terrain Vehicle (48K)
 	&BurnSpecaufwiemo,			// Auf Wiedersehen Monty (128K)
@@ -24157,7 +24159,7 @@ static struct BurnDriver* pDriver[] = {
 	&BurnDrvMSX_fzone,			// Final Zone (Jpn)
 	&BurnDrvMSX_fzonek,			// Final Zone (Kor)
 	&BurnDrvmd_fzone,			// Final Zone (USA) ~ FZ Senki Axis (Jpn)
-	&BurnDrvmd_fzones,			// Final Zone -- FZ Senki Axis (Hack, Spanish)
+	&BurnDrvmd_fzones,			// Final Zone ~ FZ Senki Axis (Hack, Spanish)
 	&BurnDrvFinalizrb,			// Finalizer - Super Transformation (bootleg)
 	&BurnDrvFinalizr,			// Finalizer - Super Transformation (set 1)
 	&BurnDrvFinalizra,			// Finalizer - Super Transformation (set 2)
@@ -24244,7 +24246,7 @@ static struct BurnDriver* pDriver[] = {
 	&BurnDrvCfboy0a1,			// Flash Boy (vertical) [DECO Cassette MD] (No.12/Ver.0/Set.1,Japan)
 	&BurnSpecFlashgordon,		// Flash Gordon (48K)
 	&BurnDrvMSX_flashgor,		// Flash Gordon (Euro)
-	&BurnDrvmd_flashps,			// Flash Point (Hack, Spanish) ( Prototype)
+	&BurnDrvmd_flashps,			// Flash Point (Hack, Spanish)
 	&BurnDrvFpointbj,			// Flash Point (Japan, bootleg)
 	&BurnDrvmd_flashp,			// Flash Point (Jpn, Prototype)
 	&BurnDrvFpoint1d,			// Flash Point (set 1, Japan, FD1094 317-0127A decrypted)
@@ -24287,7 +24289,6 @@ static struct BurnDriver* pDriver[] = {
 	&BurnDrvsms_fpigarus,		// Flight of Pigarus (HB, v1.11)
 	&BurnDrvnes_flighint,		// Flight of the Intruder (USA)
 	&BurnDrvMSX_fsim,			// Flight Simulator - Gyorai Kougeki (Jpn)
-	&BurnDrvmd_flink,			// Flink (Euro)
 	&BurnSpecFlintstones,		// Flintstones, the (128K)
 	&BurnDrvmd_flint,			// Flintstones, The (Euro)
 	&BurnDrvMSX_flintstones,	// Flintstones, The (Euro)
@@ -28426,6 +28427,7 @@ static struct BurnDriver* pDriver[] = {
 	&BurnDrvMirax,				// Mirax (set 1)
 	&BurnDrvMiraxa,				// Mirax (set 2)
 	&BurnSpecMiremare,			// Mire Mare (48K) (HB, v1.09)
+	&BurnDrvmd_flink,			// Misadventures of Flink, The (Euro)
 	&BurnSpecmisifucga,			// Misifu Remeow CGA (128K) (HB, v1.4.1)
 	&BurnSpecmisifucolor,		// Misifu Remeow Color (128K) (HB, v1.4.1)
 	&BurnDrvmd_misplaced,		// Misplaced (HB, English)
@@ -35142,7 +35144,7 @@ static struct BurnDriver* pDriver[] = {
 	&BurnDrvkof99ae,			// The King of Fighters '99 Anniversary Edition (hack)
 	&BurnDrvkof99eur,			// The King of Fighters '99 Evolution Ultra Remix (Hack By Yashional)
 	&BurnDrvkof99eur2,			// The King of Fighters '99 Evolution Ultra Remix 2015 (Hack)
-	&BurnDrvkof99rp2f,			// The King of Fighters '99 Remix Pro V2.0 Final (Hack By FCHT)
+	&BurnDrvkof99rp,			// The King of Fighters '99 Remix Pro (v2.01 Final)
 	&BurnDrvkof99sr,			// The King of Fighters '99 Summer Revolution (Hack By FCHT)
 	&BurnDrvmd_kof99,			// The King of Fighters '99
 	&BurnDrvngpc_kofpara,		// The King of Fighters - Battle de Paradise (Jpn)