From c821b1008e31d40b6d0464f67a3bc0b1a3da4cce Mon Sep 17 00:00:00 2001
From: barbudreadmon <barbudreadmon@gmail.com>
Date: Sat, 20 Apr 2024 08:34:43 +0200
Subject: [PATCH] (libretro) update files

---
 ...urn Neo (ClrMame Pro XML, Arcade only).dat | 201 ++++++++++++++++--
 ...urn Neo (ClrMame Pro XML, Neogeo only).dat | 201 ++++++++++++++++--
 ... Neo (ClrMame Pro XML, PC-Engine only).dat |   9 +
 ...o Light (ClrMame Pro XML, Arcade only).dat | 201 ++++++++++++++++--
 ...o Light (ClrMame Pro XML, Neogeo only).dat | 201 ++++++++++++++++--
 gamelist.txt                                  |  10 +-
 src/burner/libretro/README.md                 |   1 +
 src/burner/libretro/retro_input.cpp           |  34 ++-
 src/burner/libretro/retro_input.h             |   1 +
 src/dep/generated/driverlist.h                |  24 ++-
 10 files changed, 792 insertions(+), 91 deletions(-)

diff --git a/dats/FinalBurn Neo (ClrMame Pro XML, Arcade only).dat b/dats/FinalBurn Neo (ClrMame Pro XML, Arcade only).dat
index 5ad42685a6..0418dc5213 100644
--- a/dats/FinalBurn Neo (ClrMame Pro XML, Arcade only).dat	
+++ b/dats/FinalBurn Neo (ClrMame Pro XML, Arcade only).dat	
@@ -1936,6 +1936,61 @@
 		<video type="raster" orientation="horizontal" width="400" height="256" aspectx="4" aspecty="3"/>
 		<driver status="good"/>
 	</game>
+	<game name="2020bbcd" cloneof="2020bb" romof="2020bb" sourcefile="neogeo/d_neogeo.cpp">
+		<comment>Hack</comment>
+		<description>2020 Super Baseball (Neo CD conversion)</description>
+		<year>1991</year>
+		<manufacturer>hack</manufacturer>
+		<rom name="030-p1ch.p1" size="524288" crc="e13d8a8a"/>
+		<rom name="030-s1.s1" merge="030-s1.s1" size="131072" crc="7015b8fc"/>
+		<rom name="030-c1.c1" merge="030-c1.c1" size="1048576" crc="4f5e19bd"/>
+		<rom name="030-c2.c2" merge="030-c2.c2" size="1048576" crc="d6314bf0"/>
+		<rom name="030-c3.c3" merge="030-c3.c3" size="1048576" crc="47fddfee"/>
+		<rom name="030-c4.c4" merge="030-c4.c4" size="1048576" crc="780d1c4e"/>
+		<rom name="030-m1ch.m1" size="65536" crc="124d7b4f"/>
+		<rom name="030-v1ch.v1" size="1048576" crc="d725a649"/>
+		<rom name="030-v2.v2" merge="030-v2.v2" size="1048576" crc="54994455"/>
+		<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"/>
+		<rom name="sp-u2.sp1" merge="sp-u2.sp1" size="131072" crc="e72943de"/>
+		<rom name="sp1-u2" merge="sp1-u2" size="131072" crc="62f021f4"/>
+		<rom name="sp-e.sp1" merge="sp-e.sp1" size="131072" crc="2723a5b5"/>
+		<rom name="sp1-u4.bin" merge="sp1-u4.bin" size="131072" crc="1179a30f"/>
+		<rom name="sp1-u3.bin" merge="sp1-u3.bin" size="131072" crc="2025b7a2"/>
+		<rom name="vs-bios.rom" merge="vs-bios.rom" size="131072" crc="f0e8f27d"/>
+		<rom name="sp-j2.sp1" merge="sp-j2.sp1" size="131072" crc="acede59c"/>
+		<rom name="sp1.jipan.1024" merge="sp1.jipan.1024" size="131072" crc="9fb0abe4"/>
+		<rom name="sp-45.sp1" merge="sp-45.sp1" size="524288" crc="03cc9f6a"/>
+		<rom name="sp-j3.sp1" merge="sp-j3.sp1" size="524288" crc="486cb450"/>
+		<rom name="japan-j3.bin" merge="japan-j3.bin" size="131072" crc="dff6d41f"/>
+		<rom name="sp1-j3.bin" merge="sp1-j3.bin" size="131072" crc="fbc6d469"/>
+		<rom name="neo-po.bin" merge="neo-po.bin" size="131072" crc="16d0c132"/>
+		<rom name="neo-epo.bin" merge="neo-epo.bin" size="131072" crc="d27a71f1"/>
+		<rom name="neodebug.bin" merge="neodebug.bin" size="131072" crc="698ebb7d"/>
+		<rom name="sp-1v1_3db8c.bin" merge="sp-1v1_3db8c.bin" size="131072" crc="162f0ebe"/>
+		<rom name="uni-bios_4_0.rom" merge="uni-bios_4_0.rom" size="131072" crc="a7aab458"/>
+		<rom name="uni-bios_3_3.rom" merge="uni-bios_3_3.rom" size="131072" crc="24858466"/>
+		<rom name="uni-bios_3_2.rom" merge="uni-bios_3_2.rom" size="131072" crc="a4e8b9b3"/>
+		<rom name="uni-bios_3_1.rom" merge="uni-bios_3_1.rom" size="131072" crc="0c58093f"/>
+		<rom name="uni-bios_3_0.rom" merge="uni-bios_3_0.rom" size="131072" crc="a97c89a9"/>
+		<rom name="uni-bios_2_3.rom" merge="uni-bios_2_3.rom" size="131072" crc="27664eb5"/>
+		<rom name="uni-bios_2_3o.rom" merge="uni-bios_2_3o.rom" size="131072" crc="601720ae"/>
+		<rom name="uni-bios_2_2.rom" merge="uni-bios_2_2.rom" size="131072" crc="2d50996a"/>
+		<rom name="uni-bios_2_1.rom" merge="uni-bios_2_1.rom" size="131072" crc="8dabf76b"/>
+		<rom name="uni-bios_2_0.rom" merge="uni-bios_2_0.rom" size="131072" crc="0c12c2ad"/>
+		<rom name="uni-bios_1_3.rom" merge="uni-bios_1_3.rom" size="131072" crc="b24b44a0"/>
+		<rom name="uni-bios_1_2.rom" merge="uni-bios_1_2.rom" size="131072" crc="4fa698e9"/>
+		<rom name="uni-bios_1_2o.rom" merge="uni-bios_1_2o.rom" size="131072" crc="e19d3ce9"/>
+		<rom name="uni-bios_1_1.rom" merge="uni-bios_1_1.rom" size="131072" crc="5dda0d84"/>
+		<rom name="uni-bios_1_0.rom" merge="uni-bios_1_0.rom" size="131072" crc="0ce453a0"/>
+		<rom name="neopen.sp1" merge="neopen.sp1" size="131072" crc="cb915e76"/>
+		<rom name="sm1.sm1" merge="sm1.sm1" size="131072" crc="94416d67"/>
+		<rom name="sfix.sfix" merge="sfix.sfix" size="131072" crc="c2ea0cfd"/>
+		<rom name="000-lo.lo" merge="000-lo.lo" size="131072" crc="5a86cff2"/>
+		<video type="raster" orientation="horizontal" width="304" height="224" aspectx="4" aspecty="3"/>
+		<driver status="good"/>
+	</game>
 	<game name="2020bb" romof="neogeo" sourcefile="neogeo/d_neogeo.cpp">
 		<description>2020 Super Baseball (set 1)</description>
 		<year>1991</year>
@@ -2821,6 +2876,58 @@
 		<video type="raster" orientation="vertical" width="224" height="288" aspectx="3" aspecty="4"/>
 		<driver status="good"/>
 	</game>
+	<game name="abyssali" romof="neogeo" sourcefile="neogeo/d_neogeo.cpp">
+		<comment>Homebrew</comment>
+		<description>Abyssal Infants</description>
+		<year>2021</year>
+		<manufacturer>Kako Eimon</manufacturer>
+		<rom name="aby-p1.p1" size="524288" crc="a8a2a8a6"/>
+		<rom name="aby-s1.s1" size="131072" crc="1ebbb83e"/>
+		<rom name="aby-c1.c1" size="2097152" crc="24dabe27"/>
+		<rom name="aby-c2.c1" size="2097152" crc="bbdacc24"/>
+		<rom name="aby-m1.m1" size="131072" crc="3ddf772b"/>
+		<rom name="aby-v1.v1" size="2097152" crc="1fae3797"/>
+		<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"/>
+		<rom name="sp-u2.sp1" merge="sp-u2.sp1" size="131072" crc="e72943de"/>
+		<rom name="sp1-u2" merge="sp1-u2" size="131072" crc="62f021f4"/>
+		<rom name="sp-e.sp1" merge="sp-e.sp1" size="131072" crc="2723a5b5"/>
+		<rom name="sp1-u4.bin" merge="sp1-u4.bin" size="131072" crc="1179a30f"/>
+		<rom name="sp1-u3.bin" merge="sp1-u3.bin" size="131072" crc="2025b7a2"/>
+		<rom name="vs-bios.rom" merge="vs-bios.rom" size="131072" crc="f0e8f27d"/>
+		<rom name="sp-j2.sp1" merge="sp-j2.sp1" size="131072" crc="acede59c"/>
+		<rom name="sp1.jipan.1024" merge="sp1.jipan.1024" size="131072" crc="9fb0abe4"/>
+		<rom name="sp-45.sp1" merge="sp-45.sp1" size="524288" crc="03cc9f6a"/>
+		<rom name="sp-j3.sp1" merge="sp-j3.sp1" size="524288" crc="486cb450"/>
+		<rom name="japan-j3.bin" merge="japan-j3.bin" size="131072" crc="dff6d41f"/>
+		<rom name="sp1-j3.bin" merge="sp1-j3.bin" size="131072" crc="fbc6d469"/>
+		<rom name="neo-po.bin" merge="neo-po.bin" size="131072" crc="16d0c132"/>
+		<rom name="neo-epo.bin" merge="neo-epo.bin" size="131072" crc="d27a71f1"/>
+		<rom name="neodebug.bin" merge="neodebug.bin" size="131072" crc="698ebb7d"/>
+		<rom name="sp-1v1_3db8c.bin" merge="sp-1v1_3db8c.bin" size="131072" crc="162f0ebe"/>
+		<rom name="uni-bios_4_0.rom" merge="uni-bios_4_0.rom" size="131072" crc="a7aab458"/>
+		<rom name="uni-bios_3_3.rom" merge="uni-bios_3_3.rom" size="131072" crc="24858466"/>
+		<rom name="uni-bios_3_2.rom" merge="uni-bios_3_2.rom" size="131072" crc="a4e8b9b3"/>
+		<rom name="uni-bios_3_1.rom" merge="uni-bios_3_1.rom" size="131072" crc="0c58093f"/>
+		<rom name="uni-bios_3_0.rom" merge="uni-bios_3_0.rom" size="131072" crc="a97c89a9"/>
+		<rom name="uni-bios_2_3.rom" merge="uni-bios_2_3.rom" size="131072" crc="27664eb5"/>
+		<rom name="uni-bios_2_3o.rom" merge="uni-bios_2_3o.rom" size="131072" crc="601720ae"/>
+		<rom name="uni-bios_2_2.rom" merge="uni-bios_2_2.rom" size="131072" crc="2d50996a"/>
+		<rom name="uni-bios_2_1.rom" merge="uni-bios_2_1.rom" size="131072" crc="8dabf76b"/>
+		<rom name="uni-bios_2_0.rom" merge="uni-bios_2_0.rom" size="131072" crc="0c12c2ad"/>
+		<rom name="uni-bios_1_3.rom" merge="uni-bios_1_3.rom" size="131072" crc="b24b44a0"/>
+		<rom name="uni-bios_1_2.rom" merge="uni-bios_1_2.rom" size="131072" crc="4fa698e9"/>
+		<rom name="uni-bios_1_2o.rom" merge="uni-bios_1_2o.rom" size="131072" crc="e19d3ce9"/>
+		<rom name="uni-bios_1_1.rom" merge="uni-bios_1_1.rom" size="131072" crc="5dda0d84"/>
+		<rom name="uni-bios_1_0.rom" merge="uni-bios_1_0.rom" size="131072" crc="0ce453a0"/>
+		<rom name="neopen.sp1" merge="neopen.sp1" size="131072" crc="cb915e76"/>
+		<rom name="sm1.sm1" merge="sm1.sm1" size="131072" crc="94416d67"/>
+		<rom name="sfix.sfix" merge="sfix.sfix" size="131072" crc="c2ea0cfd"/>
+		<rom name="000-lo.lo" merge="000-lo.lo" size="131072" crc="5a86cff2"/>
+		<video type="raster" orientation="horizontal" width="304" height="224" aspectx="4" aspecty="3"/>
+		<driver status="good"/>
+	</game>
 	<game name="aceattac" sourcefile="sega/d_sys16b.cpp">
 		<description>Ace Attacker (FD1094 317-0059)</description>
 		<year>1988</year>
@@ -92090,13 +92197,13 @@
 		<video type="raster" orientation="horizontal" width="304" height="224" aspectx="4" aspecty="3"/>
 		<driver status="good"/>
 	</game>
-	<game name="mslugfc2" cloneof="mslug" romof="mslug" sourcefile="neogeo/d_neogeo.cpp">
+	<game name="mslugdg" cloneof="mslug" romof="mslug" sourcefile="neogeo/d_neogeo.cpp">
 		<comment>Hack</comment>
-		<description>Metal Slug - Super Vehicle-001 (Item Random &amp; Powerful Enemy Defense FC2, Hack)</description>
-		<year>2024</year>
+		<description>Metal Slug - Super Vehicle-001 (Multifunction, Hack)</description>
+		<year>2018</year>
 		<manufacturer>hack</manufacturer>
-		<rom name="201-p1fc2.p1" size="1048576" crc="b079dd40"/>
-		<rom name="201-p2fc2.sp2" size="1048576" crc="8211a964"/>
+		<rom name="201-p1dg.p1" size="1048576" crc="7f66b97f"/>
+		<rom name="201-p2dg.sp2" size="1048576" crc="c3cb544c"/>
 		<rom name="201-s1.s1" merge="201-s1.s1" size="131072" crc="2f55958d"/>
 		<rom name="201-c1.c1" merge="201-c1.c1" size="4194304" crc="72813676"/>
 		<rom name="201-c2.c2" merge="201-c2.c2" size="4194304" crc="96f62574"/>
@@ -92146,13 +92253,13 @@
 		<video type="raster" orientation="horizontal" width="304" height="224" aspectx="4" aspecty="3"/>
 		<driver status="good"/>
 	</game>
