From 5a43814a09c6c370153595d8c43fc97cee6615aa Mon Sep 17 00:00:00 2001
From: jackchatelet <jackchatelet@f2e10478-e7fb-40a4-b0e2-024e28a34407>
Date: Fri, 26 Feb 2016 18:59:42 +0000
Subject: [PATCH] New clone added ---------------------- - The King of Fighters
 '98 (Anniversary Edition 2016, EGHT hack) [EGCG 2016] - Update The King of
 Fighters '98 (Combo) to 2016/01/28 version [Ivex]

---
 src/burn/drv/neogeo/d_neogeo.cpp    |  49 ++++++++-
 src/burn/drv/toaplan/d_batrider.cpp | 154 ++++++++++++++--------------
 src/burn/drv/toaplan/d_batsugun.cpp |  48 ++++-----
 3 files changed, 147 insertions(+), 104 deletions(-)

diff --git a/src/burn/drv/neogeo/d_neogeo.cpp b/src/burn/drv/neogeo/d_neogeo.cpp
index 7d4bd2c35..219e7f77f 100644
--- a/src/burn/drv/neogeo/d_neogeo.cpp
+++ b/src/burn/drv/neogeo/d_neogeo.cpp
@@ -14295,11 +14295,54 @@ struct BurnDriver BurnDrvkof98ae = {
 	0x1000,	304, 224, 4, 3
 };
 
+// The King of Fighters '98 (Anniversary Edition 2016, EGHT hack)
+
+static struct BurnRomInfo kof98ae2016RomDesc[] = {
+	{ "242ae-p1.bin", 0x100000, 0xa5380898, 1 | BRF_ESS | BRF_PRG }, //  0 68K code 
+	{ "242ae-p2.bin", 0x600000, 0x00624b89, 1 | BRF_ESS | BRF_PRG }, //  1 
+
+	{ "242ae-s1.bin", 0x020000, 0x8cf95ed7, 2 | BRF_GRA },           //  2 Text layer tiles
+
+	{ "242ae-c1.bin", 0x800000, 0x32e94f7a, 3 | BRF_GRA },           //  3 Sprite data
+	{ "242ae-c2.bin", 0x800000, 0x430d30b3, 3 | BRF_GRA },           //  4 
+	{ "242-c3.bin",   0x800000, 0x22127b4f, 3 | BRF_GRA },           //  5 
+	{ "242-c4.bin",   0x800000, 0x0b4fa044, 3 | BRF_GRA },           //  6 
+	{ "242ae-c5.bin", 0x800000, 0x71641718, 3 | BRF_GRA },           //  7 
+	{ "242ae-c6.bin", 0x800000, 0x982ba2b3, 3 | BRF_GRA },           //  8 
+	{ "242ae-c7.bin", 0x800000, 0x8d495552, 3 | BRF_GRA },           //  9 
+	{ "242ae-c8.bin", 0x800000, 0x8bfc3417, 3 | BRF_GRA },           // 10 
+	{ "242ae-c9.bin", 0x800000, 0x128256d1, 3 | BRF_GRA },           // 11
+	{ "242ae-c91.bin",0x800000, 0x4bd8412d, 3 | BRF_GRA },           // 12
+	{ "242ae-c92.bin",0x800000, 0xbf7d8fbe, 3 | BRF_GRA },           // 13
+	{ "242ae-c93.bin",0x800000, 0x91618377, 3 | BRF_GRA },           // 14
+
+	{ "242ae-m1.bin", 0x040000, 0x9ade0528, 4 | BRF_ESS | BRF_PRG }, // 15 Z80 code
+
+	{ "242-v1.bin",   0x400000, 0xb9ea8051, 5 | BRF_SND },           // 16 Sound data
+	{ "242-v2.bin",   0x400000, 0xcc11106e, 5 | BRF_SND },           // 17 
+	{ "242-v3.bin",   0x400000, 0x044ea4e1, 5 | BRF_SND },           // 18 
+	{ "242-v4.bin",   0x400000, 0x7985ea30, 5 | BRF_SND },           // 19 
+	{ "242ae-v5.bin", 0x400000, 0xafdd9660, 5 | BRF_SND },           // 20
+};
+
+STDROMPICKEXT(kof98ae2016, kof98ae2016, neogeo)
+STD_ROM_FN(kof98ae2016)
+
+struct BurnDriver BurnDrvkof98ae2016 = {
+	"kof98ae2016", "kof98", "neogeo", NULL, "2007",
+	"The King of Fighters '98 (Anniversary Edition 2016, EGHT hack)\0", NULL, "hack", "Neo Geo MVS",
+	NULL, NULL, NULL, NULL,
+	BDF_GAME_WORKING | BDF_CLONE | BDF_HACK, 2, HARDWARE_PREFIX_CARTRIDGE | HARDWARE_SNK_NEOGEO, GBF_VSFIGHT, FBF_KOF,
+	NULL, kof98ae2016RomInfo, kof98ae2016RomName, NULL, NULL, neogeoInputInfo, neogeoDIPInfo,
+	NeoInit, NeoExit, NeoFrame, NeoRender, NeoScan, &NeoRecalcPalette,
+	0x1000,	304, 224, 4, 3
+};
+
 // The King of Fighters '98 (Combo)
