From 1a2914c2b8ea46ea5f822b3d5c9ac312c27971b6 Mon Sep 17 00:00:00 2001
From: arcadez2003 <51386955+arcadez2003@users.noreply.github.com>
Date: Mon, 30 Dec 2024 21:08:22 +0000
Subject: [PATCH 1/2] Add the MVS cart version of Captain Barrel (NeoByteForce)

---
 src/burn/drv/neogeo/d_neogeo.cpp | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/src/burn/drv/neogeo/d_neogeo.cpp b/src/burn/drv/neogeo/d_neogeo.cpp
index b8a64ba428..18d8e4786b 100644
--- a/src/burn/drv/neogeo/d_neogeo.cpp
+++ b/src/burn/drv/neogeo/d_neogeo.cpp
@@ -28377,3 +28377,35 @@ struct BurnDriver BurnDrvKnightsch = {
 	NeoInit, NeoExit, NeoFrame, NeoRender, NeoScan, &NeoRecalcPalette,
 	0x1000,	304, 224, 4, 3
 };
+
+// Captain Barrel
+// Neo Byte Force Ltd
+// https://www.neobyteforce.com/
+
+static struct BurnRomInfo captainbarrelRomDesc[] = {
+	{ "captain-p1.bin",	0x0100000, 0x6da1737d, 1 | BRF_ESS | BRF_PRG }, 	//  0 68K code
+	{ "captain-p2.bin",	0x0300000, 0xf6f90237, 1 | BRF_ESS | BRF_PRG }, 	//  1
+
+	{ "captain-s1.bin",	0x0020000, 0x9785df9c, 2 | BRF_GRA },           	//  2 Text layer tiles
+
+	{ "captain-c1.bin",	0x1000000, 0xbce671cd, 3 | BRF_GRA },           	//  3 Sprite data
+	{ "captain-c2.bin",	0x1000000, 0x843e16ac, 3 | BRF_GRA },           	//  4
+
+	{ "captain-m1.bin",	0x0010000, 0xed6260d2, 4 | BRF_ESS | BRF_PRG }, 	//  5 Z80 code
+
+	{ "captain-v1.bin",	0x0800000, 0x8cfcceb7, 5 | BRF_SND },           	//  6 Sound data
+	{ "captain-v2.bin",	0x0800000, 0xd1080962, 5 | BRF_SND },           	//  6 Sound data
+};
+
+STDROMPICKEXT(captainbarrel, captainbarrel, neogeo)
+STD_ROM_FN(captainbarrel)
+
+struct BurnDriver BurnDrvCaptainBarrel = {
+	"captainbarrel", NULL, "neogeo", NULL, "2024",
+	"Captain Barrel\0", NULL, "Neo Byte Force Ltd.", "Neo Geo MVS",
+	NULL, NULL, NULL, NULL,
+	BDF_GAME_WORKING | BDF_HOMEBREW, 2, HARDWARE_PREFIX_CARTRIDGE | HARDWARE_SNK_NEOGEO, GBF_PLATFORM, 0,
+	NULL, captainbarrelRomInfo, captainbarrelRomName, NULL, NULL, NULL, NULL, neogeoInputInfo, neogeoDIPInfo,
+	NeoInit, NeoExit, NeoFrame, NeoRender, NeoScan, &NeoRecalcPalette,
+	0x1000, 320, 224, 4, 3
+};

From f9061c83aa123397fa08814e5061513e5302aa76 Mon Sep 17 00:00:00 2001
From: arcadez2003 <51386955+arcadez2003@users.noreply.github.com>
Date: Mon, 30 Dec 2024 21:36:58 +0000
Subject: [PATCH 2/2] Fix rom loading

---
 src/burn/drv/neogeo/d_neogeo.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/burn/drv/neogeo/d_neogeo.cpp b/src/burn/drv/neogeo/d_neogeo.cpp
index 18d8e4786b..f9bcb31303 100644
--- a/src/burn/drv/neogeo/d_neogeo.cpp
+++ b/src/burn/drv/neogeo/d_neogeo.cpp
@@ -28383,18 +28383,18 @@ struct BurnDriver BurnDrvKnightsch = {
 // https://www.neobyteforce.com/
 
 static struct BurnRomInfo captainbarrelRomDesc[] = {
-	{ "captain-p1.bin",	0x0100000, 0x6da1737d, 1 | BRF_ESS | BRF_PRG }, 	//  0 68K code
-	{ "captain-p2.bin",	0x0300000, 0xf6f90237, 1 | BRF_ESS | BRF_PRG }, 	//  1
+	{ "captain-p1.bin", 0x100000", 0x6da1737d, 1 | BRF_ESS | BRF_PRG }, 	//  0 68K code
+	{ "captain-p2.bin",	0x100000", 0xf6f90237, 1 | BRF_ESS | BRF_PRG }, 	//  1
 
-	{ "captain-s1.bin",	0x0020000, 0x9785df9c, 2 | BRF_GRA },           	//  2 Text layer tiles
+	{ "captain-s1.bin",	0x020000,  0x9785df9c, 2 | BRF_GRA },           	//  2 Text layer tiles
 
-	{ "captain-c1.bin",	0x1000000, 0xbce671cd, 3 | BRF_GRA },           	//  3 Sprite data
-	{ "captain-c2.bin",	0x1000000, 0x843e16ac, 3 | BRF_GRA },           	//  4
+	{ "captain-c1.bin",	0x200000, 0xbce671cd, 3 | BRF_GRA },           	//  3 Sprite data
+	{ "captain-c2.bin",	0x200000, 0x843e16ac, 3 | BRF_GRA },           	//  4
 
-	{ "captain-m1.bin",	0x0010000, 0xed6260d2, 4 | BRF_ESS | BRF_PRG }, 	//  5 Z80 code
+	{ "captain-m1.bin",	0x010000, 0xed6260d2, 4 | BRF_ESS | BRF_PRG }, 	//  5 Z80 code
 
-	{ "captain-v1.bin",	0x0800000, 0x8cfcceb7, 5 | BRF_SND },           	//  6 Sound data
-	{ "captain-v2.bin",	0x0800000, 0xd1080962, 5 | BRF_SND },           	//  6 Sound data
+	{ "captain-v1.bin",	0x800000, 0x8cfcceb7, 5 | BRF_SND },           	//  6 Sound data
+	{ "captain-v2.bin",	0x800000, 0xd1080962, 5 | BRF_SND },           	//  6 Sound data
 };
 
 STDROMPICKEXT(captainbarrel, captainbarrel, neogeo)