-	<game name="mslugfc1" cloneof="mslug" romof="mslug" sourcefile="neogeo/d_neogeo.cpp">
+	<game name="msqyfc1" cloneof="mslug" romof="mslug" sourcefile="neogeo/d_neogeo.cpp">
 		<comment>Hack</comment>
-		<description>Metal Slug - Super Vehicle-001 (Item Random FC2, Hack)</description>
+		<description>Metal Slug - Super Vehicle-001 (Origins Item Random, Hack)</description>
 		<year>2024</year>
-		<manufacturer>hack</manufacturer>
-		<rom name="201-p1fc1.p1" size="1048576" crc="db8f7d81"/>
-		<rom name="201-p2fc1.sp2" size="1048576" crc="f3d34029"/>
+		<manufacturer>Alice</manufacturer>
+		<rom name="201-p1qyfc1.p1" size="1048576" crc="4f107600"/>
+		<rom name="201-p2dgfc1.sp2" size="1048576" crc="f0b93488"/>
 		<rom name="201-s1.s1" merge="201-s1.s1" size="131072" crc="2f55958d"/>
 		<rom name="201-c1.c1" merge="201-c1.c1" size="4194304" crc="72813676"/>
 		<rom name="201-c2.c2" merge="201-c2.c2" size="4194304" crc="96f62574"/>
@@ -92202,12 +92309,12 @@
 		<video type="raster" orientation="horizontal" width="304" height="224" aspectx="4" aspecty="3"/>
 		<driver status="good"/>
 	</game>
-	<game name="mslugdg" cloneof="mslug" romof="mslug" sourcefile="neogeo/d_neogeo.cpp">
+	<game name="mslugqy" cloneof="mslug" romof="mslug" sourcefile="neogeo/d_neogeo.cpp">
 		<comment>Hack</comment>
-		<description>Metal Slug - Super Vehicle-001 (Multifunction, Hack)</description>
-		<year>2018</year>
+		<description>Metal Slug - Super Vehicle-001 (Origins, Hack)</description>
+		<year>2024</year>
 		<manufacturer>hack</manufacturer>
-		<rom name="201-p1dg.p1" size="1048576" crc="7f66b97f"/>
+		<rom name="201-p1qy.p1" size="1048576" crc="16068dc1"/>
 		<rom name="201-p2dg.sp2" size="1048576" crc="c3cb544c"/>
 		<rom name="201-s1.s1" merge="201-s1.s1" size="131072" crc="2f55958d"/>
 		<rom name="201-c1.c1" merge="201-c1.c1" size="4194304" crc="72813676"/>
@@ -92258,13 +92365,69 @@
 		<video type="raster" orientation="horizontal" width="304" height="224" aspectx="4" aspecty="3"/>
 		<driver status="good"/>
 	</game>
-	<game name="mslugqy" cloneof="mslug" romof="mslug" sourcefile="neogeo/d_neogeo.cpp">
+	<game name="mslugfc2" cloneof="mslug" romof="mslug" sourcefile="neogeo/d_neogeo.cpp">
 		<comment>Hack</comment>
-		<description>Metal Slug - Super Vehicle-001 (Origins, Hack)</description>
+		<description>Metal Slug - Super Vehicle-001 (Random Item &amp; Powerful Enemy Defense, Hack)</description>
 		<year>2024</year>
-		<manufacturer>hack</manufacturer>
-		<rom name="201-p1qy.p1" size="1048576" crc="16068dc1"/>
-		<rom name="201-p2dg.sp2" size="1048576" crc="c3cb544c"/>
+		<manufacturer>Alice</manufacturer>
+		<rom name="201-p1fc2.p1" size="1048576" crc="4d86e27f"/>
+		<rom name="201-p2fc2.sp2" size="1048576" crc="14b67778"/>
+		<rom name="201-s1.s1" merge="201-s1.s1" size="131072" crc="2f55958d"/>
+		<rom name="201-c1.c1" merge="201-c1.c1" size="4194304" crc="72813676"/>
+		<rom name="201-c2.c2" merge="201-c2.c2" size="4194304" crc="96f62574"/>
+		<rom name="201-c3.c3" merge="201-c3.c3" size="4194304" crc="5121456a"/>
+		<rom name="201-c4.c4" merge="201-c4.c4" size="4194304" crc="f4ad59a3"/>
+		<rom name="201-m1.m1" merge="201-m1.m1" size="131072" crc="c28b3253"/>
+		<rom name="201-v1.v1" merge="201-v1.v1" size="4194304" crc="23d22ed1"/>
+		<rom name="201-v2.v2" merge="201-v2.v2" size="4194304" crc="472cf9db"/>
+		<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"/>
+		<rom name="sp-u2.sp1" merge="sp-u2.sp1" size="131072" crc="e72943de"/>
+		<rom name="sp1-u2" merge="sp1-u2" size="131072" crc="62f021f4"/>
+		<rom name="sp-e.sp1" merge="sp-e.sp1" size="131072" crc="2723a5b5"/>
+		<rom name="sp1-u4.bin" merge="sp1-u4.bin" size="131072" crc="1179a30f"/>
+		<rom name="sp1-u3.bin" merge="sp1-u3.bin" size="131072" crc="2025b7a2"/>
+		<rom name="vs-bios.rom" merge="vs-bios.rom" size="131072" crc="f0e8f27d"/>
+		<rom name="sp-j2.sp1" merge="sp-j2.sp1" size="131072" crc="acede59c"/>
+		<rom name="sp1.jipan.1024" merge="sp1.jipan.1024" size="131072" crc="9fb0abe4"/>
+		<rom name="sp-45.sp1" merge="sp-45.sp1" size="524288" crc="03cc9f6a"/>
+		<rom name="sp-j3.sp1" merge="sp-j3.sp1" size="524288" crc="486cb450"/>
+		<rom name="japan-j3.bin" merge="japan-j3.bin" size="131072" crc="dff6d41f"/>
+		<rom name="sp1-j3.bin" merge="sp1-j3.bin" size="131072" crc="fbc6d469"/>
+		<rom name="neo-po.bin" merge="neo-po.bin" size="131072" crc="16d0c132"/>
+		<rom name="neo-epo.bin" merge="neo-epo.bin" size="131072" crc="d27a71f1"/>
+		<rom name="neodebug.bin" merge="neodebug.bin" size="131072" crc="698ebb7d"/>
+		<rom name="sp-1v1_3db8c.bin" merge="sp-1v1_3db8c.bin" size="131072" crc="162f0ebe"/>
+		<rom name="uni-bios_4_0.rom" merge="uni-bios_4_0.rom" size="131072" crc="a7aab458"/>
+		<rom name="uni-bios_3_3.rom" merge="uni-bios_3_3.rom" size="131072" crc="24858466"/>
+		<rom name="uni-bios_3_2.rom" merge="uni-bios_3_2.rom" size="131072" crc="a4e8b9b3"/>
+		<rom name="uni-bios_3_1.rom" merge="uni-bios_3_1.rom" size="131072" crc="0c58093f"/>
+		<rom name="uni-bios_3_0.rom" merge="uni-bios_3_0.rom" size="131072" crc="a97c89a9"/>
+		<rom name="uni-bios_2_3.rom" merge="uni-bios_2_3.rom" size="131072" crc="27664eb5"/>
+		<rom name="uni-bios_2_3o.rom" merge="uni-bios_2_3o.rom" size="131072" crc="601720ae"/>
+		<rom name="uni-bios_2_2.rom" merge="uni-bios_2_2.rom" size="131072" crc="2d50996a"/>
+		<rom name="uni-bios_2_1.rom" merge="uni-bios_2_1.rom" size="131072" crc="8dabf76b"/>
+		<rom name="uni-bios_2_0.rom" merge="uni-bios_2_0.rom" size="131072" crc="0c12c2ad"/>
+		<rom name="uni-bios_1_3.rom" merge="uni-bios_1_3.rom" size="131072" crc="b24b44a0"/>
+		<rom name="uni-bios_1_2.rom" merge="uni-bios_1_2.rom" size="131072" crc="4fa698e9"/>
+		<rom name="uni-bios_1_2o.rom" merge="uni-bios_1_2o.rom" size="131072" crc="e19d3ce9"/>
+		<rom name="uni-bios_1_1.rom" merge="uni-bios_1_1.rom" size="131072" crc="5dda0d84"/>
+		<rom name="uni-bios_1_0.rom" merge="uni-bios_1_0.rom" size="131072" crc="0ce453a0"/>
+		<rom name="neopen.sp1" merge="neopen.sp1" size="131072" crc="cb915e76"/>
+		<rom name="sm1.sm1" merge="sm1.sm1" size="131072" crc="94416d67"/>
+		<rom name="sfix.sfix" merge="sfix.sfix" size="131072" crc="c2ea0cfd"/>
+		<rom name="000-lo.lo" merge="000-lo.lo" size="131072" crc="5a86cff2"/>
+		<video type="raster" orientation="horizontal" width="304" height="224" aspectx="4" aspecty="3"/>
+		<driver status="good"/>
+	</game>
+	<game name="mslugfc1" cloneof="mslug" romof="mslug" sourcefile="neogeo/d_neogeo.cpp">
+		<comment>Hack</comment>
+		<description>Metal Slug - Super Vehicle-001 (Random Item, Hack)</description>
+		<year>2024</year>
+		<manufacturer>Alice</manufacturer>
+		<rom name="201-p1fc1.p1" size="1048576" crc="267042be"/>
+		<rom name="201-p2fc1.sp2" size="1048576" crc="65749e35"/>
 		<rom name="201-s1.s1" merge="201-s1.s1" size="131072" crc="2f55958d"/>
 		<rom name="201-c1.c1" merge="201-c1.c1" size="4194304" crc="72813676"/>
 		<rom name="201-c2.c2" merge="201-c2.c2" size="4194304" crc="96f62574"/>
diff --git a/dats/FinalBurn Neo (ClrMame Pro XML, Neogeo only).dat b/dats/FinalBurn Neo (ClrMame Pro XML, Neogeo only).dat
index 67aa35efb6..99c34c44ef 100644
--- a/dats/FinalBurn Neo (ClrMame Pro XML, Neogeo only).dat	
+++ b/dats/FinalBurn Neo (ClrMame Pro XML, Neogeo only).dat	
@@ -118,6 +118,61 @@
 		<video type="raster" orientation="horizontal" width="304" height="224" aspectx="4" aspecty="3"/>
 		<driver status="good"/>
 	</game>
+	<game name="2020bbcd" cloneof="2020bb" romof="2020bb" sourcefile="neogeo/d_neogeo.cpp">
+		<comment>Hack</comment>
+		<description>2020 Super Baseball (Neo CD conversion)</description>
+		<year>1991</year>
+		<manufacturer>hack</manufacturer>
+		<rom name="030-p1ch.p1" size="524288" crc="e13d8a8a"/>
+		<rom name="030-s1.s1" merge="030-s1.s1" size="131072" crc="7015b8fc"/>
+		<rom name="030-c1.c1" merge="030-c1.c1" size="1048576" crc="4f5e19bd"/>
+		<rom name="030-c2.c2" merge="030-c2.c2" size="1048576" crc="d6314bf0"/>
+		<rom name="030-c3.c3" merge="030-c3.c3" size="1048576" crc="47fddfee"/>
+		<rom name="030-c4.c4" merge="030-c4.c4" size="1048576" crc="780d1c4e"/>
+		<rom name="030-m1ch.m1" size="65536" crc="124d7b4f"/>
+		<rom name="030-v1ch.v1" size="1048576" crc="d725a649"/>
+		<rom name="030-v2.v2" merge="030-v2.v2" size="1048576" crc="54994455"/>
+		<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"/>
+		<rom name="sp-u2.sp1" merge="sp-u2.sp1" size="131072" crc="e72943de"/>
+		<rom name="sp1-u2" merge="sp1-u2" size="131072" crc="62f021f4"/>
+		<rom name="sp-e.sp1" merge="sp-e.sp1" size="131072" crc="2723a5b5"/>
+		<rom name="sp1-u4.bin" merge="sp1-u4.bin" size="131072" crc="1179a30f"/>
+		<rom name="sp1-u3.bin" merge="sp1-u3.bin" size="131072" crc="2025b7a2"/>
+		<rom name="vs-bios.rom" merge="vs-bios.rom" size="131072" crc="f0e8f27d"/>
+		<rom name="sp-j2.sp1" merge="sp-j2.sp1" size="131072" crc="acede59c"/>
+		<rom name="sp1.jipan.1024" merge="sp1.jipan.1024" size="131072" crc="9fb0abe4"/>
+		<rom name="sp-45.sp1" merge="sp-45.sp1" size="524288" crc="03cc9f6a"/>
+		<rom name="sp-j3.sp1" merge="sp-j3.sp1" size="524288" crc="486cb450"/>
+		<rom name="japan-j3.bin" merge="japan-j3.bin" size="131072" crc="dff6d41f"/>
+		<rom name="sp1-j3.bin" merge="sp1-j3.bin" size="131072" crc="fbc6d469"/>
+		<rom name="neo-po.bin" merge="neo-po.bin" size="131072" crc="16d0c132"/>
+		<rom name="neo-epo.bin" merge="neo-epo.bin" size="131072" crc="d27a71f1"/>
+		<rom name="neodebug.bin" merge="neodebug.bin" size="131072" crc="698ebb7d"/>
+		<rom name="sp-1v1_3db8c.bin" merge="sp-1v1_3db8c.bin" size="131072" crc="162f0ebe"/>
+		<rom name="uni-bios_4_0.rom" merge="uni-bios_4_0.rom" size="131072" crc="a7aab458"/>
+		<rom name="uni-bios_3_3.rom" merge="uni-bios_3_3.rom" size="131072" crc="24858466"/>
+		<rom name="uni-bios_3_2.rom" merge="uni-bios_3_2.rom" size="131072" crc="a4e8b9b3"/>
+		<rom name="uni-bios_3_1.rom" merge="uni-bios_3_1.rom" size="131072" crc="0c58093f"/>
+		<rom name="uni-bios_3_0.rom" merge="uni-bios_3_0.rom" size="131072" crc="a97c89a9"/>
+		<rom name="uni-bios_2_3.rom" merge="uni-bios_2_3.rom" size="131072" crc="27664eb5"/>
+		<rom name="uni-bios_2_3o.rom" merge="uni-bios_2_3o.rom" size="131072" crc="601720ae"/>
+		<rom name="uni-bios_2_2.rom" merge="uni-bios_2_2.rom" size="131072" crc="2d50996a"/>
+		<rom name="uni-bios_2_1.rom" merge="uni-bios_2_1.rom" size="131072" crc="8dabf76b"/>
+		<rom name="uni-bios_2_0.rom" merge="uni-bios_2_0.rom" size="131072" crc="0c12c2ad"/>
+		<rom name="uni-bios_1_3.rom" merge="uni-bios_1_3.rom" size="131072" crc="b24b44a0"/>
+		<rom name="uni-bios_1_2.rom" merge="uni-bios_1_2.rom" size="131072" crc="4fa698e9"/>
+		<rom name="uni-bios_1_2o.rom" merge="uni-bios_1_2o.rom" size="131072" crc="e19d3ce9"/>
+		<rom name="uni-bios_1_1.rom" merge="uni-bios_1_1.rom" size="131072" crc="5dda0d84"/>
+		<rom name="uni-bios_1_0.rom" merge="uni-bios_1_0.rom" size="131072" crc="0ce453a0"/>
+		<rom name="neopen.sp1" merge="neopen.sp1" size="131072" crc="cb915e76"/>
+		<rom name="sm1.sm1" merge="sm1.sm1" size="131072" crc="94416d67"/>
+		<rom name="sfix.sfix" merge="sfix.sfix" size="131072" crc="c2ea0cfd"/>
+		<rom name="000-lo.lo" merge="000-lo.lo" size="131072" crc="5a86cff2"/>
+		<video type="raster" orientation="horizontal" width="304" height="224" aspectx="4" aspecty="3"/>
+		<driver status="good"/>
+	</game>
 	<game name="2020bb" romof="neogeo" sourcefile="neogeo/d_neogeo.cpp">
 		<description>2020 Super Baseball (set 1)</description>
 		<year>1991</year>