-/* Ivex hack - 2016/01/03 version */
+/* Ivex hack - 2016/01/28 version */
 static struct BurnRomInfo kof98cbRomDesc[] = {
-	{ "242cb-p1.p1", 	0x100000, 0x7549069f, 1 | BRF_ESS | BRF_PRG }, //  0 68K code 
-	{ "242cb-p2.p2", 	0x400000, 0xc53f8c35, 1 | BRF_ESS | BRF_PRG }, //  1 
+	{ "242cb-p1.p1", 	0x100000, 0x659f5b8c, 1 | BRF_ESS | BRF_PRG }, //  0 68K code 
+	{ "242cb-p2.p2", 	0x400000, 0xc0c0692b, 1 | BRF_ESS | BRF_PRG }, //  1 
 
 	{ "242cb-s1.s1", 	0x020000, 0x7333d8b0, 2 | BRF_GRA },           //  2 Text layer tiles
 
diff --git a/src/burn/drv/toaplan/d_batrider.cpp b/src/burn/drv/toaplan/d_batrider.cpp
index f8116346c..5b8a9dcf8 100644
--- a/src/burn/drv/toaplan/d_batrider.cpp
+++ b/src/burn/drv/toaplan/d_batrider.cpp
@@ -1008,20 +1008,20 @@ valid values are:
  */
  
 static struct BurnRomInfo batridRomDesc[] = {
-	{ "prg0_europe.u22", 0x080000, 0x91d3e975, BRF_ESS | BRF_PRG }, //  0 CPU #0 code	(even)
-	{ "prg2.u21",     	 0x080000, 0xbdaa5fbf, BRF_ESS | BRF_PRG }, //  1
-	{ "prg1b.u23",    	 0x080000, 0x8e70b492, BRF_ESS | BRF_PRG }, //  2				(odd)
-	{ "prg3.u24",     	 0x080000, 0x7aa9f941, BRF_ESS | BRF_PRG }, //  3
+	{ "prg0_europe.u22", 	0x080000, 0x91d3e975, BRF_ESS | BRF_PRG }, //  0 CPU #0 code	(even)
+	{ "prg2.u21",     	 	0x080000, 0xbdaa5fbf, BRF_ESS | BRF_PRG }, //  1
+	{ "prg1b.u23",    	 	0x080000, 0x8e70b492, BRF_ESS | BRF_PRG }, //  2				(odd)
+	{ "prg3.u24",     	 	0x080000, 0x7aa9f941, BRF_ESS | BRF_PRG }, //  3
 
-	{ "rom-1.bin",    	 0x400000, 0x0df69ca2, BRF_GRA },			 //  4 GP9001 Tile data
-	{ "rom-3.bin",    	 0x400000, 0x60167d38, BRF_GRA },			 //  5
-	{ "rom-2.bin",    	 0x400000, 0x1bfea593, BRF_GRA },			 //  6
-	{ "rom-4.bin",    	 0x400000, 0xbee03c94, BRF_GRA },			 //  7
+	{ "rom-1.bin",    	 	0x400000, 0x0df69ca2, BRF_GRA },			 //  4 GP9001 Tile data
+	{ "rom-3.bin",    	 	0x400000, 0x60167d38, BRF_GRA },			 //  5
+	{ "rom-2.bin",    	 	0x400000, 0x1bfea593, BRF_GRA },			 //  6
+	{ "rom-4.bin",    	 	0x400000, 0xbee03c94, BRF_GRA },			 //  7
 
-	{ "snd.u77",      	 0x040000, 0x56682696, BRF_ESS | BRF_PRG }, //  8 Z80 program
+	{ "snd.u77",      	 	0x040000, 0x56682696, BRF_ESS | BRF_PRG }, //  8 Z80 program
 
-	{ "rom-5.bin",    	 0x100000, 0x4274daf6, BRF_SND },			 //  9 MSM6295 #1 ADPCM data
-	{ "rom-6.bin",    	 0x100000, 0x2a1c2426, BRF_SND },			 // 10 MSM6295 #2 ADPCM data
+	{ "rom-5.bin",    	 	0x100000, 0x4274daf6, BRF_SND },			 //  9 MSM6295 #1 ADPCM data
+	{ "rom-6.bin",    	 	0x100000, 0x2a1c2426, BRF_SND },			 // 10 MSM6295 #2 ADPCM data
 };
 
 
@@ -1029,20 +1029,20 @@ STD_ROM_PICK(batrid)
 STD_ROM_FN(batrid)
 
 static struct BurnRomInfo batriduRomDesc[] = {
-	{ "prg0_usa.u22", 	 0x080000, 0x2049d007, BRF_ESS | BRF_PRG }, //  0 CPU #0 code	(even)
-	{ "prg2.u21",     	 0x080000, 0xbdaa5fbf, BRF_ESS | BRF_PRG }, //  1
-	{ "prg1b.u23",    	 0x080000, 0x8e70b492, BRF_ESS | BRF_PRG }, //  2				(odd)
-	{ "prg3.u24",     	 0x080000, 0x7aa9f941, BRF_ESS | BRF_PRG }, //  3
+	{ "prg0_usa.u22", 	 	0x080000, 0x2049d007, BRF_ESS | BRF_PRG }, //  0 CPU #0 code	(even)
+	{ "prg2.u21",     	 	0x080000, 0xbdaa5fbf, BRF_ESS | BRF_PRG }, //  1
+	{ "prg1b.u23",    	 	0x080000, 0x8e70b492, BRF_ESS | BRF_PRG }, //  2				(odd)
+	{ "prg3.u24",     	 	0x080000, 0x7aa9f941, BRF_ESS | BRF_PRG }, //  3
 
-	{ "rom-1.bin",    	 0x400000, 0x0df69ca2, BRF_GRA },			 //  4 GP9001 Tile data
-	{ "rom-3.bin",    	 0x400000, 0x60167d38, BRF_GRA },			 //  5
-	{ "rom-2.bin",    	 0x400000, 0x1bfea593, BRF_GRA },			 //  6
-	{ "rom-4.bin",    	 0x400000, 0xbee03c94, BRF_GRA },			 //  7
+	{ "rom-1.bin",    	 	0x400000, 0x0df69ca2, BRF_GRA },			 //  4 GP9001 Tile data
+	{ "rom-3.bin",    	 	0x400000, 0x60167d38, BRF_GRA },			 //  5
+	{ "rom-2.bin",    	 	0x400000, 0x1bfea593, BRF_GRA },			 //  6
+	{ "rom-4.bin",    	 	0x400000, 0xbee03c94, BRF_GRA },			 //  7
 
-	{ "snd.u77",      	 0x040000, 0x56682696, BRF_ESS | BRF_PRG }, //  8 Z80 program
+	{ "snd.u77",      	 	0x040000, 0x56682696, BRF_ESS | BRF_PRG }, //  8 Z80 program
 
-	{ "rom-5.bin",    	 0x100000, 0x4274daf6, BRF_SND },			 //  9 MSM6295 #1 ADPCM data
-	{ "rom-6.bin",    	 0x100000, 0x2a1c2426, BRF_SND },			 // 10 MSM6295 #2 ADPCM data
+	{ "rom-5.bin",    	 	0x100000, 0x4274daf6, BRF_SND },			 //  9 MSM6295 #1 ADPCM data
+	{ "rom-6.bin",    	 	0x100000, 0x2a1c2426, BRF_SND },			 // 10 MSM6295 #2 ADPCM data
 };
 
 
@@ -1050,20 +1050,20 @@ STD_ROM_PICK(batridu)
 STD_ROM_FN(batridu)
 
 static struct BurnRomInfo batridcRomDesc[] = {
-	{ "prg0_china.u22",  0x080000, 0xc3b91f7e, BRF_ESS | BRF_PRG }, //  0 CPU #0 code	(even)
-	{ "prg2.u21",     	 0x080000, 0xbdaa5fbf, BRF_ESS | BRF_PRG }, //  1
-	{ "prg1b.u23",    	 0x080000, 0x8e70b492, BRF_ESS | BRF_PRG }, //  2				(odd)
-	{ "prg3.u24",     	 0x080000, 0x7aa9f941, BRF_ESS | BRF_PRG }, //  3
+	{ "prg0_china.u22",  	0x080000, 0xc3b91f7e, BRF_ESS | BRF_PRG }, //  0 CPU #0 code	(even)
+	{ "prg2.u21",     	 	0x080000, 0xbdaa5fbf, BRF_ESS | BRF_PRG }, //  1
+	{ "prg1b.u23",    	 	0x080000, 0x8e70b492, BRF_ESS | BRF_PRG }, //  2				(odd)
+	{ "prg3.u24",     	 	0x080000, 0x7aa9f941, BRF_ESS | BRF_PRG }, //  3
 
-	{ "rom-1.bin",    	 0x400000, 0x0df69ca2, BRF_GRA },			 //  4 GP9001 Tile data
-	{ "rom-3.bin",    	 0x400000, 0x60167d38, BRF_GRA },			 //  5
-	{ "rom-2.bin",    	 0x400000, 0x1bfea593, BRF_GRA },			 //  6
-	{ "rom-4.bin",    	 0x400000, 0xbee03c94, BRF_GRA },			 //  7
+	{ "rom-1.bin",    	 	0x400000, 0x0df69ca2, BRF_GRA },			 //  4 GP9001 Tile data
+	{ "rom-3.bin",    	 	0x400000, 0x60167d38, BRF_GRA },			 //  5
+	{ "rom-2.bin",    	 	0x400000, 0x1bfea593, BRF_GRA },			 //  6
+	{ "rom-4.bin",    	 	0x400000, 0xbee03c94, BRF_GRA },			 //  7
 
-	{ "snd.u77",      	 0x040000, 0x56682696, BRF_ESS | BRF_PRG }, //  8 Z80 program
+	{ "snd.u77",      	 	0x040000, 0x56682696, BRF_ESS | BRF_PRG }, //  8 Z80 program
 
-	{ "rom-5.bin",    	 0x100000, 0x4274daf6, BRF_SND },			 //  9 MSM6295 #1 ADPCM data
-	{ "rom-6.bin",    	 0x100000, 0x2a1c2426, BRF_SND },			 // 10 MSM6295 #2 ADPCM data
+	{ "rom-5.bin",    	 	0x100000, 0x4274daf6, BRF_SND },			 //  9 MSM6295 #1 ADPCM data
+	{ "rom-6.bin",    	 	0x100000, 0x2a1c2426, BRF_SND },			 // 10 MSM6295 #2 ADPCM data
 };
 
 
@@ -1071,20 +1071,20 @@ STD_ROM_PICK(batridc)
 STD_ROM_FN(batridc)
 
 static struct BurnRomInfo batridjRomDesc[] = {
-	{ "prg0b.u22",    	 0x080000, 0x4f3fc729, BRF_ESS | BRF_PRG }, //  0 CPU #0 code	(even)
-	{ "prg2.u21",     	 0x080000, 0xbdaa5fbf, BRF_ESS | BRF_PRG }, //  1
-	{ "prg1b.u23",    	 0x080000, 0x8e70b492, BRF_ESS | BRF_PRG }, //  2				(odd)
-	{ "prg3.u24",     	 0x080000, 0x7aa9f941, BRF_ESS | BRF_PRG }, //  3
+	{ "prg0b.u22",    	 	0x080000, 0x4f3fc729, BRF_ESS | BRF_PRG }, //  0 CPU #0 code	(even)
+	{ "prg2.u21",     	 	0x080000, 0xbdaa5fbf, BRF_ESS | BRF_PRG }, //  1
+	{ "prg1b.u23",    	 	0x080000, 0x8e70b492, BRF_ESS | BRF_PRG }, //  2				(odd)
+	{ "prg3.u24",     	 	0x080000, 0x7aa9f941, BRF_ESS | BRF_PRG }, //  3
 
-	{ "rom-1.bin",    	 0x400000, 0x0df69ca2, BRF_GRA },			 //  4 GP9001 Tile data
-	{ "rom-3.bin",    	 0x400000, 0x60167d38, BRF_GRA },			 //  5
-	{ "rom-2.bin",    	 0x400000, 0x1bfea593, BRF_GRA },			 //  6
-	{ "rom-4.bin",    	 0x400000, 0xbee03c94, BRF_GRA },			 //  7
+	{ "rom-1.bin",    	 	0x400000, 0x0df69ca2, BRF_GRA },			 //  4 GP9001 Tile data
+	{ "rom-3.bin",    	 	0x400000, 0x60167d38, BRF_GRA },			 //  5
+	{ "rom-2.bin",    	 	0x400000, 0x1bfea593, BRF_GRA },			 //  6
+	{ "rom-4.bin",    	 	0x400000, 0xbee03c94, BRF_GRA },			 //  7
 
-	{ "snd.u77",      	 0x040000, 0x56682696, BRF_ESS | BRF_PRG }, //  8 Z80 program
+	{ "snd.u77",      	 	0x040000, 0x56682696, BRF_ESS | BRF_PRG }, //  8 Z80 program
 
-	{ "rom-5.bin",    	 0x100000, 0x4274daf6, BRF_SND },			 //  9 MSM6295 #1 ADPCM data
-	{ "rom-6.bin",    	 0x100000, 0x2a1c2426, BRF_SND },			 // 10 MSM6295 #2 ADPCM data
+	{ "rom-5.bin",    	 	0x100000, 0x4274daf6, BRF_SND },			 //  9 MSM6295 #1 ADPCM data
+	{ "rom-6.bin",    	 	0x100000, 0x2a1c2426, BRF_SND },			 // 10 MSM6295 #2 ADPCM data
 };
 
 
@@ -1092,20 +1092,20 @@ STD_ROM_PICK(batridj)
 STD_ROM_FN(batridj)
 
 static struct BurnRomInfo batridkRomDesc[] = {
-	{ "prg0_korea.u22",  0x080000, 0xd9d8c907, BRF_ESS | BRF_PRG }, //  0 CPU #0 code	(even)
-	{ "prg2.u21",     	 0x080000, 0xbdaa5fbf, BRF_ESS | BRF_PRG }, //  1
-	{ "prg1b.u23",    	 0x080000, 0x8e70b492, BRF_ESS | BRF_PRG }, //  2				(odd)
-	{ "prg3.u24",     	 0x080000, 0x7aa9f941, BRF_ESS | BRF_PRG }, //  3
+	{ "prg0_korea.u22",  	0x080000, 0xd9d8c907, BRF_ESS | BRF_PRG }, //  0 CPU #0 code	(even)
+	{ "prg2.u21",     	 	0x080000, 0xbdaa5fbf, BRF_ESS | BRF_PRG }, //  1
+	{ "prg1b.u23",    	 	0x080000, 0x8e70b492, BRF_ESS | BRF_PRG }, //  2				(odd)
+	{ "prg3.u24",     	 	0x080000, 0x7aa9f941, BRF_ESS | BRF_PRG }, //  3
 
-	{ "rom-1.bin",    	 0x400000, 0x0df69ca2, BRF_GRA },			 //  4 GP9001 Tile data
-	{ "rom-3.bin",    	 0x400000, 0x60167d38, BRF_GRA },			 //  5
-	{ "rom-2.bin",    	 0x400000, 0x1bfea593, BRF_GRA },			 //  6
-	{ "rom-4.bin",    	 0x400000, 0xbee03c94, BRF_GRA },			 //  7
+	{ "rom-1.bin",    	 	0x400000, 0x0df69ca2, BRF_GRA },			 //  4 GP9001 Tile data
+	{ "rom-3.bin",    	 	0x400000, 0x60167d38, BRF_GRA },			 //  5
+	{ "rom-2.bin",    	 	0x400000, 0x1bfea593, BRF_GRA },			 //  6
+	{ "rom-4.bin",    	 	0x400000, 0xbee03c94, BRF_GRA },			 //  7
 
-	{ "snd.u77",      	 0x040000, 0x56682696, BRF_ESS | BRF_PRG }, //  8 Z80 program
+	{ "snd.u77",      	 	0x040000, 0x56682696, BRF_ESS | BRF_PRG }, //  8 Z80 program
 
-	{ "rom-5.bin",    	 0x100000, 0x4274daf6, BRF_SND },			 //  9 MSM6295 #1 ADPCM data
-	{ "rom-6.bin",    	 0x100000, 0x2a1c2426, BRF_SND },			 // 10 MSM6295 #2 ADPCM data
+	{ "rom-5.bin",    	 	0x100000, 0x4274daf6, BRF_SND },			 //  9 MSM6295 #1 ADPCM data
+	{ "rom-6.bin",    	 	0x100000, 0x2a1c2426, BRF_SND },			 // 10 MSM6295 #2 ADPCM data
 };
 
 
@@ -1113,20 +1113,20 @@ STD_ROM_PICK(batridk)
 STD_ROM_FN(batridk)
 
 static struct BurnRomInfo batridjaRomDesc[] = {
-	{ "prg0.bin",     	 0x080000, 0xf93ea27c, BRF_ESS | BRF_PRG }, //  0 CPU #0 code	(even)
-	{ "prg2.u21",     	 0x080000, 0xbdaa5fbf, BRF_ESS | BRF_PRG }, //  1
-	{ "prg1.u23",     	 0x080000, 0x8ae7f592, BRF_ESS | BRF_PRG }, //  2				(odd)
-	{ "prg3.u24",     	 0x080000, 0x7aa9f941, BRF_ESS | BRF_PRG }, //  3
+	{ "prg0.bin",     	 	0x080000, 0xf93ea27c, BRF_ESS | BRF_PRG }, //  0 CPU #0 code	(even)
+	{ "prg2.u21",     	 	0x080000, 0xbdaa5fbf, BRF_ESS | BRF_PRG }, //  1
+	{ "prg1.u23",     	 	0x080000, 0x8ae7f592, BRF_ESS | BRF_PRG }, //  2				(odd)
+	{ "prg3.u24",     	 	0x080000, 0x7aa9f941, BRF_ESS | BRF_PRG }, //  3
 
-	{ "rom-1.bin",    	 0x400000, 0x0df69ca2, BRF_GRA },			 //  4 GP9001 Tile data
-	{ "rom-3.bin",    	 0x400000, 0x60167d38, BRF_GRA },			 //  5
-	{ "rom-2.bin",    	 0x400000, 0x1bfea593, BRF_GRA },			 //  6
-	{ "rom-4.bin",    	 0x400000, 0xbee03c94, BRF_GRA },			 //  7
+	{ "rom-1.bin",    	 	0x400000, 0x0df69ca2, BRF_GRA },			 //  4 GP9001 Tile data
+	{ "rom-3.bin",    	 	0x400000, 0x60167d38, BRF_GRA },			 //  5
+	{ "rom-2.bin",    	 	0x400000, 0x1bfea593, BRF_GRA },			 //  6
+	{ "rom-4.bin",    	 	0x400000, 0xbee03c94, BRF_GRA },			 //  7
 
-	{ "snd.u77",      	 0x040000, 0x56682696, BRF_ESS | BRF_PRG }, //  8 Z80 program
+	{ "snd.u77",      	 	0x040000, 0x56682696, BRF_ESS | BRF_PRG }, //  8 Z80 program
 
-	{ "rom-5.bin",    	 0x100000, 0x4274daf6, BRF_SND },			 //  9 MSM6295 #1 ADPCM data
-	{ "rom-6.bin",    	 0x100000, 0x2a1c2426, BRF_SND },			 // 10 MSM6295 #2 ADPCM data
+	{ "rom-5.bin",    	 	0x100000, 0x4274daf6, BRF_SND },			 //  9 MSM6295 #1 ADPCM data
+	{ "rom-6.bin",    	 	0x100000, 0x2a1c2426, BRF_SND },			 // 10 MSM6295 #2 ADPCM data
 };
 
 
@@ -1134,20 +1134,20 @@ STD_ROM_PICK(batridja)
 STD_ROM_FN(batridja)
 
 static struct BurnRomInfo batridtaRomDesc[] = {
-	{ "u22.bin",      	 0x080000, 0xb135820e, BRF_ESS | BRF_PRG }, //  0 CPU #0 code	(even)
-	{ "prg2.u21",     	 0x080000, 0xbdaa5fbf, BRF_ESS | BRF_PRG }, //  1
-	{ "prg1.u23",     	 0x080000, 0x8ae7f592, BRF_ESS | BRF_PRG }, //  2				(odd)
-	{ "prg3.u24",     	 0x080000, 0x7aa9f941, BRF_ESS | BRF_PRG }, //  3
+	{ "u22.bin",      	 	0x080000, 0xb135820e, BRF_ESS | BRF_PRG }, //  0 CPU #0 code	(even)
+	{ "prg2.u21",     	 	0x080000, 0xbdaa5fbf, BRF_ESS | BRF_PRG }, //  1
+	{ "prg1.u23",     	 	0x080000, 0x8ae7f592, BRF_ESS | BRF_PRG }, //  2				(odd)
+	{ "prg3.u24",     	 	0x080000, 0x7aa9f941, BRF_ESS | BRF_PRG }, //  3
 
-	{ "rom-1.bin",    	 0x400000, 0x0df69ca2, BRF_GRA },			 //  4 GP9001 Tile data
-	{ "rom-3.bin",    	 0x400000, 0x60167d38, BRF_GRA },			 //  5
-	{ "rom-2.bin",    	 0x400000, 0x1bfea593, BRF_GRA },			 //  6
-	{ "rom-4.bin",    	 0x400000, 0xbee03c94, BRF_GRA },			 //  7
+	{ "rom-1.bin",    	 	0x400000, 0x0df69ca2, BRF_GRA },			 //  4 GP9001 Tile data
+	{ "rom-3.bin",    	 	0x400000, 0x60167d38, BRF_GRA },			 //  5
+	{ "rom-2.bin",    	 	0x400000, 0x1bfea593, BRF_GRA },			 //  6
+	{ "rom-4.bin",    	 	0x400000, 0xbee03c94, BRF_GRA },			 //  7
 
-	{ "snd.u77",      	 0x040000, 0x56682696, BRF_ESS | BRF_PRG }, //  8 Z80 program
+	{ "snd.u77",      	 	0x040000, 0x56682696, BRF_ESS | BRF_PRG }, //  8 Z80 program
 
-	{ "rom-5.bin",    	 0x100000, 0x4274daf6, BRF_SND },			 //  9 MSM6295 #1 ADPCM data
-	{ "rom-6.bin",    	 0x100000, 0x2a1c2426, BRF_SND },			 // 10 MSM6295 #2 ADPCM data
+	{ "rom-5.bin",    	 	0x100000, 0x4274daf6, BRF_SND },			 //  9 MSM6295 #1 ADPCM data
+	{ "rom-6.bin",    	 	0x100000, 0x2a1c2426, BRF_SND },			 // 10 MSM6295 #2 ADPCM data
 };
 
 
diff --git a/src/burn/drv/toaplan/d_batsugun.cpp b/src/burn/drv/toaplan/d_batsugun.cpp
index c1c548926..a5ffdcf20 100644
--- a/src/burn/drv/toaplan/d_batsugun.cpp
+++ b/src/burn/drv/toaplan/d_batsugun.cpp
@@ -15,17 +15,17 @@ static INT32 v25_reset = 0;
 
 // Rom information
 static struct BurnRomInfo batsugunRomDesc[] = {
-	{ "tp030_1a.bin", 0x080000, 0xcb1d4554, BRF_ESS | BRF_PRG }, //  0 CPU #0 code
+	{ "tp030_1a.bin", 	0x080000, 0xcb1d4554, BRF_ESS | BRF_PRG },  //  0 CPU #0 code
 
-	{ "tp030_3l.bin", 0x100000, 0x3024B793, BRF_GRA },			 //  1 GP9001 #1 Tile data
-	{ "tp030_3h.bin", 0x100000, 0xED75730B, BRF_GRA },			 //  2
-	{ "tp030_4l.bin", 0x100000, 0xFEDB9861, BRF_GRA },			 //  3
-	{ "tp030_4h.bin", 0x100000, 0xD482948B, BRF_GRA },			 //  4
+	{ "tp030_3l.bin", 	0x100000, 0x3024b793, BRF_GRA },			//  1 GP9001 #1 Tile data
+	{ "tp030_3h.bin", 	0x100000, 0xed75730b, BRF_GRA },			//  2
+	{ "tp030_4l.bin", 	0x100000, 0xfedb9861, BRF_GRA },			//  3
+	{ "tp030_4h.bin", 	0x100000, 0xd482948b, BRF_GRA },			//  4
 
-	{ "tp030_5.bin",  0x100000, 0xBCF5BA05, BRF_GRA },			 //  5
-	{ "tp030_6.bin",  0x100000, 0x0666FECD, BRF_GRA },			 //  6
+	{ "tp030_5.bin",  	0x100000, 0xbcf5ba05, BRF_GRA },			//  5
+	{ "tp030_6.bin",  	0x100000, 0x0666fecd, BRF_GRA },			//  6
 
-	{ "tp030_2.bin",  0x040000, 0x276146F5, BRF_SND },			 //  7 ADPCM data
+	{ "tp030_2.bin",  	0x040000, 0x276146f5, BRF_SND },			//  7 ADPCM data
 	
 	{ "tp030_u19_gal16v8b-15.bin", 0x000117, 0xf71669e8, BRF_OPT }, // 8 Logic for mixing output of both GP9001 GFX controllers
 // 	{ "tp030_u19_gal16v8b-15.jed", 0x000991, 0x31be54a2, BRF_OPT },
@@ -35,17 +35,17 @@ STD_ROM_PICK(batsugun)
 STD_ROM_FN(batsugun)
 
 static struct BurnRomInfo batsugnaRomDesc[] = {
-	{ "tp030_01.bin", 0x080000, 0x3873D7DD, BRF_ESS | BRF_PRG }, //  0 CPU #0 code
+	{ "tp030_01.bin", 	0x080000, 0x3873d7dd, BRF_ESS | BRF_PRG },  //  0 CPU #0 code
 
-	{ "tp030_3l.bin", 0x100000, 0x3024B793, BRF_GRA },			 //  1 GP9001 #1 Tile data
-	{ "tp030_3h.bin", 0x100000, 0xED75730B, BRF_GRA },			 //  2
-	{ "tp030_4l.bin", 0x100000, 0xFEDB9861, BRF_GRA },			 //  3
-	{ "tp030_4h.bin", 0x100000, 0xD482948B, BRF_GRA },			 //  4
+	{ "tp030_3l.bin", 	0x100000, 0x3024b793, BRF_GRA },			//  1 GP9001 #1 Tile data
+	{ "tp030_3h.bin", 	0x100000, 0xed75730b, BRF_GRA },			//  2
+	{ "tp030_4l.bin", 	0x100000, 0xfedb9861, BRF_GRA },			//  3
+	{ "tp030_4h.bin", 	0x100000, 0xd482948b, BRF_GRA },			//  4
 
-	{ "tp030_5.bin",  0x100000, 0xBCF5BA05, BRF_GRA },			 //  5
-	{ "tp030_6.bin",  0x100000, 0x0666FECD, BRF_GRA },			 //  6
+	{ "tp030_5.bin",  	0x100000, 0xbcf5ba05, BRF_GRA },			//  5
+	{ "tp030_6.bin",  	0x100000, 0x0666fecd, BRF_GRA },			//  6
 
-	{ "tp030_2.bin",  0x040000, 0x276146F5, BRF_SND },			 //  7 ADPCM data
+	{ "tp030_2.bin",  	0x040000, 0x276146f5, BRF_SND },			//  7 ADPCM data
 	
 	{ "tp030_u19_gal16v8b-15.bin", 0x000117, 0xf71669e8, BRF_OPT }, // 8 Logic for mixing output of both GP9001 GFX controllers
 };
@@ -54,17 +54,17 @@ STD_ROM_PICK(batsugna)
 STD_ROM_FN(batsugna)
 
 static struct BurnRomInfo batugnspRomDesc[] = {
-	{ "tp030-sp.u69", 0x080000, 0x8072A0CD, BRF_ESS | BRF_PRG }, //  0 CPU #0 code
+	{ "tp030-sp.u69", 	0x080000, 0x8072a0cd, BRF_ESS | BRF_PRG },  //  0 CPU #0 code
 
-	{ "tp030_3l.bin", 0x100000, 0x3024B793, BRF_GRA },			 //  1 GP9001 #1 Tile data
-	{ "tp030_3h.bin", 0x100000, 0xED75730B, BRF_GRA },			 //  2
-	{ "tp030_4l.bin", 0x100000, 0xFEDB9861, BRF_GRA },			 //  3
-	{ "tp030_4h.bin", 0x100000, 0xD482948B, BRF_GRA },			 //  4
+	{ "tp030_3l.bin", 	0x100000, 0x3024b793, BRF_GRA },			//  1 GP9001 #1 Tile data
+	{ "tp030_3h.bin", 	0x100000, 0xed75730b, BRF_GRA },			//  2
+	{ "tp030_4l.bin", 	0x100000, 0xfedb9861, BRF_GRA },			//  3
+	{ "tp030_4h.bin", 	0x100000, 0xd482948b, BRF_GRA },			//  4
 
-	{ "tp030_5.bin",  0x100000, 0xBCF5BA05, BRF_GRA },			 //  5
-	{ "tp030_6.bin",  0x100000, 0x0666FECD, BRF_GRA },			 //  6
+	{ "tp030_5.bin",  	0x100000, 0xbcf5ba05, BRF_GRA },			//  5
+	{ "tp030_6.bin",  	0x100000, 0x0666fecd, BRF_GRA },			//  6
 
-	{ "tp030_2.bin",  0x040000, 0x276146F5, BRF_SND },			 //  7 ADPCM data
+	{ "tp030_2.bin",  	0x040000, 0x276146f5, BRF_SND },			//  7 ADPCM data
 	
 	{ "tp030_u19_gal16v8b-15.bin", 0x000117, 0xf71669e8, BRF_OPT }, // 8 Logic for mixing output of both GP9001 GFX controllers
 };