From bff7585b51d3556074e75b7da43d8c68173a1e9d Mon Sep 17 00:00:00 2001
From: Barry Harris <44396066+barry65536@users.noreply.github.com>
Date: Sat, 18 Oct 2014 08:58:47 +0000
Subject: [PATCH] sf2ebbl3 gfx load

---
 src/burn/drv/capcom/cps.cpp    | 22 ++++++++++++++++++++++
 src/burn/drv/capcom/cps.h      |  1 +
 src/burn/drv/capcom/d_cps1.cpp | 13 ++++++++++---
 whatsnew.html                  |  2 +-
 4 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/src/burn/drv/capcom/cps.cpp b/src/burn/drv/capcom/cps.cpp
index c04a3d289..451eadfe3 100644
--- a/src/burn/drv/capcom/cps.cpp
+++ b/src/burn/drv/capcom/cps.cpp
@@ -1206,6 +1206,28 @@ INT32 CpsLoadTilesSf2ceuab7(INT32 nStart)
 	return 0;
 }
 
+INT32 CpsLoadTilesSf2ebbl3(INT32 nStart)
+{
+	CpsLoadOne(CpsGfx + 0x000000, nStart     , 1, 0);
+	CpsLoadOne(CpsGfx + 0x000000, nStart +  1, 1, 2);
+	CpsLoadOne(CpsGfx + 0x000004, nStart +  2, 0, 0);
+	CpsLoadOne(CpsGfx + 0x000004, nStart +  3, 0, 1);
+	CpsLoadOne(CpsGfx + 0x000004, nStart +  4, 0, 2);
+	CpsLoadOne(CpsGfx + 0x000004, nStart +  5, 0, 3);	
+	CpsLoadOne(CpsGfx + 0x200000, nStart +  6, 0, 0);
+	CpsLoadOne(CpsGfx + 0x200000, nStart +  7, 0, 1);
+	CpsLoadOne(CpsGfx + 0x200000, nStart +  8, 1, 2);
+	CpsLoadOne(CpsGfx + 0x200004, nStart +  9, 1, 0);
+	CpsLoadOne(CpsGfx + 0x200004, nStart + 10, 0, 2);
+	CpsLoadOne(CpsGfx + 0x200004, nStart + 11, 0, 3);	
+	CpsLoadOne(CpsGfx + 0x400000, nStart + 12, 1, 0);
+	CpsLoadOne(CpsGfx + 0x400000, nStart + 13, 1, 2);
+	CpsLoadOne(CpsGfx + 0x400004, nStart + 14, 1, 0);
+	CpsLoadOne(CpsGfx + 0x400004, nStart + 15, 1, 2);
+	
+	return 0;
+}
+
 INT32 CpsLoadTilesFcrash(INT32 nStart)
 {
 	CpsLoadTilesBootlegType3(CpsGfx + 0x000000, nStart +  0);
diff --git a/src/burn/drv/capcom/cps.h b/src/burn/drv/capcom/cps.h
index 06b624b6e..1428f14d1 100644
--- a/src/burn/drv/capcom/cps.h
+++ b/src/burn/drv/capcom/cps.h
@@ -50,6 +50,7 @@ INT32 CpsLoadTilesSf2mdta(INT32 nStart);
 INT32 CpsLoadTilesSf2ceuab3(INT32 nStart);
 INT32 CpsLoadTilesSf2ceeabl(INT32 nStart);
 INT32 CpsLoadTilesSf2ceuab7(INT32 nStart);
+INT32 CpsLoadTilesSf2ebbl3(INT32 nStart);
 INT32 CpsLoadTilesFcrash(INT32 nStart);
 INT32 CpsLoadTilesCawingbl(INT32 nStart);
 INT32 CpsLoadTilesCaptcommb(INT32 nStart);
diff --git a/src/burn/drv/capcom/d_cps1.cpp b/src/burn/drv/capcom/d_cps1.cpp
index fa4e52a13..91657ba8c 100644
--- a/src/burn/drv/capcom/d_cps1.cpp
+++ b/src/burn/drv/capcom/d_cps1.cpp
@@ -7992,8 +7992,8 @@ STD_ROM_PICK(Sf2ebbl2)
 STD_ROM_FN(Sf2ebbl2)
 
 static struct BurnRomInfo Sf2ebbl3RomDesc[] = {
-	{ "ce91e-b.bin",   0x080000, 0x963200d2, BRF_ESS | BRF_PRG | CPS1_68K_PROGRAM_BYTESWAP },
-	{ "ce91e-a.bin",   0x080000, 0x02e88ec7, BRF_ESS | BRF_PRG | CPS1_68K_PROGRAM_BYTESWAP },
+	{ "ce91e-b.bin",        0x080000, 0x963200d2, BRF_ESS | BRF_PRG | CPS1_68K_PROGRAM_BYTESWAP },
+	{ "ce91e-a.bin",        0x080000, 0x02e88ec7, BRF_ESS | BRF_PRG | CPS1_68K_PROGRAM_BYTESWAP },
 	
 	{ "1-b-yf197.07",  		0x080000, 0x22c9cc8e, BRF_GRA | CPS1_TILES },
 	{ "1-d-yf207.12",  		0x080000, 0x57213be8, BRF_GRA | CPS1_TILES },
@@ -14517,6 +14517,13 @@ static INT32 Sf2ebbl2Init()
 	return nRet;
 }
 
+static INT32 Sf2ebbl3Init()
+{
+	Cps1GfxLoadCallbackFunction = CpsLoadTilesSf2ebbl3;
+	
+	return Sf2ebblInit();
+}
+
 static INT32 Sf2sttInit()
 {
 	Cps1GfxLoadCallbackFunction = CpsLoadTilesSf2stt;
@@ -17815,7 +17822,7 @@ struct BurnDriver BurnDrvCpsSf2ebbl3 = {
 	NULL, NULL, NULL, NULL,
 	BDF_GAME_WORKING | BDF_CLONE | BDF_BOOTLEG, 2, HARDWARE_CAPCOM_CPS1, GBF_VSFIGHT, FBF_SF,
 	NULL, Sf2ebbl3RomInfo, Sf2ebbl3RomName, NULL, NULL, Sf2yycInputInfo, Sf2DIPInfo,
-	Sf2ebblInit, DrvExit, Cps1Frame, CpsRedraw, CpsAreaScan,
+	Sf2ebbl3Init, DrvExit, Cps1Frame, CpsRedraw, CpsAreaScan,
 	&CpsRecalcPal, 0x1000, 384, 224, 4, 3
 };
 
diff --git a/whatsnew.html b/whatsnew.html
index ff2f5f40c..41198b3cc 100644
--- a/whatsnew.html
+++ b/whatsnew.html
@@ -181,7 +181,7 @@
 <li>Added SMB4MD 1.4.2 aka Super Mario Bros. port to the MegaDrive driver [dink]</li>
 <li>Fix missing top line in the game statusbar for Acrobat Mission, Air Attack, S.S. Mission (NMK16) [dink]</li>
 <li>Fix Alien Soldier (PAL) on Megadrive won't boot, is wrongly detected as NTSC [dink]</li>
-<li>Added clone of Street Fighter II - The World Warrior (TAB Austria bootleg set 3, 910214 etc) [Any, JacKc]</li>
+<li>Added clone of Street Fighter II - The World Warrior (TAB Austria bootleg set 3, 910214 etc) [barry, any, JacKc]</li>
 <li>Fix flickering score and player status in Sunset Riders [dink]</li>
 <li>Fix broken reset with some Megadrive games, get rid of the garbage line at the bottom of the screen [dink]</li>
 <li>Added clone of OF 98' Combo (2014/03/10 version, Ivex hack) [JacKc]</li>