@@ -492,6 +547,58 @@
 		<video type="raster" orientation="horizontal" width="304" height="224" aspectx="4" aspecty="3"/>
 		<driver status="good"/>
 	</game>
+	<game name="abyssali" romof="neogeo" sourcefile="neogeo/d_neogeo.cpp">
+		<comment>Homebrew</comment>
+		<description>Abyssal Infants</description>
+		<year>2021</year>
+		<manufacturer>Kako Eimon</manufacturer>
+		<rom name="aby-p1.p1" size="524288" crc="a8a2a8a6"/>
+		<rom name="aby-s1.s1" size="131072" crc="1ebbb83e"/>
+		<rom name="aby-c1.c1" size="2097152" crc="24dabe27"/>
+		<rom name="aby-c2.c1" size="2097152" crc="bbdacc24"/>
+		<rom name="aby-m1.m1" size="131072" crc="3ddf772b"/>
+		<rom name="aby-v1.v1" size="2097152" crc="1fae3797"/>
+		<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"/>
+		<rom name="sp-u2.sp1" merge="sp-u2.sp1" size="131072" crc="e72943de"/>
+		<rom name="sp1-u2" merge="sp1-u2" size="131072" crc="62f021f4"/>
+		<rom name="sp-e.sp1" merge="sp-e.sp1" size="131072" crc="2723a5b5"/>
+		<rom name="sp1-u4.bin" merge="sp1-u4.bin" size="131072" crc="1179a30f"/>
+		<rom name="sp1-u3.bin" merge="sp1-u3.bin" size="131072" crc="2025b7a2"/>
+		<rom name="vs-bios.rom" merge="vs-bios.rom" size="131072" crc="f0e8f27d"/>
+		<rom name="sp-j2.sp1" merge="sp-j2.sp1" size="131072" crc="acede59c"/>
+		<rom name="sp1.jipan.1024" merge="sp1.jipan.1024" size="131072" crc="9fb0abe4"/>
+		<rom name="sp-45.sp1" merge="sp-45.sp1" size="524288" crc="03cc9f6a"/>
+		<rom name="sp-j3.sp1" merge="sp-j3.sp1" size="524288" crc="486cb450"/>
+		<rom name="japan-j3.bin" merge="japan-j3.bin" size="131072" crc="dff6d41f"/>
+		<rom name="sp1-j3.bin" merge="sp1-j3.bin" size="131072" crc="fbc6d469"/>
+		<rom name="neo-po.bin" merge="neo-po.bin" size="131072" crc="16d0c132"/>
+		<rom name="neo-epo.bin" merge="neo-epo.bin" size="131072" crc="d27a71f1"/>
+		<rom name="neodebug.bin" merge="neodebug.bin" size="131072" crc="698ebb7d"/>
+		<rom name="sp-1v1_3db8c.bin" merge="sp-1v1_3db8c.bin" size="131072" crc="162f0ebe"/>
+		<rom name="uni-bios_4_0.rom" merge="uni-bios_4_0.rom" size="131072" crc="a7aab458"/>
+		<rom name="uni-bios_3_3.rom" merge="uni-bios_3_3.rom" size="131072" crc="24858466"/>
+		<rom name="uni-bios_3_2.rom" merge="uni-bios_3_2.rom" size="131072" crc="a4e8b9b3"/>
+		<rom name="uni-bios_3_1.rom" merge="uni-bios_3_1.rom" size="131072" crc="0c58093f"/>
+		<rom name="uni-bios_3_0.rom" merge="uni-bios_3_0.rom" size="131072" crc="a97c89a9"/>
+		<rom name="uni-bios_2_3.rom" merge="uni-bios_2_3.rom" size="131072" crc="27664eb5"/>
+		<rom name="uni-bios_2_3o.rom" merge="uni-bios_2_3o.rom" size="131072" crc="601720ae"/>
+		<rom name="uni-bios_2_2.rom" merge="uni-bios_2_2.rom" size="131072" crc="2d50996a"/>
+		<rom name="uni-bios_2_1.rom" merge="uni-bios_2_1.rom" size="131072" crc="8dabf76b"/>
+		<rom name="uni-bios_2_0.rom" merge="uni-bios_2_0.rom" size="131072" crc="0c12c2ad"/>
+		<rom name="uni-bios_1_3.rom" merge="uni-bios_1_3.rom" size="131072" crc="b24b44a0"/>
+		<rom name="uni-bios_1_2.rom" merge="uni-bios_1_2.rom" size="131072" crc="4fa698e9"/>
+		<rom name="uni-bios_1_2o.rom" merge="uni-bios_1_2o.rom" size="131072" crc="e19d3ce9"/>
+		<rom name="uni-bios_1_1.rom" merge="uni-bios_1_1.rom" size="131072" crc="5dda0d84"/>
+		<rom name="uni-bios_1_0.rom" merge="uni-bios_1_0.rom" size="131072" crc="0ce453a0"/>
+		<rom name="neopen.sp1" merge="neopen.sp1" size="131072" crc="cb915e76"/>
+		<rom name="sm1.sm1" merge="sm1.sm1" size="131072" crc="94416d67"/>
+		<rom name="sfix.sfix" merge="sfix.sfix" size="131072" crc="c2ea0cfd"/>
+		<rom name="000-lo.lo" merge="000-lo.lo" size="131072" crc="5a86cff2"/>
+		<video type="raster" orientation="horizontal" width="304" height="224" aspectx="4" aspecty="3"/>
+		<driver status="good"/>
+	</game>
 	<game name="sonicwi2" romof="neogeo" sourcefile="neogeo/d_neogeo.cpp">
 		<description>Aero Fighters 2 / Sonic Wings 2</description>
 		<year>1994</year>
@@ -8742,13 +8849,13 @@
 		<video type="raster" orientation="horizontal" width="304" height="224" aspectx="4" aspecty="3"/>
 		<driver status="good"/>
 	</game>
-	<game name="mslugfc2" cloneof="mslug" romof="mslug" sourcefile="neogeo/d_neogeo.cpp">
+	<game name="mslugdg" cloneof="mslug" romof="mslug" sourcefile="neogeo/d_neogeo.cpp">
 		<comment>Hack</comment>
-		<description>Metal Slug - Super Vehicle-001 (Item Random &amp; Powerful Enemy Defense FC2, Hack)</description>
-		<year>2024</year>
+		<description>Metal Slug - Super Vehicle-001 (Multifunction, Hack)</description>
+		<year>2018</year>
 		<manufacturer>hack</manufacturer>
-		<rom name="201-p1fc2.p1" size="1048576" crc="b079dd40"/>
-		<rom name="201-p2fc2.sp2" size="1048576" crc="8211a964"/>
+		<rom name="201-p1dg.p1" size="1048576" crc="7f66b97f"/>
+		<rom name="201-p2dg.sp2" size="1048576" crc="c3cb544c"/>
 		<rom name="201-s1.s1" merge="201-s1.s1" size="131072" crc="2f55958d"/>
 		<rom name="201-c1.c1" merge="201-c1.c1" size="4194304" crc="72813676"/>
 		<rom name="201-c2.c2" merge="201-c2.c2" size="4194304" crc="96f62574"/>
@@ -8798,13 +8905,13 @@
 		<video type="raster" orientation="horizontal" width="304" height="224" aspectx="4" aspecty="3"/>
 		<driver status="good"/>
 	</game>
-	<game name="mslugfc1" cloneof="mslug" romof="mslug" sourcefile="neogeo/d_neogeo.cpp">
+	<game name="msqyfc1" cloneof="mslug" romof="mslug" sourcefile="neogeo/d_neogeo.cpp">
 		<comment>Hack</comment>
-		<description>Metal Slug - Super Vehicle-001 (Item Random FC2, Hack)</description>
+		<description>Metal Slug - Super Vehicle-001 (Origins Item Random, Hack)</description>
 		<year>2024</year>
-		<manufacturer>hack</manufacturer>
-		<rom name="201-p1fc1.p1" size="1048576" crc="db8f7d81"/>
-		<rom name="201-p2fc1.sp2" size="1048576" crc="f3d34029"/>
+		<manufacturer>Alice</manufacturer>
+		<rom name="201-p1qyfc1.p1" size="1048576" crc="4f107600"/>
+		<rom name="201-p2dgfc1.sp2" size="1048576" crc="f0b93488"/>
 		<rom name="201-s1.s1" merge="201-s1.s1" size="131072" crc="2f55958d"/>
 		<rom name="201-c1.c1" merge="201-c1.c1" size="4194304" crc="72813676"/>
 		<rom name="201-c2.c2" merge="201-c2.c2" size="4194304" crc="96f62574"/>
@@ -8854,12 +8961,12 @@
 		<video type="raster" orientation="horizontal" width="304" height="224" aspectx="4" aspecty="3"/>
 		<driver status="good"/>
 	</game>
-	<game name="mslugdg" cloneof="mslug" romof="mslug" sourcefile="neogeo/d_neogeo.cpp">
+	<game name="mslugqy" cloneof="mslug" romof="mslug" sourcefile="neogeo/d_neogeo.cpp">
 		<comment>Hack</comment>
-		<description>Metal Slug - Super Vehicle-001 (Multifunction, Hack)</description>
-		<year>2018</year>
+		<description>Metal Slug - Super Vehicle-001 (Origins, Hack)</description>
+		<year>2024</year>
 		<manufacturer>hack</manufacturer>
-		<rom name="201-p1dg.p1" size="1048576" crc="7f66b97f"/>
+		<rom name="201-p1qy.p1" size="1048576" crc="16068dc1"/>
 		<rom name="201-p2dg.sp2" size="1048576" crc="c3cb544c"/>
 		<rom name="201-s1.s1" merge="201-s1.s1" size="131072" crc="2f55958d"/>
 		<rom name="201-c1.c1" merge="201-c1.c1" size="4194304" crc="72813676"/>
@@ -8910,13 +9017,69 @@
 		<video type="raster" orientation="horizontal" width="304" height="224" aspectx="4" aspecty="3"/>
 		<driver status="good"/>
 	</game>
-	<game name="mslugqy" cloneof="mslug" romof="mslug" sourcefile="neogeo/d_neogeo.cpp">
+	<game name="mslugfc2" cloneof="mslug" romof="mslug" sourcefile="neogeo/d_neogeo.cpp">
 		<comment>Hack</comment>
-		<description>Metal Slug - Super Vehicle-001 (Origins, Hack)</description>
+		<description>Metal Slug - Super Vehicle-001 (Random Item &amp; Powerful Enemy Defense, Hack)</description>
 		<year>2024</year>
-		<manufacturer>hack</manufacturer>
-		<rom name="201-p1qy.p1" size="1048576" crc="16068dc1"/>
-		<rom name="201-p2dg.sp2" size="1048576" crc="c3cb544c"/>
+		<manufacturer>Alice</manufacturer>
+		<rom name="201-p1fc2.p1" size="1048576" crc="4d86e27f"/>
+		<rom name="201-p2fc2.sp2" size="1048576" crc="14b67778"/>
+		<rom name="201-s1.s1" merge="201-s1.s1" size="131072" crc="2f55958d"/>
+		<rom name="201-c1.c1" merge="201-c1.c1" size="4194304" crc="72813676"/>
+		<rom name="201-c2.c2" merge="201-c2.c2" size="4194304" crc="96f62574"/>
+		<rom name="201-c3.c3" merge="201-c3.c3" size="4194304" crc="5121456a"/>
+		<rom name="201-c4.c4" merge="201-c4.c4" size="4194304" crc="f4ad59a3"/>
+		<rom name="201-m1.m1" merge="201-m1.m1" size="131072" crc="c28b3253"/>
+		<rom name="201-v1.v1" merge="201-v1.v1" size="4194304" crc="23d22ed1"/>
+		<rom name="201-v2.v2" merge="201-v2.v2" size="4194304" crc="472cf9db"/>
+		<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"/>
+		<rom name="sp-u2.sp1" merge="sp-u2.sp1" size="131072" crc="e72943de"/>
+		<rom name="sp1-u2" merge="sp1-u2" size="131072" crc="62f021f4"/>
+		<rom name="sp-e.sp1" merge="sp-e.sp1" size="131072" crc="2723a5b5"/>
+		<rom name="sp1-u4.bin" merge="sp1-u4.bin" size="131072" crc="1179a30f"/>
+		<rom name="sp1-u3.bin" merge="sp1-u3.bin" size="131072" crc="2025b7a2"/>
+		<rom name="vs-bios.rom" merge="vs-bios.rom" size="131072" crc="f0e8f27d"/>
+		<rom name="sp-j2.sp1" merge="sp-j2.sp1" size="131072" crc="acede59c"/>
+		<rom name="sp1.jipan.1024" merge="sp1.jipan.1024" size="131072" crc="9fb0abe4"/>
+		<rom name="sp-45.sp1" merge="sp-45.sp1" size="524288" crc="03cc9f6a"/>
+		<rom name="sp-j3.sp1" merge="sp-j3.sp1" size="524288" crc="486cb450"/>
+		<rom name="japan-j3.bin" merge="japan-j3.bin" size="131072" crc="dff6d41f"/>
+		<rom name="sp1-j3.bin" merge="sp1-j3.bin" size="131072" crc="fbc6d469"/>
+		<rom name="neo-po.bin" merge="neo-po.bin" size="131072" crc="16d0c132"/>
+		<rom name="neo-epo.bin" merge="neo-epo.bin" size="131072" crc="d27a71f1"/>
+		<rom name="neodebug.bin" merge="neodebug.bin" size="131072" crc="698ebb7d"/>
+		<rom name="sp-1v1_3db8c.bin" merge="sp-1v1_3db8c.bin" size="131072" crc="162f0ebe"/>
+		<rom name="uni-bios_4_0.rom" merge="uni-bios_4_0.rom" size="131072" crc="a7aab458"/>
+		<rom name="uni-bios_3_3.rom" merge="uni-bios_3_3.rom" size="131072" crc="24858466"/>
+		<rom name="uni-bios_3_2.rom" merge="uni-bios_3_2.rom" size="131072" crc="a4e8b9b3"/>
+		<rom name="uni-bios_3_1.rom" merge="uni-bios_3_1.rom" size="131072" crc="0c58093f"/>
+		<rom name="uni-bios_3_0.rom" merge="uni-bios_3_0.rom" size="131072" crc="a97c89a9"/>
+		<rom name="uni-bios_2_3.rom" merge="uni-bios_2_3.rom" size="131072" crc="27664eb5"/>
+		<rom name="uni-bios_2_3o.rom" merge="uni-bios_2_3o.rom" size="131072" crc="601720ae"/>
+		<rom name="uni-bios_2_2.rom" merge="uni-bios_2_2.rom" size="131072" crc="2d50996a"/>
+		<rom name="uni-bios_2_1.rom" merge="uni-bios_2_1.rom" size="131072" crc="8dabf76b"/>
+		<rom name="uni-bios_2_0.rom" merge="uni-bios_2_0.rom" size="131072" crc="0c12c2ad"/>
+		<rom name="uni-bios_1_3.rom" merge="uni-bios_1_3.rom" size="131072" crc="b24b44a0"/>
+		<rom name="uni-bios_1_2.rom" merge="uni-bios_1_2.rom" size="131072" crc="4fa698e9"/>
+		<rom name="uni-bios_1_2o.rom" merge="uni-bios_1_2o.rom" size="131072" crc="e19d3ce9"/>
+		<rom name="uni-bios_1_1.rom" merge="uni-bios_1_1.rom" size="131072" crc="5dda0d84"/>
+		<rom name="uni-bios_1_0.rom" merge="uni-bios_1_0.rom" size="131072" crc="0ce453a0"/>
+		<rom name="neopen.sp1" merge="neopen.sp1" size="131072" crc="cb915e76"/>
+		<rom name="sm1.sm1" merge="sm1.sm1" size="131072" crc="94416d67"/>
+		<rom name="sfix.sfix" merge="sfix.sfix" size="131072" crc="c2ea0cfd"/>
+		<rom name="000-lo.lo" merge="000-lo.lo" size="131072" crc="5a86cff2"/>
+		<video type="raster" orientation="horizontal" width="304" height="224" aspectx="4" aspecty="3"/>
+		<driver status="good"/>
+	</game>
+	<game name="mslugfc1" cloneof="mslug" romof="mslug" sourcefile="neogeo/d_neogeo.cpp">
+		<comment>Hack</comment>
+		<description>Metal Slug - Super Vehicle-001 (Random Item, Hack)</description>
+		<year>2024</year>
+		<manufacturer>Alice</manufacturer>
+		<rom name="201-p1fc1.p1" size="1048576" crc="267042be"/>
+		<rom name="201-p2fc1.sp2" size="1048576" crc="65749e35"/>
 		<rom name="201-s1.s1" merge="201-s1.s1" size="131072" crc="2f55958d"/>
 		<rom name="201-c1.c1" merge="201-c1.c1" size="4194304" crc="72813676"/>
 		<rom name="201-c2.c2" merge="201-c2.c2" size="4194304" crc="96f62574"/>
