From 60c5f06ddc91de503f2ed147e8ac4deea2333480 Mon Sep 17 00:00:00 2001 From: Barry Harris <44396066+barry65536@users.noreply.github.com> Date: Fri, 30 Mar 2012 19:47:43 +0000 Subject: [PATCH] Exclude and document sf2m15 (previously known as sf2m8) in d_cps1.cpp --- src/burn/drv/capcom/d_cps1.cpp | 106 +++++++++++++++++---------------- 1 file changed, 55 insertions(+), 51 deletions(-) diff --git a/src/burn/drv/capcom/d_cps1.cpp b/src/burn/drv/capcom/d_cps1.cpp index c3d8479e5..47400ec75 100644 --- a/src/burn/drv/capcom/d_cps1.cpp +++ b/src/burn/drv/capcom/d_cps1.cpp @@ -9,7 +9,7 @@ #define CPS1_PIC 7 //#define INCLUDE_DUPLICATES 1 -//#define INCLUDE_CPS1_PHOENIX 1 +//#define INCLUDE_BAD_DUMPS 1 typedef INT32 (*Cps1Callback)(INT32); static Cps1Callback Cps1CallbackFunction; @@ -8519,34 +8519,6 @@ static struct BurnRomInfo Sf2m14RomDesc[] = { STD_ROM_PICK(Sf2m14) STD_ROM_FN(Sf2m14) -static struct BurnRomInfo Sf2m15RomDesc[] = { - { "k4-222", 0x0080000, 0xdb567b66, BRF_ESS | BRF_PRG | CPS1_68K_PROGRAM_BYTESWAP }, - { "k4-196", 0x0080000, 0x95ea597e, BRF_ESS | BRF_PRG | CPS1_68K_PROGRAM_BYTESWAP }, - { "u221.epr", 0x0020000, 0xd8276822, BRF_ESS | BRF_PRG | CPS1_68K_PROGRAM_BYTESWAP }, - { "u195.epr", 0x0020000, 0x924c6ce2, BRF_ESS | BRF_PRG | CPS1_68K_PROGRAM_BYTESWAP }, - - { "s92_01.bin", 0x0080000, 0x03b0d852, BRF_GRA | CPS1_TILES }, - { "s92_02.bin", 0x0080000, 0x840289ec, BRF_GRA | CPS1_TILES }, - { "s92_03.bin", 0x0080000, 0xcdb5f027, BRF_GRA | CPS1_TILES }, - { "s92_04.bin", 0x0080000, 0xe2799472, BRF_GRA | CPS1_TILES }, - { "s92_05.bin", 0x0080000, 0xba8a2761, BRF_GRA | CPS1_TILES }, - { "s92_06.bin", 0x0080000, 0xe584bfb5, BRF_GRA | CPS1_TILES }, - { "s92_07.bin", 0x0080000, 0x21e3f87d, BRF_GRA | CPS1_TILES }, - { "s92_08.bin", 0x0080000, 0xbefc47df, BRF_GRA | CPS1_TILES }, - { "s92_10.bin", 0x0080000, 0x960687d5, BRF_GRA | CPS1_TILES }, - { "s92_11.bin", 0x0080000, 0x978ecd18, BRF_GRA | CPS1_TILES }, - { "s92_12.bin", 0x0080000, 0xd6ec9a0a, BRF_GRA | CPS1_TILES }, - { "s92_13.bin", 0x0080000, 0xed2c67f6, BRF_GRA | CPS1_TILES }, - - { "s92_09.bin", 0x0010000, 0x08f6b60e, BRF_PRG | CPS1_Z80_PROGRAM }, - - { "s92_18.bin", 0x0020000, 0x7f162009, BRF_SND | CPS1_OKIM6295_SAMPLES }, - { "s92_19.bin", 0x0020000, 0xbeade53f, BRF_SND | CPS1_OKIM6295_SAMPLES }, -}; - -STD_ROM_PICK(Sf2m15) -STD_ROM_FN(Sf2m15) - static struct BurnRomInfo Sf2tlonaRomDesc[] = { { "tl4mt.1", 0x080000, 0x158635ca, BRF_ESS | BRF_PRG | CPS1_68K_PROGRAM_BYTESWAP }, { "tl4m.2", 0x080000, 0x882cd1c4, BRF_ESS | BRF_PRG | CPS1_68K_PROGRAM_BYTESWAP }, @@ -10282,7 +10254,6 @@ static const struct GameConfig ConfigTable[] = { "sf2m12" , CPS_B_21_DEF, mapper_S9263B, 0, NULL }, { "sf2m13" , CPS_B_21_DEF, mapper_S9263B, 0, NULL }, { "sf2m14" , CPS_B_21_DEF, mapper_S9263B, 0, NULL }, - { "sf2m15" , HACK_B_2 , mapper_S9263B, 0, NULL }, { "sf2tlona" , CPS_B_21_DEF, mapper_S9263B, 0, NULL }, { "sf2tlonb" , CPS_B_21_DEF, mapper_S9263B, 0, NULL }, { "sf2tlonc" , CPS_B_21_DEF, mapper_S9263B, 0, NULL }, @@ -10361,6 +10332,10 @@ static const struct GameConfig ConfigTable[] = { "sf2tury2" , CPS_B_21_DEF, mapper_S9263B, 0, NULL }, #endif +#if defined INCLUDE_BAD_DUMPS + { "sf2m15" , HACK_B_2 , mapper_S9263B, 0, NULL }, +#endif + { 0 , 0 , 0 , 0, 0 } }; @@ -11589,14 +11564,6 @@ static INT32 Sf2m3Init() return nRet; } -static INT32 Sf2m15Init() -{ - Scroll1TileMask = 0x4fff; - Scroll3TileMask = 0x1fff; - - return Sf2m3Init(); -} - static INT32 SfzchInit() { INT32 nRet = 0; @@ -13393,16 +13360,6 @@ struct BurnDriver BurnDrvCpsSf2m14 = { &CpsRecalcPal, 0x1000, 384, 224, 4, 3 }; -struct BurnDriver BurnDrvCpsSf2m15 = { - "sf2m15", "sf2ce", NULL, NULL, "1992", - "Street Fighter II' - champion edition (bootleg, M15)\0", NULL, "Capcom", "CPS1", - NULL, NULL, NULL, NULL, - BDF_GAME_WORKING | BDF_CLONE | BDF_BOOTLEG, 2, HARDWARE_CAPCOM_CPS1, GBF_VSFIGHT, FBF_SF, - NULL, Sf2m15RomInfo, Sf2m15RomName, NULL, NULL, Sf2m3InputInfo, Sf2DIPInfo, - Sf2m15Init, DrvExit, Cps1Frame, CpsRedraw, CpsAreaScan, - &CpsRecalcPal, 0x1000, 384, 224, 4, 3 -}; - struct BurnDriver BurnDrvCpsSf2tlona = { "sf2tlona", "sf2ce", NULL, NULL, "1992", "Street Fighter II' - champion edition (bootleg, Slay the Dragon set 1)\0", NULL, "Capcom", "CPS1", @@ -14553,7 +14510,7 @@ struct BurnDriverX BurnDrvCpsSf2tury2 = { }; // Street Fighter 2 Champion Edition (bootleg, ce13) -// same as sf2m13 +// same as sf2hfjb (previously known as sf2m13) static struct BurnRomInfo Sf2ce13RomDesc[] = { { "222-040.13", 0x0080000, 0xec6f5cb3, BRF_ESS | BRF_PRG | CPS1_68K_PROGRAM_BYTESWAP }, { "196-040.13", 0x0080000, 0x0e9ac52b, BRF_ESS | BRF_PRG | CPS1_68K_PROGRAM_BYTESWAP }, @@ -14594,12 +14551,59 @@ struct BurnDriverX BurnDrvCpsSf2ce13 = { #endif -#if defined INCLUDE_CPS1_PHOENIX +#if defined INCLUDE_BAD_DUMPS + +// previously known as sf2m8 +static struct BurnRomInfo Sf2m15RomDesc[] = { + { "k4-222", 0x0080000, 0xdb567b66, BRF_ESS | BRF_PRG | CPS1_68K_PROGRAM_BYTESWAP }, + { "k4-196", 0x0080000, 0x95ea597e, BRF_ESS | BRF_PRG | CPS1_68K_PROGRAM_BYTESWAP }, + { "u221.epr", 0x0020000, 0xd8276822, BRF_ESS | BRF_PRG | CPS1_68K_PROGRAM_BYTESWAP }, + { "u195.epr", 0x0020000, 0x924c6ce2, BRF_ESS | BRF_PRG | CPS1_68K_PROGRAM_BYTESWAP }, + + { "s92_01.bin", 0x0080000, 0x03b0d852, BRF_GRA | CPS1_TILES }, + { "s92_02.bin", 0x0080000, 0x840289ec, BRF_GRA | CPS1_TILES }, + { "s92_03.bin", 0x0080000, 0xcdb5f027, BRF_GRA | CPS1_TILES }, + { "s92_04.bin", 0x0080000, 0xe2799472, BRF_GRA | CPS1_TILES }, + { "s92_05.bin", 0x0080000, 0xba8a2761, BRF_GRA | CPS1_TILES }, + { "s92_06.bin", 0x0080000, 0xe584bfb5, BRF_GRA | CPS1_TILES }, + { "s92_07.bin", 0x0080000, 0x21e3f87d, BRF_GRA | CPS1_TILES }, + { "s92_08.bin", 0x0080000, 0xbefc47df, BRF_GRA | CPS1_TILES }, + { "s92_10.bin", 0x0080000, 0x960687d5, BRF_GRA | CPS1_TILES }, + { "s92_11.bin", 0x0080000, 0x978ecd18, BRF_GRA | CPS1_TILES }, + { "s92_12.bin", 0x0080000, 0xd6ec9a0a, BRF_GRA | CPS1_TILES }, + { "s92_13.bin", 0x0080000, 0xed2c67f6, BRF_GRA | CPS1_TILES }, + + { "s92_09.bin", 0x0010000, 0x08f6b60e, BRF_PRG | CPS1_Z80_PROGRAM }, + + { "s92_18.bin", 0x0020000, 0x7f162009, BRF_SND | CPS1_OKIM6295_SAMPLES }, + { "s92_19.bin", 0x0020000, 0xbeade53f, BRF_SND | CPS1_OKIM6295_SAMPLES }, +}; + +STD_ROM_PICK(Sf2m15) +STD_ROM_FN(Sf2m15) + +static INT32 Sf2m15Init() +{ + Scroll1TileMask = 0x4fff; + Scroll3TileMask = 0x1fff; + + return Sf2m3Init(); +} + +struct BurnDriverX BurnDrvCpsSf2m15 = { + "sf2m15", "sf2ce", NULL, NULL, "1992", + "Street Fighter II' - champion edition (bootleg, M15)\0", "Gfx glitches", "Capcom", "CPS1", + NULL, NULL, NULL, NULL, + BDF_GAME_WORKING | BDF_CLONE | BDF_BOOTLEG, 2, HARDWARE_CAPCOM_CPS1, GBF_VSFIGHT, FBF_SF, + NULL, Sf2m15RomInfo, Sf2m15RomName, NULL, NULL, Sf2m3InputInfo, Sf2DIPInfo, + Sf2m15Init, DrvExit, Cps1Frame, CpsRedraw, CpsAreaScan, + &CpsRecalcPal, 0x1000, 384, 224, 4, 3 +}; #endif #undef INCLUDE_DUPLICATES -#undef INCLUDE_CPS1_PHOENIX +#undef INCLUDE_BAD_DUMPS #undef CPS1_68K_PROGRAM_BYTESWAP #undef CPS1_68K_PROGRAM_NO_BYTESWAP