diff --git a/dats/FinalBurn Neo (ClrMame Pro XML, PC-Engine only).dat b/dats/FinalBurn Neo (ClrMame Pro XML, PC-Engine only).dat
index e52a774c78..d8dc09d535 100644
--- a/dats/FinalBurn Neo (ClrMame Pro XML, PC-Engine only).dat	
+++ b/dats/FinalBurn Neo (ClrMame Pro XML, PC-Engine only).dat	
@@ -1388,6 +1388,15 @@
 		<video type="raster" orientation="horizontal" width="512" height="240" aspectx="4" aspecty="3"/>
 		<driver status="good"/>
 	</game>
+	<game name="mainurse" sourcefile="pce/d_pce.cpp">
+		<comment>Homebrew</comment>
+		<description>Mai Nurse (HB)</description>
+		<year>2024</year>
+		<manufacturer>lunoka</manufacturer>
+		<rom name="Mai Nurse (2024)(lunoka).pce" size="262144" crc="c94e2bc6"/>
+		<video type="raster" orientation="horizontal" width="512" height="224" aspectx="4" aspecty="3"/>
+		<driver status="good"/>
+	</game>
 	<game name="mikkokue" cloneof="mikkoku" romof="mikkoku" sourcefile="pce/d_pce.cpp">
 		<comment>Hack</comment>
 		<description>Maison Ikkoku (Hack, English)</description>
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 9fa801775f..93d0c32ffc 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	
@@ -1878,6 +1878,61 @@
 		<video type="raster" orientation="horizontal" width="304" height="224" aspectx="4" aspecty="3"/>
 		<driver status="good"/>
 	</game>
+	<game name="2020bbcd" cloneof="2020bb" romof="2020bb" sourcefile="neogeo/d_neogeo.cpp">
+		<comment>Hack</comment>
+		<description>2020 Super Baseball (Neo CD conversion)</description>
+		<year>1991</year>
+		<manufacturer>hack</manufacturer>
+		<rom name="030-p1ch.p1" size="524288" crc="e13d8a8a"/>
+		<rom name="030-s1.s1" merge="030-s1.s1" size="131072" crc="7015b8fc"/>
+		<rom name="030-c1.c1" merge="030-c1.c1" size="1048576" crc="4f5e19bd"/>
+		<rom name="030-c2.c2" merge="030-c2.c2" size="1048576" crc="d6314bf0"/>
+		<rom name="030-c3.c3" merge="030-c3.c3" size="1048576" crc="47fddfee"/>
+		<rom name="030-c4.c4" merge="030-c4.c4" size="1048576" crc="780d1c4e"/>
+		<rom name="030-m1ch.m1" size="65536" crc="124d7b4f"/>
+		<rom name="030-v1ch.v1" size="1048576" crc="d725a649"/>
+		<rom name="030-v2.v2" merge="030-v2.v2" size="1048576" crc="54994455"/>
+		<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"/>
+		<rom name="sp-u2.sp1" merge="sp-u2.sp1" size="131072" crc="e72943de"/>
+		<rom name="sp1-u2" merge="sp1-u2" size="131072" crc="62f021f4"/>
+		<rom name="sp-e.sp1" merge="sp-e.sp1" size="131072" crc="2723a5b5"/>
+		<rom name="sp1-u4.bin" merge="sp1-u4.bin" size="131072" crc="1179a30f"/>
+		<rom name="sp1-u3.bin" merge="sp1-u3.bin" size="131072" crc="2025b7a2"/>
+		<rom name="vs-bios.rom" merge="vs-bios.rom" size="131072" crc="f0e8f27d"/>
+		<rom name="sp-j2.sp1" merge="sp-j2.sp1" size="131072" crc="acede59c"/>
+		<rom name="sp1.jipan.1024" merge="sp1.jipan.1024" size="131072" crc="9fb0abe4"/>
+		<rom name="sp-45.sp1" merge="sp-45.sp1" size="524288" crc="03cc9f6a"/>
+		<rom name="sp-j3.sp1" merge="sp-j3.sp1" size="524288" crc="486cb450"/>
+		<rom name="japan-j3.bin" merge="japan-j3.bin" size="131072" crc="dff6d41f"/>
+		<rom name="sp1-j3.bin" merge="sp1-j3.bin" size="131072" crc="fbc6d469"/>
+		<rom name="neo-po.bin" merge="neo-po.bin" size="131072" crc="16d0c132"/>
+		<rom name="neo-epo.bin" merge="neo-epo.bin" size="131072" crc="d27a71f1"/>
+		<rom name="neodebug.bin" merge="neodebug.bin" size="131072" crc="698ebb7d"/>
+		<rom name="sp-1v1_3db8c.bin" merge="sp-1v1_3db8c.bin" size="131072" crc="162f0ebe"/>
+		<rom name="uni-bios_4_0.rom" merge="uni-bios_4_0.rom" size="131072" crc="a7aab458"/>
+		<rom name="uni-bios_3_3.rom" merge="uni-bios_3_3.rom" size="131072" crc="24858466"/>
+		<rom name="uni-bios_3_2.rom" merge="uni-bios_3_2.rom" size="131072" crc="a4e8b9b3"/>
+		<rom name="uni-bios_3_1.rom" merge="uni-bios_3_1.rom" size="131072" crc="0c58093f"/>
+		<rom name="uni-bios_3_0.rom" merge="uni-bios_3_0.rom" size="131072" crc="a97c89a9"/>
+		<rom name="uni-bios_2_3.rom" merge="uni-bios_2_3.rom" size="131072" crc="27664eb5"/>
+		<rom name="uni-bios_2_3o.rom" merge="uni-bios_2_3o.rom" size="131072" crc="601720ae"/>
+		<rom name="uni-bios_2_2.rom" merge="uni-bios_2_2.rom" size="131072" crc="2d50996a"/>
+		<rom name="uni-bios_2_1.rom" merge="uni-bios_2_1.rom" size="131072" crc="8dabf76b"/>
+		<rom name="uni-bios_2_0.rom" merge="uni-bios_2_0.rom" size="131072" crc="0c12c2ad"/>
+		<rom name="uni-bios_1_3.rom" merge="uni-bios_1_3.rom" size="131072" crc="b24b44a0"/>
+		<rom name="uni-bios_1_2.rom" merge="uni-bios_1_2.rom" size="131072" crc="4fa698e9"/>
+		<rom name="uni-bios_1_2o.rom" merge="uni-bios_1_2o.rom" size="131072" crc="e19d3ce9"/>
+		<rom name="uni-bios_1_1.rom" merge="uni-bios_1_1.rom" size="131072" crc="5dda0d84"/>
+		<rom name="uni-bios_1_0.rom" merge="uni-bios_1_0.rom" size="131072" crc="0ce453a0"/>
+		<rom name="neopen.sp1" merge="neopen.sp1" size="131072" crc="cb915e76"/>
+		<rom name="sm1.sm1" merge="sm1.sm1" size="131072" crc="94416d67"/>
+		<rom name="sfix.sfix" merge="sfix.sfix" size="131072" crc="c2ea0cfd"/>
+		<rom name="000-lo.lo" merge="000-lo.lo" size="131072" crc="5a86cff2"/>
+		<video type="raster" orientation="horizontal" width="304" height="224" aspectx="4" aspecty="3"/>
+		<driver status="good"/>
+	</game>
 	<game name="2020bb" romof="neogeo" sourcefile="neogeo/d_neogeo.cpp">
 		<description>2020 Super Baseball (set 1)</description>
 		<year>1991</year>
@@ -2763,6 +2818,58 @@
 		<video type="raster" orientation="vertical" width="224" height="288" aspectx="3" aspecty="4"/>
 		<driver status="good"/>
 	</game>
+	<game name="abyssali" romof="neogeo" sourcefile="neogeo/d_neogeo.cpp">
+		<comment>Homebrew</comment>
+		<description>Abyssal Infants</description>
+		<year>2021</year>
+		<manufacturer>Kako Eimon</manufacturer>
+		<rom name="aby-p1.p1" size="524288" crc="a8a2a8a6"/>
+		<rom name="aby-s1.s1" size="131072" crc="1ebbb83e"/>
+		<rom name="aby-c1.c1" size="2097152" crc="24dabe27"/>
+		<rom name="aby-c2.c1" size="2097152" crc="bbdacc24"/>
+		<rom name="aby-m1.m1" size="131072" crc="3ddf772b"/>
+		<rom name="aby-v1.v1" size="2097152" crc="1fae3797"/>
+		<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"/>
+		<rom name="sp-u2.sp1" merge="sp-u2.sp1" size="131072" crc="e72943de"/>
+		<rom name="sp1-u2" merge="sp1-u2" size="131072" crc="62f021f4"/>
+		<rom name="sp-e.sp1" merge="sp-e.sp1" size="131072" crc="2723a5b5"/>
+		<rom name="sp1-u4.bin" merge="sp1-u4.bin" size="131072" crc="1179a30f"/>
+		<rom name="sp1-u3.bin" merge="sp1-u3.bin" size="131072" crc="2025b7a2"/>
+		<rom name="vs-bios.rom" merge="vs-bios.rom" size="131072" crc="f0e8f27d"/>
+		<rom name="sp-j2.sp1" merge="sp-j2.sp1" size="131072" crc="acede59c"/>
+		<rom name="sp1.jipan.1024" merge="sp1.jipan.1024" size="131072" crc="9fb0abe4"/>
+		<rom name="sp-45.sp1" merge="sp-45.sp1" size="524288" crc="03cc9f6a"/>
+		<rom name="sp-j3.sp1" merge="sp-j3.sp1" size="524288" crc="486cb450"/>
+		<rom name="japan-j3.bin" merge="japan-j3.bin" size="131072" crc="dff6d41f"/>
+		<rom name="sp1-j3.bin" merge="sp1-j3.bin" size="131072" crc="fbc6d469"/>
+		<rom name="neo-po.bin" merge="neo-po.bin" size="131072" crc="16d0c132"/>
+		<rom name="neo-epo.bin" merge="neo-epo.bin" size="131072" crc="d27a71f1"/>
+		<rom name="neodebug.bin" merge="neodebug.bin" size="131072" crc="698ebb7d"/>
+		<rom name="sp-1v1_3db8c.bin" merge="sp-1v1_3db8c.bin" size="131072" crc="162f0ebe"/>
+		<rom name="uni-bios_4_0.rom" merge="uni-bios_4_0.rom" size="131072" crc="a7aab458"/>
+		<rom name="uni-bios_3_3.rom" merge="uni-bios_3_3.rom" size="131072" crc="24858466"/>
+		<rom name="uni-bios_3_2.rom" merge="uni-bios_3_2.rom" size="131072" crc="a4e8b9b3"/>
+		<rom name="uni-bios_3_1.rom" merge="uni-bios_3_1.rom" size="131072" crc="0c58093f"/>
+		<rom name="uni-bios_3_0.rom" merge="uni-bios_3_0.rom" size="131072" crc="a97c89a9"/>
+		<rom name="uni-bios_2_3.rom" merge="uni-bios_2_3.rom" size="131072" crc="27664eb5"/>
+		<rom name="uni-bios_2_3o.rom" merge="uni-bios_2_3o.rom" size="131072" crc="601720ae"/>
+		<rom name="uni-bios_2_2.rom" merge="uni-bios_2_2.rom" size="131072" crc="2d50996a"/>
+		<rom name="uni-bios_2_1.rom" merge="uni-bios_2_1.rom" size="131072" crc="8dabf76b"/>
+		<rom name="uni-bios_2_0.rom" merge="uni-bios_2_0.rom" size="131072" crc="0c12c2ad"/>
+		<rom name="uni-bios_1_3.rom" merge="uni-bios_1_3.rom" size="131072" crc="b24b44a0"/>
+		<rom name="uni-bios_1_2.rom" merge="uni-bios_1_2.rom" size="131072" crc="4fa698e9"/>
+		<rom name="uni-bios_1_2o.rom" merge="uni-bios_1_2o.rom" size="131072" crc="e19d3ce9"/>
+		<rom name="uni-bios_1_1.rom" merge="uni-bios_1_1.rom" size="131072" crc="5dda0d84"/>
+		<rom name="uni-bios_1_0.rom" merge="uni-bios_1_0.rom" size="131072" crc="0ce453a0"/>
+		<rom name="neopen.sp1" merge="neopen.sp1" size="131072" crc="cb915e76"/>
+		<rom name="sm1.sm1" merge="sm1.sm1" size="131072" crc="94416d67"/>
+		<rom name="sfix.sfix" merge="sfix.sfix" size="131072" crc="c2ea0cfd"/>
+		<rom name="000-lo.lo" merge="000-lo.lo" size="131072" crc="5a86cff2"/>
+		<video type="raster" orientation="horizontal" width="304" height="224" aspectx="4" aspecty="3"/>
+		<driver status="good"/>
+	</game>
 	<game name="aceattac" sourcefile="sega/d_sys16b.cpp">
 		<description>Ace Attacker (FD1094 317-0059)</description>
 		<year>1988</year>
@@ -74688,13 +74795,13 @@
 		<video type="raster" orientation="horizontal" width="304" height="224" aspectx="4" aspecty="3"/>
 		<driver status="good"/>
 	</game>
-	<game name="mslugfc2" cloneof="mslug" romof="mslug" sourcefile="neogeo/d_neogeo.cpp">
+	<game name="mslugdg" cloneof="mslug" romof="mslug" sourcefile="neogeo/d_neogeo.cpp">
 		<comment>Hack</comment>
-		<description>Metal Slug - Super Vehicle-001 (Item Random &amp; Powerful Enemy Defense FC2, Hack)</description>
-		<year>2024</year>
+		<description>Metal Slug - Super Vehicle-001 (Multifunction, Hack)</description>
+		<year>2018</year>
 		<manufacturer>hack</manufacturer>
-		<rom name="201-p1fc2.p1" size="1048576" crc="b079dd40"/>
-		<rom name="201-p2fc2.sp2" size="1048576" crc="8211a964"/>
+		<rom name="201-p1dg.p1" size="1048576" crc="7f66b97f"/>
+		<rom name="201-p2dg.sp2" size="1048576" crc="c3cb544c"/>
 		<rom name="201-s1.s1" merge="201-s1.s1" size="131072" crc="2f55958d"/>
 		<rom name="201-c1.c1" merge="201-c1.c1" size="4194304" crc="72813676"/>
 		<rom name="201-c2.c2" merge="201-c2.c2" size="4194304" crc="96f62574"/>
@@ -74744,13 +74851,13 @@
 		<video type="raster" orientation="horizontal" width="304" height="224" aspectx="4" aspecty="3"/>
 		<driver status="good"/>
 	</game>
-	<game name="mslugfc1" cloneof="mslug" romof="mslug" sourcefile="neogeo/d_neogeo.cpp">
+	<game name="msqyfc1" cloneof="mslug" romof="mslug" sourcefile="neogeo/d_neogeo.cpp">
 		<comment>Hack</comment>
-		<description>Metal Slug - Super Vehicle-001 (Item Random FC2, Hack)</description>
+		<description>Metal Slug - Super Vehicle-001 (Origins Item Random, Hack)</description>
 		<year>2024</year>
-		<manufacturer>hack</manufacturer>
-		<rom name="201-p1fc1.p1" size="1048576" crc="db8f7d81"/>
-		<rom name="201-p2fc1.sp2" size="1048576" crc="f3d34029"/>
+		<manufacturer>Alice</manufacturer>
+		<rom name="201-p1qyfc1.p1" size="1048576" crc="4f107600"/>
+		<rom name="201-p2dgfc1.sp2" size="1048576" crc="f0b93488"/>
 		<rom name="201-s1.s1" merge="201-s1.s1" size="131072" crc="2f55958d"/>
 		<rom name="201-c1.c1" merge="201-c1.c1" size="4194304" crc="72813676"/>
 		<rom name="201-c2.c2" merge="201-c2.c2" size="4194304" crc="96f62574"/>
@@ -74800,12 +74907,12 @@
 		<video type="raster" orientation="horizontal" width="304" height="224" aspectx="4" aspecty="3"/>
 		<driver status="good"/>
 	</game>
-	<game name="mslugdg" cloneof="mslug" romof="mslug" sourcefile="neogeo/d_neogeo.cpp">
+	<game name="mslugqy" cloneof="mslug" romof="mslug" sourcefile="neogeo/d_neogeo.cpp">
 		<comment>Hack</comment>
-		<description>Metal Slug - Super Vehicle-001 (Multifunction, Hack)</description>
-		<year>2018</year>
+		<description>Metal Slug - Super Vehicle-001 (Origins, Hack)</description>
+		<year>2024</year>
 		<manufacturer>hack</manufacturer>
-		<rom name="201-p1dg.p1" size="1048576" crc="7f66b97f"/>
+		<rom name="201-p1qy.p1" size="1048576" crc="16068dc1"/>
 		<rom name="201-p2dg.sp2" size="1048576" crc="c3cb544c"/>
 		<rom name="201-s1.s1" merge="201-s1.s1" size="131072" crc="2f55958d"/>
 		<rom name="201-c1.c1" merge="201-c1.c1" size="4194304" crc="72813676"/>
@@ -74856,13 +74963,69 @@
 		<video type="raster" orientation="horizontal" width="304" height="224" aspectx="4" aspecty="3"/>
 		<driver status="good"/>
 	</game>
-	<game name="mslugqy" cloneof="mslug" romof="mslug" sourcefile="neogeo/d_neogeo.cpp">
+	<game name="mslugfc2" cloneof="mslug" romof="mslug" sourcefile="neogeo/d_neogeo.cpp">
 		<comment>Hack</comment>
-		<description>Metal Slug - Super Vehicle-001 (Origins, Hack)</description>
+		<description>Metal Slug - Super Vehicle-001 (Random Item &amp; Powerful Enemy Defense, Hack)</description>
 		<year>2024</year>
-		<manufacturer>hack</manufacturer>
-		<rom name="201-p1qy.p1" size="1048576" crc="16068dc1"/>
-		<rom name="201-p2dg.sp2" size="1048576" crc="c3cb544c"/>
+		<manufacturer>Alice</manufacturer>
+		<rom name="201-p1fc2.p1" size="1048576" crc="4d86e27f"/>
+		<rom name="201-p2fc2.sp2" size="1048576" crc="14b67778"/>
+		<rom name="201-s1.s1" merge="201-s1.s1" size="131072" crc="2f55958d"/>
+		<rom name="201-c1.c1" merge="201-c1.c1" size="4194304" crc="72813676"/>
+		<rom name="201-c2.c2" merge="201-c2.c2" size="4194304" crc="96f62574"/>
+		<rom name="201-c3.c3" merge="201-c3.c3" size="4194304" crc="5121456a"/>
+		<rom name="201-c4.c4" merge="201-c4.c4" size="4194304" crc="f4ad59a3"/>
+		<rom name="201-m1.m1" merge="201-m1.m1" size="131072" crc="c28b3253"/>
+		<rom name="201-v1.v1" merge="201-v1.v1" size="4194304" crc="23d22ed1"/>
+		<rom name="201-v2.v2" merge="201-v2.v2" size="4194304" crc="472cf9db"/>
+		<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"/>
+		<rom name="sp-u2.sp1" merge="sp-u2.sp1" size="131072" crc="e72943de"/>
+		<rom name="sp1-u2" merge="sp1-u2" size="131072" crc="62f021f4"/>
+		<rom name="sp-e.sp1" merge="sp-e.sp1" size="131072" crc="2723a5b5"/>
+		<rom name="sp1-u4.bin" merge="sp1-u4.bin" size="131072" crc="1179a30f"/>
+		<rom name="sp1-u3.bin" merge="sp1-u3.bin" size="131072" crc="2025b7a2"/>
+		<rom name="vs-bios.rom" merge="vs-bios.rom" size="131072" crc="f0e8f27d"/>
+		<rom name="sp-j2.sp1" merge="sp-j2.sp1" size="131072" crc="acede59c"/>
+		<rom name="sp1.jipan.1024" merge="sp1.jipan.1024" size="131072" crc="9fb0abe4"/>
+		<rom name="sp-45.sp1" merge="sp-45.sp1" size="524288" crc="03cc9f6a"/>
+		<rom name="sp-j3.sp1" merge="sp-j3.sp1" size="524288" crc="486cb450"/>
+		<rom name="japan-j3.bin" merge="japan-j3.bin" size="131072" crc="dff6d41f"/>
+		<rom name="sp1-j3.bin" merge="sp1-j3.bin" size="131072" crc="fbc6d469"/>
+		<rom name="neo-po.bin" merge="neo-po.bin" size="131072" crc="16d0c132"/>
+		<rom name="neo-epo.bin" merge="neo-epo.bin" size="131072" crc="d27a71f1"/>
+		<rom name="neodebug.bin" merge="neodebug.bin" size="131072" crc="698ebb7d"/>
+		<rom name="sp-1v1_3db8c.bin" merge="sp-1v1_3db8c.bin" size="131072" crc="162f0ebe"/>
+		<rom name="uni-bios_4_0.rom" merge="uni-bios_4_0.rom" size="131072" crc="a7aab458"/>
+		<rom name="uni-bios_3_3.rom" merge="uni-bios_3_3.rom" size="131072" crc="24858466"/>
+		<rom name="uni-bios_3_2.rom" merge="uni-bios_3_2.rom" size="131072" crc="a4e8b9b3"/>
+		<rom name="uni-bios_3_1.rom" merge="uni-bios_3_1.rom" size="131072" crc="0c58093f"/>
+		<rom name="uni-bios_3_0.rom" merge="uni-bios_3_0.rom" size="131072" crc="a97c89a9"/>
+		<rom name="uni-bios_2_3.rom" merge="uni-bios_2_3.rom" size="131072" crc="27664eb5"/>
+		<rom name="uni-bios_2_3o.rom" merge="uni-bios_2_3o.rom" size="131072" crc="601720ae"/>
+		<rom name="uni-bios_2_2.rom" merge="uni-bios_2_2.rom" size="131072" crc="2d50996a"/>
+		<rom name="uni-bios_2_1.rom" merge="uni-bios_2_1.rom" size="131072" crc="8dabf76b"/>
+		<rom name="uni-bios_2_0.rom" merge="uni-bios_2_0.rom" size="131072" crc="0c12c2ad"/>
+		<rom name="uni-bios_1_3.rom" merge="uni-bios_1_3.rom" size="131072" crc="b24b44a0"/>
+		<rom name="uni-bios_1_2.rom" merge="uni-bios_1_2.rom" size="131072" crc="4fa698e9"/>
+		<rom name="uni-bios_1_2o.rom" merge="uni-bios_1_2o.rom" size="131072" crc="e19d3ce9"/>
+		<rom name="uni-bios_1_1.rom" merge="uni-bios_1_1.rom" size="131072" crc="5dda0d84"/>
+		<rom name="uni-bios_1_0.rom" merge="uni-bios_1_0.rom" size="131072" crc="0ce453a0"/>
+		<rom name="neopen.sp1" merge="neopen.sp1" size="131072" crc="cb915e76"/>
+		<rom name="sm1.sm1" merge="sm1.sm1" size="131072" crc="94416d67"/>
+		<rom name="sfix.sfix" merge="sfix.sfix" size="131072" crc="c2ea0cfd"/>
+		<rom name="000-lo.lo" merge="000-lo.lo" size="131072" crc="5a86cff2"/>
+		<video type="raster" orientation="horizontal" width="304" height="224" aspectx="4" aspecty="3"/>
+		<driver status="good"/>
+	</game>
+	<game name="mslugfc1" cloneof="mslug" romof="mslug" sourcefile="neogeo/d_neogeo.cpp">
+		<comment>Hack</comment>
+		<description>Metal Slug - Super Vehicle-001 (Random Item, Hack)</description>
+		<year>2024</year>
+		<manufacturer>Alice</manufacturer>
+		<rom name="201-p1fc1.p1" size="1048576" crc="267042be"/>
+		<rom name="201-p2fc1.sp2" size="1048576" crc="65749e35"/>
 		<rom name="201-s1.s1" merge="201-s1.s1" size="131072" crc="2f55958d"/>
 		<rom name="201-c1.c1" merge="201-c1.c1" size="4194304" crc="72813676"/>
 		<rom name="201-c2.c2" merge="201-c2.c2" size="4194304" crc="96f62574"/>
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 67aa35efb6..99c34c44ef 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	
@@ -118,6 +118,61 @@
 		<video type="raster" orientation="horizontal" width="304" height="224" aspectx="4" aspecty="3"/>
 		<driver status="good"/>
 	</game>
+	<game name="2020bbcd" cloneof="2020bb" romof="2020bb" sourcefile="neogeo/d_neogeo.cpp">
+		<comment>Hack</comment>
+		<description>2020 Super Baseball (Neo CD conversion)</description>
+		<year>1991</year>
+		<manufacturer>hack</manufacturer>
+		<rom name="030-p1ch.p1" size="524288" crc="e13d8a8a"/>
+		<rom name="030-s1.s1" merge="030-s1.s1" size="131072" crc="7015b8fc"/>
+		<rom name="030-c1.c1" merge="030-c1.c1" size="1048576" crc="4f5e19bd"/>
+		<rom name="030-c2.c2" merge="030-c2.c2" size="1048576" crc="d6314bf0"/>
+		<rom name="030-c3.c3" merge="030-c3.c3" size="1048576" crc="47fddfee"/>
+		<rom name="030-c4.c4" merge="030-c4.c4" size="1048576" crc="780d1c4e"/>
+		<rom name="030-m1ch.m1" size="65536" crc="124d7b4f"/>
+		<rom name="030-v1ch.v1" size="1048576" crc="d725a649"/>
+		<rom name="030-v2.v2" merge="030-v2.v2" size="1048576" crc="54994455"/>
+		<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"/>
+		<rom name="sp-u2.sp1" merge="sp-u2.sp1" size="131072" crc="e72943de"/>
+		<rom name="sp1-u2" merge="sp1-u2" size="131072" crc="62f021f4"/>
+		<rom name="sp-e.sp1" merge="sp-e.sp1" size="131072" crc="2723a5b5"/>
+		<rom name="sp1-u4.bin" merge="sp1-u4.bin" size="131072" crc="1179a30f"/>
+		<rom name="sp1-u3.bin" merge="sp1-u3.bin" size="131072" crc="2025b7a2"/>
+		<rom name="vs-bios.rom" merge="vs-bios.rom" size="131072" crc="f0e8f27d"/>
+		<rom name="sp-j2.sp1" merge="sp-j2.sp1" size="131072" crc="acede59c"/>
+		<rom name="sp1.jipan.1024" merge="sp1.jipan.1024" size="131072" crc="9fb0abe4"/>
+		<rom name="sp-45.sp1" merge="sp-45.sp1" size="524288" crc="03cc9f6a"/>
+		<rom name="sp-j3.sp1" merge="sp-j3.sp1" size="524288" crc="486cb450"/>
+		<rom name="japan-j3.bin" merge="japan-j3.bin" size="131072" crc="dff6d41f"/>
+		<rom name="sp1-j3.bin" merge="sp1-j3.bin" size="131072" crc="fbc6d469"/>
+		<rom name="neo-po.bin" merge="neo-po.bin" size="131072" crc="16d0c132"/>
+		<rom name="neo-epo.bin" merge="neo-epo.bin" size="131072" crc="d27a71f1"/>
+		<rom name="neodebug.bin" merge="neodebug.bin" size="131072" crc="698ebb7d"/>
+		<rom name="sp-1v1_3db8c.bin" merge="sp-1v1_3db8c.bin" size="131072" crc="162f0ebe"/>
+		<rom name="uni-bios_4_0.rom" merge="uni-bios_4_0.rom" size="131072" crc="a7aab458"/>
+		<rom name="uni-bios_3_3.rom" merge="uni-bios_3_3.rom" size="131072" crc="24858466"/>
+		<rom name="uni-bios_3_2.rom" merge="uni-bios_3_2.rom" size="131072" crc="a4e8b9b3"/>
+		<rom name="uni-bios_3_1.rom" merge="uni-bios_3_1.rom" size="131072" crc="0c58093f"/>
+		<rom name="uni-bios_3_0.rom" merge="uni-bios_3_0.rom" size="131072" crc="a97c89a9"/>
+		<rom name="uni-bios_2_3.rom" merge="uni-bios_2_3.rom" size="131072" crc="27664eb5"/>
+		<rom name="uni-bios_2_3o.rom" merge="uni-bios_2_3o.rom" size="131072" crc="601720ae"/>
+		<rom name="uni-bios_2_2.rom" merge="uni-bios_2_2.rom" size="131072" crc="2d50996a"/>
+		<rom name="uni-bios_2_1.rom" merge="uni-bios_2_1.rom" size="131072" crc="8dabf76b"/>
+		<rom name="uni-bios_2_0.rom" merge="uni-bios_2_0.rom" size="131072" crc="0c12c2ad"/>
+		<rom name="uni-bios_1_3.rom" merge="uni-bios_1_3.rom" size="131072" crc="b24b44a0"/>
+		<rom name="uni-bios_1_2.rom" merge="uni-bios_1_2.rom" size="131072" crc="4fa698e9"/>
+		<rom name="uni-bios_1_2o.rom" merge="uni-bios_1_2o.rom" size="131072" crc="e19d3ce9"/>
+		<rom name="uni-bios_1_1.rom" merge="uni-bios_1_1.rom" size="131072" crc="5dda0d84"/>
+		<rom name="uni-bios_1_0.rom" merge="uni-bios_1_0.rom" size="131072" crc="0ce453a0"/>
+		<rom name="neopen.sp1" merge="neopen.sp1" size="131072" crc="cb915e76"/>
+		<rom name="sm1.sm1" merge="sm1.sm1" size="131072" crc="94416d67"/>
+		<rom name="sfix.sfix" merge="sfix.sfix" size="131072" crc="c2ea0cfd"/>
+		<rom name="000-lo.lo" merge="000-lo.lo" size="131072" crc="5a86cff2"/>
+		<video type="raster" orientation="horizontal" width="304" height="224" aspectx="4" aspecty="3"/>
+		<driver status="good"/>
+	</game>
 	<game name="2020bb" romof="neogeo" sourcefile="neogeo/d_neogeo.cpp">
 		<description>2020 Super Baseball (set 1)</description>
 		<year>1991</year>
@@ -492,6 +547,58 @@
 		<video type="raster" orientation="horizontal" width="304" height="224" aspectx="4" aspecty="3"/>
 		<driver status="good"/>
 	</game>
+	<game name="abyssali" romof="neogeo" sourcefile="neogeo/d_neogeo.cpp">
+		<comment>Homebrew</comment>
+		<description>Abyssal Infants</description>
+		<year>2021</year>
+		<manufacturer>Kako Eimon</manufacturer>
+		<rom name="aby-p1.p1" size="524288" crc="a8a2a8a6"/>
+		<rom name="aby-s1.s1" size="131072" crc="1ebbb83e"/>
+		<rom name="aby-c1.c1" size="2097152" crc="24dabe27"/>
+		<rom name="aby-c2.c1" size="2097152" crc="bbdacc24"/>
+		<rom name="aby-m1.m1" size="131072" crc="3ddf772b"/>
+		<rom name="aby-v1.v1" size="2097152" crc="1fae3797"/>
+		<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"/>
+		<rom name="sp-u2.sp1" merge="sp-u2.sp1" size="131072" crc="e72943de"/>
+		<rom name="sp1-u2" merge="sp1-u2" size="131072" crc="62f021f4"/>
+		<rom name="sp-e.sp1" merge="sp-e.sp1" size="131072" crc="2723a5b5"/>
+		<rom name="sp1-u4.bin" merge="sp1-u4.bin" size="131072" crc="1179a30f"/>
+		<rom name="sp1-u3.bin" merge="sp1-u3.bin" size="131072" crc="2025b7a2"/>
+		<rom name="vs-bios.rom" merge="vs-bios.rom" size="131072" crc="f0e8f27d"/>
+		<rom name="sp-j2.sp1" merge="sp-j2.sp1" size="131072" crc="acede59c"/>
+		<rom name="sp1.jipan.1024" merge="sp1.jipan.1024" size="131072" crc="9fb0abe4"/>
+		<rom name="sp-45.sp1" merge="sp-45.sp1" size="524288" crc="03cc9f6a"/>
+		<rom name="sp-j3.sp1" merge="sp-j3.sp1" size="524288" crc="486cb450"/>
+		<rom name="japan-j3.bin" merge="japan-j3.bin" size="131072" crc="dff6d41f"/>
+		<rom name="sp1-j3.bin" merge="sp1-j3.bin" size="131072" crc="fbc6d469"/>
+		<rom name="neo-po.bin" merge="neo-po.bin" size="131072" crc="16d0c132"/>
+		<rom name="neo-epo.bin" merge="neo-epo.bin" size="131072" crc="d27a71f1"/>
+		<rom name="neodebug.bin" merge="neodebug.bin" size="131072" crc="698ebb7d"/>
+		<rom name="sp-1v1_3db8c.bin" merge="sp-1v1_3db8c.bin" size="131072" crc="162f0ebe"/>
+		<rom name="uni-bios_4_0.rom" merge="uni-bios_4_0.rom" size="131072" crc="a7aab458"/>
+		<rom name="uni-bios_3_3.rom" merge="uni-bios_3_3.rom" size="131072" crc="24858466"/>
+		<rom name="uni-bios_3_2.rom" merge="uni-bios_3_2.rom" size="131072" crc="a4e8b9b3"/>
+		<rom name="uni-bios_3_1.rom" merge="uni-bios_3_1.rom" size="131072" crc="0c58093f"/>
+		<rom name="uni-bios_3_0.rom" merge="uni-bios_3_0.rom" size="131072" crc="a97c89a9"/>
+		<rom name="uni-bios_2_3.rom" merge="uni-bios_2_3.rom" size="131072" crc="27664eb5"/>
+		<rom name="uni-bios_2_3o.rom" merge="uni-bios_2_3o.rom" size="131072" crc="601720ae"/>
+		<rom name="uni-bios_2_2.rom" merge="uni-bios_2_2.rom" size="131072" crc="2d50996a"/>
+		<rom name="uni-bios_2_1.rom" merge="uni-bios_2_1.rom" size="131072" crc="8dabf76b"/>
+		<rom name="uni-bios_2_0.rom" merge="uni-bios_2_0.rom" size="131072" crc="0c12c2ad"/>
+		<rom name="uni-bios_1_3.rom" merge="uni-bios_1_3.rom" size="131072" crc="b24b44a0"/>
+		<rom name="uni-bios_1_2.rom" merge="uni-bios_1_2.rom" size="131072" crc="4fa698e9"/>
+		<rom name="uni-bios_1_2o.rom" merge="uni-bios_1_2o.rom" size="131072" crc="e19d3ce9"/>
+		<rom name="uni-bios_1_1.rom" merge="uni-bios_1_1.rom" size="131072" crc="5dda0d84"/>
+		<rom name="uni-bios_1_0.rom" merge="uni-bios_1_0.rom" size="131072" crc="0ce453a0"/>
+		<rom name="neopen.sp1" merge="neopen.sp1" size="131072" crc="cb915e76"/>
+		<rom name="sm1.sm1" merge="sm1.sm1" size="131072" crc="94416d67"/>
+		<rom name="sfix.sfix" merge="sfix.sfix" size="131072" crc="c2ea0cfd"/>
+		<rom name="000-lo.lo" merge="000-lo.lo" size="131072" crc="5a86cff2"/>
+		<video type="raster" orientation="horizontal" width="304" height="224" aspectx="4" aspecty="3"/>
+		<driver status="good"/>
+	</game>
 	<game name="sonicwi2" romof="neogeo" sourcefile="neogeo/d_neogeo.cpp">
 		<description>Aero Fighters 2 / Sonic Wings 2</description>
 		<year>1994</year>
@@ -8742,13 +8849,13 @@
 		<video type="raster" orientation="horizontal" width="304" height="224" aspectx="4" aspecty="3"/>
 		<driver status="good"/>
 	</game>
-	<game name="mslugfc2" cloneof="mslug" romof="mslug" sourcefile="neogeo/d_neogeo.cpp">
+	<game name="mslugdg" cloneof="mslug" romof="mslug" sourcefile="neogeo/d_neogeo.cpp">
 		<comment>Hack</comment>
-		<description>Metal Slug - Super Vehicle-001 (Item Random &amp; Powerful Enemy Defense FC2, Hack)</description>
-		<year>2024</year>
+		<description>Metal Slug - Super Vehicle-001 (Multifunction, Hack)</description>
+		<year>2018</year>
 		<manufacturer>hack</manufacturer>
-		<rom name="201-p1fc2.p1" size="1048576" crc="b079dd40"/>
-		<rom name="201-p2fc2.sp2" size="1048576" crc="8211a964"/>
+		<rom name="201-p1dg.p1" size="1048576" crc="7f66b97f"/>
+		<rom name="201-p2dg.sp2" size="1048576" crc="c3cb544c"/>
 		<rom name="201-s1.s1" merge="201-s1.s1" size="131072" crc="2f55958d"/>
 		<rom name="201-c1.c1" merge="201-c1.c1" size="4194304" crc="72813676"/>
 		<rom name="201-c2.c2" merge="201-c2.c2" size="4194304" crc="96f62574"/>
@@ -8798,13 +8905,13 @@
 		<video type="raster" orientation="horizontal" width="304" height="224" aspectx="4" aspecty="3"/>
 		<driver status="good"/>
 	</game>
-	<game name="mslugfc1" cloneof="mslug" romof="mslug" sourcefile="neogeo/d_neogeo.cpp">
+	<game name="msqyfc1" cloneof="mslug" romof="mslug" sourcefile="neogeo/d_neogeo.cpp">
 		<comment>Hack</comment>
-		<description>Metal Slug - Super Vehicle-001 (Item Random FC2, Hack)</description>
+		<description>Metal Slug - Super Vehicle-001 (Origins Item Random, Hack)</description>
 		<year>2024</year>
-		<manufacturer>hack</manufacturer>
-		<rom name="201-p1fc1.p1" size="1048576" crc="db8f7d81"/>
-		<rom name="201-p2fc1.sp2" size="1048576" crc="f3d34029"/>
+		<manufacturer>Alice</manufacturer>
+		<rom name="201-p1qyfc1.p1" size="1048576" crc="4f107600"/>
+		<rom name="201-p2dgfc1.sp2" size="1048576" crc="f0b93488"/>
 		<rom name="201-s1.s1" merge="201-s1.s1" size="131072" crc="2f55958d"/>
 		<rom name="201-c1.c1" merge="201-c1.c1" size="4194304" crc="72813676"/>
 		<rom name="201-c2.c2" merge="201-c2.c2" size="4194304" crc="96f62574"/>
@@ -8854,12 +8961,12 @@
 		<video type="raster" orientation="horizontal" width="304" height="224" aspectx="4" aspecty="3"/>
 		<driver status="good"/>
 	</game>
-	<game name="mslugdg" cloneof="mslug" romof="mslug" sourcefile="neogeo/d_neogeo.cpp">
+	<game name="mslugqy" cloneof="mslug" romof="mslug" sourcefile="neogeo/d_neogeo.cpp">
 		<comment>Hack</comment>
-		<description>Metal Slug - Super Vehicle-001 (Multifunction, Hack)</description>
-		<year>2018</year>
+		<description>Metal Slug - Super Vehicle-001 (Origins, Hack)</description>
+		<year>2024</year>
 		<manufacturer>hack</manufacturer>
-		<rom name="201-p1dg.p1" size="1048576" crc="7f66b97f"/>
+		<rom name="201-p1qy.p1" size="1048576" crc="16068dc1"/>
 		<rom name="201-p2dg.sp2" size="1048576" crc="c3cb544c"/>
 		<rom name="201-s1.s1" merge="201-s1.s1" size="131072" crc="2f55958d"/>
 		<rom name="201-c1.c1" merge="201-c1.c1" size="4194304" crc="72813676"/>
@@ -8910,13 +9017,69 @@
 		<video type="raster" orientation="horizontal" width="304" height="224" aspectx="4" aspecty="3"/>
 		<driver status="good"/>
 	</game>
-	<game name="mslugqy" cloneof="mslug" romof="mslug" sourcefile="neogeo/d_neogeo.cpp">
+	<game name="mslugfc2" cloneof="mslug" romof="mslug" sourcefile="neogeo/d_neogeo.cpp">
 		<comment>Hack</comment>
-		<description>Metal Slug - Super Vehicle-001 (Origins, Hack)</description>
+		<description>Metal Slug - Super Vehicle-001 (Random Item &amp; Powerful Enemy Defense, Hack)</description>
 		<year>2024</year>
-		<manufacturer>hack</manufacturer>
-		<rom name="201-p1qy.p1" size="1048576" crc="16068dc1"/>
-		<rom name="201-p2dg.sp2" size="1048576" crc="c3cb544c"/>
+		<manufacturer>Alice</manufacturer>
+		<rom name="201-p1fc2.p1" size="1048576" crc="4d86e27f"/>
+		<rom name="201-p2fc2.sp2" size="1048576" crc="14b67778"/>
+		<rom name="201-s1.s1" merge="201-s1.s1" size="131072" crc="2f55958d"/>
+		<rom name="201-c1.c1" merge="201-c1.c1" size="4194304" crc="72813676"/>
+		<rom name="201-c2.c2" merge="201-c2.c2" size="4194304" crc="96f62574"/>
+		<rom name="201-c3.c3" merge="201-c3.c3" size="4194304" crc="5121456a"/>
+		<rom name="201-c4.c4" merge="201-c4.c4" size="4194304" crc="f4ad59a3"/>
+		<rom name="201-m1.m1" merge="201-m1.m1" size="131072" crc="c28b3253"/>
+		<rom name="201-v1.v1" merge="201-v1.v1" size="4194304" crc="23d22ed1"/>
+		<rom name="201-v2.v2" merge="201-v2.v2" size="4194304" crc="472cf9db"/>
+		<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"/>
+		<rom name="sp-u2.sp1" merge="sp-u2.sp1" size="131072" crc="e72943de"/>
+		<rom name="sp1-u2" merge="sp1-u2" size="131072" crc="62f021f4"/>
+		<rom name="sp-e.sp1" merge="sp-e.sp1" size="131072" crc="2723a5b5"/>
+		<rom name="sp1-u4.bin" merge="sp1-u4.bin" size="131072" crc="1179a30f"/>
+		<rom name="sp1-u3.bin" merge="sp1-u3.bin" size="131072" crc="2025b7a2"/>
+		<rom name="vs-bios.rom" merge="vs-bios.rom" size="131072" crc="f0e8f27d"/>
+		<rom name="sp-j2.sp1" merge="sp-j2.sp1" size="131072" crc="acede59c"/>
+		<rom name="sp1.jipan.1024" merge="sp1.jipan.1024" size="131072" crc="9fb0abe4"/>
+		<rom name="sp-45.sp1" merge="sp-45.sp1" size="524288" crc="03cc9f6a"/>
+		<rom name="sp-j3.sp1" merge="sp-j3.sp1" size="524288" crc="486cb450"/>
+		<rom name="japan-j3.bin" merge="japan-j3.bin" size="131072" crc="dff6d41f"/>
+		<rom name="sp1-j3.bin" merge="sp1-j3.bin" size="131072" crc="fbc6d469"/>
+		<rom name="neo-po.bin" merge="neo-po.bin" size="131072" crc="16d0c132"/>
+		<rom name="neo-epo.bin" merge="neo-epo.bin" size="131072" crc="d27a71f1"/>
+		<rom name="neodebug.bin" merge="neodebug.bin" size="131072" crc="698ebb7d"/>
+		<rom name="sp-1v1_3db8c.bin" merge="sp-1v1_3db8c.bin" size="131072" crc="162f0ebe"/>
+		<rom name="uni-bios_4_0.rom" merge="uni-bios_4_0.rom" size="131072" crc="a7aab458"/>
+		<rom name="uni-bios_3_3.rom" merge="uni-bios_3_3.rom" size="131072" crc="24858466"/>
+		<rom name="uni-bios_3_2.rom" merge="uni-bios_3_2.rom" size="131072" crc="a4e8b9b3"/>
+		<rom name="uni-bios_3_1.rom" merge="uni-bios_3_1.rom" size="131072" crc="0c58093f"/>
+		<rom name="uni-bios_3_0.rom" merge="uni-bios_3_0.rom" size="131072" crc="a97c89a9"/>
+		<rom name="uni-bios_2_3.rom" merge="uni-bios_2_3.rom" size="131072" crc="27664eb5"/>
+		<rom name="uni-bios_2_3o.rom" merge="uni-bios_2_3o.rom" size="131072" crc="601720ae"/>
+		<rom name="uni-bios_2_2.rom" merge="uni-bios_2_2.rom" size="131072" crc="2d50996a"/>
+		<rom name="uni-bios_2_1.rom" merge="uni-bios_2_1.rom" size="131072" crc="8dabf76b"/>
+		<rom name="uni-bios_2_0.rom" merge="uni-bios_2_0.rom" size="131072" crc="0c12c2ad"/>
+		<rom name="uni-bios_1_3.rom" merge="uni-bios_1_3.rom" size="131072" crc="b24b44a0"/>
+		<rom name="uni-bios_1_2.rom" merge="uni-bios_1_2.rom" size="131072" crc="4fa698e9"/>
+		<rom name="uni-bios_1_2o.rom" merge="uni-bios_1_2o.rom" size="131072" crc="e19d3ce9"/>
+		<rom name="uni-bios_1_1.rom" merge="uni-bios_1_1.rom" size="131072" crc="5dda0d84"/>
+		<rom name="uni-bios_1_0.rom" merge="uni-bios_1_0.rom" size="131072" crc="0ce453a0"/>
+		<rom name="neopen.sp1" merge="neopen.sp1" size="131072" crc="cb915e76"/>
+		<rom name="sm1.sm1" merge="sm1.sm1" size="131072" crc="94416d67"/>
+		<rom name="sfix.sfix" merge="sfix.sfix" size="131072" crc="c2ea0cfd"/>
+		<rom name="000-lo.lo" merge="000-lo.lo" size="131072" crc="5a86cff2"/>
+		<video type="raster" orientation="horizontal" width="304" height="224" aspectx="4" aspecty="3"/>
+		<driver status="good"/>
+	</game>
+	<game name="mslugfc1" cloneof="mslug" romof="mslug" sourcefile="neogeo/d_neogeo.cpp">
+		<comment>Hack</comment>
+		<description>Metal Slug - Super Vehicle-001 (Random Item, Hack)</description>
+		<year>2024</year>
+		<manufacturer>Alice</manufacturer>
+		<rom name="201-p1fc1.p1" size="1048576" crc="267042be"/>
+		<rom name="201-p2fc1.sp2" size="1048576" crc="65749e35"/>
 		<rom name="201-s1.s1" merge="201-s1.s1" size="131072" crc="2f55958d"/>
 		<rom name="201-c1.c1" merge="201-c1.c1" size="4194304" crc="72813676"/>
 		<rom name="201-c2.c2" merge="201-c2.c2" size="4194304" crc="96f62574"/>
diff --git a/gamelist.txt b/gamelist.txt
index 9c4690f2be..0f59b86161 100644
--- a/gamelist.txt
+++ b/gamelist.txt
@@ -1,6 +1,6 @@
 This list contains all games supported by FinalBurn Neo.
 
-20513 games supported in total; X = excluded from build; D = included in debug build only; NW = not working
+20517 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                                                                             |
@@ -119,6 +119,7 @@ This list contains all games supported by FinalBurn Neo.
 | cv_2010p                        |        | 2010: The Graphic Action Game (Prototype v54)                                                                                                                          | cv_2010                 | 1984        | Coleco                                                          | ColecoVision                   |                                                                                     |
 | cv_2010                         |        | 2010: The Graphic Action Game                                                                                                                                          |                         | 1984        | Coleco                                                          | ColecoVision                   |                                                                                     |
 | md_2020bb                       |        | 2020 Super Baseball (Euro, USA)                                                                                                                                        |                         | 1994        | Electronic Arts                                                 | Sega Megadrive                 |                                                                                     |
+| 2020bbcd                        |        | 2020 Super Baseball (Neo CD conversion)                                                                                                                                | 2020bb                  | 1991        | hack                                                            | Neo Geo MVS                    |                                                                                     |
 | 2020bb                          |        | 2020 Super Baseball (set 1)                                                                                                                                            |                         | 1991        | SNK / Pallas                                                    | Neo Geo MVS                    |                                                                                     |
 | 2020bba                         |        | 2020 Super Baseball (set 2)                                                                                                                                            | 2020bb                  | 1991        | SNK / Pallas                                                    | Neo Geo MVS                    |                                                                                     |
 | 2020bbh                         |        | 2020 Super Baseball (set 3)                                                                                                                                            | 2020bb                  | 1991        | SNK / Pallas                                                    | Neo Geo AES                    |                                                                                     |
@@ -231,6 +232,7 @@ This list contains all games supported by FinalBurn Neo.
 | msx_abusimbel                   |        | Abu Simbel Profanation (Euro, Spanish)                                                                                                                                 |                         | 1986        | Dinamic Software                                                | MSX                            |                                                                                     |
 | spec_abusimprd                  |        | Abu Simbel Profanation (Spanish) (48K)                                                                                                                                 | spec_abusimpr           | 1985        | Dinamic Software                                                | ZX Spectrum                    |                                                                                     |
 | md_abyssal                      |        | Abyssal Infants (HB)                                                                                                                                                   |                         | 2021        | kakoeimon                                                       | Sega Megadrive                 |                                                                                     |
+| abyssali                        |        | Abyssal Infants                                                                                                                                                        |                         | 2021        | Kako Eimon                                                      | Neo Geo MVS                    |                                                                                     |
 | spec_ace                        |        | ACE - Air Combat Emulator (48K)                                                                                                                                        |                         | 1986        | Cascade Games                                                   | ZX Spectrum                    | LSHIFT-Z: throttle - U: undercarriage - M: map - J: eject                           |
 | spec_ace2                       |        | ACE 2 - The Ultimate Head to Head Conflict (128K)                                                                                                                      |                         | 1987        | Cascade Games                                                   | ZX Spectrum                    | D-S/K-J: throttle - W/O: select weapon - C/B: map                                   |
 | spec_ace2088                    |        | ACE 2088 (128K)                                                                                                                                                        |                         | 1989        | Cascade Games                                                   | ZX Spectrum                    | SHIFT+J/K: speed up/down - L, R, T: change weapons - W: set display                 |
@@ -9882,6 +9884,7 @@ This list contains all games supported by FinalBurn Neo.
 | nes_minkymomo                   |        | Mahou no Princess Minky Momo - Remember Dream (Hack, English)                                                                                                          |                         | 2023        | karmic                                                          | Miscellaneous                  |                                                                                     |
 | nes_minkymomoj                  |        | Mahou no Princess Minky Momo - Remember Dream (Japan)                                                                                                                  | nes_minkymomo           | 2023        | Yutaka                                                          | Miscellaneous                  |                                                                                     |
 | gg_mainursegg                   |        | Mai Nurse (HB)                                                                                                                                                         |                         | 2024        | Lunoka                                                          | Sega Game Gear                 |                                                                                     |
+| pce_mainurse                    |        | Mai Nurse (HB)                                                                                                                                                         |                         | 2024        | lunoka                                                          | PC Engine                      |                                                                                     |
 | sms_mainurse                    |        | Mai Nurse (HB)                                                                                                                                                         |                         | 2024        | Lunoka                                                          | Sega Master System             |                                                                                     |
 | spec_maincourse                 |        | Main Course - The Retro Cut (48K) (HB)                                                                                                                                 |                         | 2020        | Quantum Sheep                                                   | ZX Spectrum                    |                                                                                     |
 | mainsnk                         |        | Main Event (1984)                                                                                                                                                      |                         | 1984        | SNK                                                             | Miscellaneous                  |                                                                                     |
@@ -10381,10 +10384,11 @@ This list contains all games supported by FinalBurn Neo.
 | ngp_mslug2nd                    |        | Metal Slug - 2nd Mission (World)                                                                                                                                       |                         | 2000        | SNK                                                             | NeoGeo Pocket Color            |                                                                                     |
 | mslug1v2                        |        | Metal Slug - Super Vehicle-001 (1v2 Mode, Hack)                                                                                                                        | mslug                   | 2023        | hack                                                            | Neo Geo MVS                    |                                                                                     |
 | mslugfs                         |        | Metal Slug - Super Vehicle-001 (Firepower Showdown, Hack)                                                                                                              | mslug                   | 2024        | hack                                                            | Neo Geo MVS                    |                                                                                     |
-| mslugfc2                        |        | Metal Slug - Super Vehicle-001 (Item Random & Powerful Enemy Defense FC2, Hack)                                                                                        | mslug                   | 2024        | hack                                                            | Neo Geo MVS                    |                                                                                     |
-| mslugfc1                        |        | Metal Slug - Super Vehicle-001 (Item Random FC2, Hack)                                                                                                                 | mslug                   | 2024        | hack                                                            | Neo Geo MVS                    |                                                                                     |
 | mslugdg                         |        | Metal Slug - Super Vehicle-001 (Multifunction, Hack)                                                                                                                   | mslug                   | 2018        | hack                                                            | Neo Geo MVS                    |                                                                                     |
+| msqyfc1                         |        | Metal Slug - Super Vehicle-001 (Origins Item Random, Hack)                                                                                                             | mslug                   | 2024        | Alice                                                           | Neo Geo MVS                    |                                                                                     |
 | mslugqy                         |        | Metal Slug - Super Vehicle-001 (Origins, Hack)                                                                                                                         | mslug                   | 2024        | hack                                                            | Neo Geo MVS                    |                                                                                     |
+| mslugfc2                        |        | Metal Slug - Super Vehicle-001 (Random Item & Powerful Enemy Defense, Hack)                                                                                            | mslug                   | 2024        | Alice                                                           | Neo Geo MVS                    |                                                                                     |
+| mslugfc1                        |        | Metal Slug - Super Vehicle-001 (Random Item, Hack)                                                                                                                     | mslug                   | 2024        | Alice                                                           | Neo Geo MVS                    |                                                                                     |
 | mslug                           |        | Metal Slug - Super Vehicle-001                                                                                                                                         |                         | 1996        | Nazca                                                           | Neo Geo MVS                    |                                                                                     |
 | ms21v2                          |        | Metal Slug 2 - Super Vehicle-001/II (1v2 Mode, Hack)                                                                                                                   | mslug2                  | 2019        | hack                                                            | Neo Geo MVS                    |                                                                                     |
 | mslug2r                         |        | Metal Slug 2 - Super Vehicle-001/II (Enemy Remix, Hack)                                                                                                                | mslug2                  | 2014        | hack                                                            | Neo Geo MVS                    |                                                                                     |
diff --git a/src/burner/libretro/README.md b/src/burner/libretro/README.md
index c1772fe2ce..681031da99 100644
--- a/src/burner/libretro/README.md
+++ b/src/burner/libretro/README.md
@@ -105,6 +105,7 @@ The following "device type" also exist, but they won't be compatible with every
 * **Mouse (full)** : same as above, but the buttons will be on the mouse
 * **Pointer** : it will use "pointer" device (can be a mouse/trackball) to determine coordinates on screen, buttons will stay on retropad
 * **Lightgun** : it will use lightgun to determine coordinates on screen, buttons will be on the lightgun too.
+* **Analog Arcade Gun** : it will use the analog stick for gun games but in a different way than "Classic" and "Modern", it is particularily useful if you have a "fixed arcade gun" (arcade gun mounted on an analog control).
 
 ## Emulating consoles and computers
 
diff --git a/src/burner/libretro/retro_input.cpp b/src/burner/libretro/retro_input.cpp
index f63a0028b4..cbd69178b9 100644
--- a/src/burner/libretro/retro_input.cpp
+++ b/src/burner/libretro/retro_input.cpp
@@ -450,10 +450,21 @@ static inline void CinpDirectCoord(int port, int axis)
 		INT32 width, height;
 		BurnDrvGetVisibleSize(&width, &height);
 		// Check whether this axis is X or Y, update pointerValues accordingly
-		if ((nDeviceType[port] == RETRO_DEVICE_LIGHTGUN && sAxiBinds[axis].id == RETRO_DEVICE_ID_LIGHTGUN_SCREEN_X) || (nDeviceType[port] == RETRO_DEVICE_POINTER && sAxiBinds[axis].id == RETRO_DEVICE_ID_POINTER_X))
-			pointerValues[port][0] = (INT32)(width * (double(val)/double(0x10000)));
-		else if ((nDeviceType[port] == RETRO_DEVICE_LIGHTGUN && sAxiBinds[axis].id == RETRO_DEVICE_ID_LIGHTGUN_SCREEN_Y) || (nDeviceType[port] == RETRO_DEVICE_POINTER && sAxiBinds[axis].id == RETRO_DEVICE_ID_POINTER_Y))
-			pointerValues[port][1] = (INT32)(height * (double(val)/double(0x10000)));
+		if (nDeviceType[port] == RETRO_DEVICE_LIGHTGUN)
+		{
+			if (sAxiBinds[axis].id == RETRO_DEVICE_ID_LIGHTGUN_SCREEN_X) pointerValues[port][0] = (INT32)(width * (double(val)/double(0x10000)));
+			else if (sAxiBinds[axis].id == RETRO_DEVICE_ID_LIGHTGUN_SCREEN_Y) pointerValues[port][1] = (INT32)(height * (double(val)/double(0x10000)));
+		}
+		else if (nDeviceType[port] == RETRO_DEVICE_POINTER)
+		{
+			if (sAxiBinds[axis].id == RETRO_DEVICE_ID_POINTER_X) pointerValues[port][0] = (INT32)(width * (double(val)/double(0x10000)));
+			else if (sAxiBinds[axis].id == RETRO_DEVICE_ID_POINTER_Y) pointerValues[port][1] = (INT32)(height * (double(val)/double(0x10000)));
+		}
+		else if (nDeviceType[port] == RETROARCADE_GUN)
+		{
+			if (sAxiBinds[axis].id == RETRO_DEVICE_ID_ANALOG_X) pointerValues[port][0] = (INT32)(width * (double(val)/double(0x10000)));
+			else if (sAxiBinds[axis].id == RETRO_DEVICE_ID_ANALOG_Y) pointerValues[port][1] = (INT32)(height * (double(val)/double(0x10000)));
+		}
 	}
 	int player = port;
 	if ((BurnDrvGetHardwareCode() & HARDWARE_PUBLIC_MASK) == HARDWARE_NES || (strcmp(BurnDrvGetTextA(DRV_NAME), "cybertnk") == 0))
@@ -683,6 +694,15 @@ static INT32 GameInpSpecialOne(struct GameInp* pgi, INT32 nPlayer, char* szb, ch
 		}
 	}
 
+	if (nDeviceType[nPlayer] == RETROARCADE_GUN && BurnGunIsActive()) {
+		if (strcmp("x-axis", szb) == 0) {
+			GameInpAnalog2RetroInpAnalog(pgi, nPlayer, RETRO_DEVICE_ID_ANALOG_X, 0, description, GIT_DIRECT_COORD);
+		}
+		if (strcmp("y-axis", szb) == 0) {
+			GameInpAnalog2RetroInpAnalog(pgi, nPlayer, RETRO_DEVICE_ID_ANALOG_Y, 0, description, GIT_DIRECT_COORD);
+		}
+	}
+
 	if (nDeviceType[nPlayer] == RETRO_DEVICE_LIGHTGUN && BurnGunIsActive()) {
 		if (strcmp("x-axis", szb) == 0) {
 			GameInpAnalog2RetroInpAnalog(pgi, nPlayer, RETRO_DEVICE_ID_LIGHTGUN_SCREEN_X, 0, description, GIT_DIRECT_COORD);
@@ -2825,7 +2845,8 @@ void SetControllerInfo()
 			{ "Mouse (ball only)", RETROMOUSE_BALL },
 			{ "Mouse (full)", RETROMOUSE_FULL },
 			{ "Pointer", RETRO_DEVICE_POINTER },
-			{ "Lightgun", RETRO_DEVICE_LIGHTGUN }
+			{ "Lightgun", RETRO_DEVICE_LIGHTGUN },
+			{ "Analog Arcade Gun", RETROARCADE_GUN }
 		};
 
 		// kludge for nes (some 1p game want to use p2 controls)
@@ -3250,7 +3271,8 @@ void retro_set_controller_port_device(unsigned port, unsigned device)
 				device != RETROMOUSE_BALL &&
 				device != RETROMOUSE_FULL &&
 				device != RETRO_DEVICE_POINTER &&
-				device != RETRO_DEVICE_LIGHTGUN)
+				device != RETRO_DEVICE_LIGHTGUN &&
+				device != RETROARCADE_GUN)
 			{
 				device = RETROPAD_CLASSIC;
 				HandleMessage(RETRO_LOG_INFO, "[FBNeo] Unknown device type for port %d, forcing \"Classic\" instead\n", port);
diff --git a/src/burner/libretro/retro_input.h b/src/burner/libretro/retro_input.h
index ca2c5e1994..007bd373f1 100644
--- a/src/burner/libretro/retro_input.h
+++ b/src/burner/libretro/retro_input.h
@@ -36,6 +36,7 @@ extern retro_input_state_t input_cb;
 #define RETROPAD_6PANEL  RETRO_DEVICE_SUBCLASS(RETRO_DEVICE_ANALOG, 0)
 #define RETROPAD_MODERN  RETRO_DEVICE_SUBCLASS(RETRO_DEVICE_ANALOG, 1)
 #define RETROMOUSE_BALL  RETRO_DEVICE_SUBCLASS(RETRO_DEVICE_ANALOG, 2)
+#define RETROARCADE_GUN  RETRO_DEVICE_SUBCLASS(RETRO_DEVICE_ANALOG, 3)
 #define RETROMOUSE_FULL  RETRO_DEVICE_SUBCLASS(RETRO_DEVICE_MOUSE, 1)
 
 #define GIT_SPECIAL_SWITCH	(0x03)
diff --git a/src/dep/generated/driverlist.h b/src/dep/generated/driverlist.h
index 7c8602447f..bc976d24cb 100644
--- a/src/dep/generated/driverlist.h
+++ b/src/dep/generated/driverlist.h
@@ -120,6 +120,7 @@ DRV		BurnDrvcv_2010p1;
 DRV		BurnDrvcv_2010p;
 DRV		BurnDrvcv_2010;
 DRV		BurnDrvmd_2020bb;
+DRV		BurnDrvBb2020cd;
 DRV		BurnDrvBb2020;
 DRV		BurnDrvBba2020;
 DRV		BurnDrvBbh2020;
@@ -232,6 +233,7 @@ DRV		BurnSpecabusimpr;
 DRV		BurnDrvMSX_abusimbel;
 DRV		BurnSpecabusimprd;
 DRV		BurnDrvmd_abyssal;
+DRV		BurnDrvAbyssali;
 DRV		BurnSpecAce;
 DRV		BurnSpecAce2;
 DRV		BurnSpecAce2088;
@@ -9975,6 +9977,7 @@ DRV		BurnDrvGunhohki;
 DRV		BurnDrvnes_minkymomo;
 DRV		BurnDrvnes_minkymomoj;
 DRV		BurnDrvgg_mainursegg;
+DRV		BurnDrvpce_mainurse;
 DRV		BurnDrvsms_mainurse;
 DRV		BurnSpecMaincourse;
 DRV		BurnDrvMainsnk;
@@ -10476,10 +10479,11 @@ DRV		BurnDrvngpc_mslug2ndd;
 DRV		BurnDrvngpc_mslug2nd;
 DRV		BurnDrvMslug1v2;
 DRV		BurnDrvMslugfs;
-DRV		BurnDrvMslugfc2;
-DRV		BurnDrvMslugfc1;
 DRV		BurnDrvMslugdg;
+DRV		BurnDrvMsqyfc1;
 DRV		BurnDrvMslugqy;
+DRV		BurnDrvMslugfc2;
+DRV		BurnDrvMslugfc1;
 DRV		BurnDrvMslug;
 DRV		BurnDrvMs21v2;
 DRV		BurnDrvMslug2r;
@@ -20854,6 +20858,7 @@ static struct BurnDriver* pDriver[] = {
 	&BurnDrvcv_2010p,			// 2010: The Graphic Action Game (Prototype v54)
 	&BurnDrvcv_2010,			// 2010: The Graphic Action Game
 	&BurnDrvmd_2020bb,			// 2020 Super Baseball (Euro, USA)
+	&BurnDrvBb2020cd,			// 2020 Super Baseball (Neo CD conversion)
 	&BurnDrvBb2020,				// 2020 Super Baseball (set 1)
 	&BurnDrvBba2020,			// 2020 Super Baseball (set 2)
 	&BurnDrvBbh2020,			// 2020 Super Baseball (set 3)
@@ -20966,6 +20971,7 @@ static struct BurnDriver* pDriver[] = {
 	&BurnDrvMSX_abusimbel,		// Abu Simbel Profanation (Euro, Spanish)
 	&BurnSpecabusimprd,			// Abu Simbel Profanation (Spanish) (48K)
 	&BurnDrvmd_abyssal,			// Abyssal Infants (HB)
+	&BurnDrvAbyssali,			// Abyssal Infants
 	&BurnSpecAce,				// ACE - Air Combat Emulator (48K)
 	&BurnSpecAce2,				// ACE 2 - The Ultimate Head to Head Conflict (128K)
 	&BurnSpecAce2088,			// ACE 2088 (128K)
@@ -30709,6 +30715,7 @@ static struct BurnDriver* pDriver[] = {
 	&BurnDrvnes_minkymomo,		// Mahou no Princess Minky Momo - Remember Dream (Hack, English)
 	&BurnDrvnes_minkymomoj,		// Mahou no Princess Minky Momo - Remember Dream (Japan)
 	&BurnDrvgg_mainursegg,		// Mai Nurse (HB)
+	&BurnDrvpce_mainurse,		// Mai Nurse (HB)
 	&BurnDrvsms_mainurse,		// Mai Nurse (HB)
 	&BurnSpecMaincourse,		// Main Course - The Retro Cut (48K) (HB)
 	&BurnDrvMainsnk,			// Main Event (1984)
@@ -31210,10 +31217,11 @@ static struct BurnDriver* pDriver[] = {
 	&BurnDrvngpc_mslug2nd,		// Metal Slug - 2nd Mission (World)
 	&BurnDrvMslug1v2,			// Metal Slug - Super Vehicle-001 (1v2 Mode, Hack)
 	&BurnDrvMslugfs,			// Metal Slug - Super Vehicle-001 (Firepower Showdown, Hack)
-	&BurnDrvMslugfc2,			// Metal Slug - Super Vehicle-001 (Item Random & Powerful Enemy Defense FC2, Hack)
-	&BurnDrvMslugfc1,			// Metal Slug - Super Vehicle-001 (Item Random FC2, Hack)
 	&BurnDrvMslugdg,			// Metal Slug - Super Vehicle-001 (Multifunction, Hack)
+	&BurnDrvMsqyfc1,			// Metal Slug - Super Vehicle-001 (Origins Item Random, Hack)
 	&BurnDrvMslugqy,			// Metal Slug - Super Vehicle-001 (Origins, Hack)
+	&BurnDrvMslugfc2,			// Metal Slug - Super Vehicle-001 (Random Item & Powerful Enemy Defense, Hack)
+	&BurnDrvMslugfc1,			// Metal Slug - Super Vehicle-001 (Random Item, Hack)
 	&BurnDrvMslug,				// Metal Slug - Super Vehicle-001
 	&BurnDrvMs21v2,				// Metal Slug 2 - Super Vehicle-001/II (1v2 Mode, Hack)
 	&BurnDrvMslug2r,			// Metal Slug 2 - Super Vehicle-001/II (Enemy Remix, Hack)
@@ -41588,6 +41596,7 @@ static game_sourcefile_entry sourcefile_table[] = {
 	{ "cv_2010p", "coleco/d_coleco.cpp"},
 	{ "cv_2010", "coleco/d_coleco.cpp"},
 	{ "md_2020bb", "megadrive/d_megadrive.cpp"},
+	{ "2020bbcd", "neogeo/d_neogeo.cpp"},
 	{ "2020bb", "neogeo/d_neogeo.cpp"},
 	{ "2020bba", "neogeo/d_neogeo.cpp"},
 	{ "2020bbh", "neogeo/d_neogeo.cpp"},
@@ -41700,6 +41709,7 @@ static game_sourcefile_entry sourcefile_table[] = {
 	{ "msx_abusimbel", "msx/d_msx.cpp"},
 	{ "spec_abusimprd", "spectrum/d_spectrum.cpp"},
 	{ "md_abyssal", "megadrive/d_megadrive.cpp"},
+	{ "abyssali", "neogeo/d_neogeo.cpp"},
 	{ "spec_ace", "spectrum/d_spectrum.cpp"},
 	{ "spec_ace2", "spectrum/d_spectrum.cpp"},
 	{ "spec_ace2088", "spectrum/d_spectrum.cpp"},
@@ -51351,6 +51361,7 @@ static game_sourcefile_entry sourcefile_table[] = {
 	{ "nes_minkymomo", "nes/d_nes.cpp"},
 	{ "nes_minkymomoj", "nes/d_nes.cpp"},
 	{ "gg_mainursegg", "sms/d_sms.cpp"},
+	{ "pce_mainurse", "pce/d_pce.cpp"},
 	{ "sms_mainurse", "sms/d_sms.cpp"},
 	{ "spec_maincourse", "spectrum/d_spectrum.cpp"},
 	{ "mainsnk", "pre90s/d_mainsnk.cpp"},
@@ -51850,10 +51861,11 @@ static game_sourcefile_entry sourcefile_table[] = {
 	{ "ngp_mslug2nd", "pst90s/d_ngp.cpp"},
 	{ "mslug1v2", "neogeo/d_neogeo.cpp"},
 	{ "mslugfs", "neogeo/d_neogeo.cpp"},
-	{ "mslugfc2", "neogeo/d_neogeo.cpp"},
-	{ "mslugfc1", "neogeo/d_neogeo.cpp"},
 	{ "mslugdg", "neogeo/d_neogeo.cpp"},
+	{ "msqyfc1", "neogeo/d_neogeo.cpp"},
 	{ "mslugqy", "neogeo/d_neogeo.cpp"},
+	{ "mslugfc2", "neogeo/d_neogeo.cpp"},
+	{ "mslugfc1", "neogeo/d_neogeo.cpp"},
 	{ "mslug", "neogeo/d_neogeo.cpp"},
 	{ "ms21v2", "neogeo/d_neogeo.cpp"},
 	{ "mslug2r", "neogeo/d_neogeo.cpp"},