diff --git a/src/burn/drv/capcom/d_cps1.cpp b/src/burn/drv/capcom/d_cps1.cpp index 51079efc2..9f940a35a 100644 --- a/src/burn/drv/capcom/d_cps1.cpp +++ b/src/burn/drv/capcom/d_cps1.cpp @@ -8425,6 +8425,41 @@ static struct BurnRomInfo Sf2redRomDesc[] = { STD_ROM_PICK(Sf2red) STD_ROM_FN(Sf2red) +static struct BurnRomInfo Sf2red2RomDesc[] = { + // this set was previously known as sf2m13 + { "sf3d5-1040", 0x0080000, 0xbcdd2c3a, BRF_ESS | BRF_PRG | CPS1_68K_PROGRAM_BYTESWAP }, + { "sf3d5-3040", 0x0080000, 0x01965987, BRF_ESS | BRF_PRG | CPS1_68K_PROGRAM_BYTESWAP }, + { "sf3d5-2010", 0x0020000, 0xdd2e1d31, BRF_ESS | BRF_PRG | CPS1_68K_PROGRAM_BYTESWAP }, + { "sf3d5-4010", 0x0020000, 0xc95e4443, 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 }, + + // these weren't present with this set, but extra graphics are required (see bike's on Chun-Li stage) + { "6.amf", 0x020000, 0x3a85a275, BRF_GRA | CPS1_EXTRA_TILES_SF2EBBL_400000 }, + { "9.amf", 0x020000, 0x9156472f, BRF_GRA | CPS1_EXTRA_TILES_SF2EBBL_400000 }, + { "8.amf", 0x020000, 0xecdb083b, BRF_GRA | CPS1_EXTRA_TILES_SF2EBBL_400000 }, + { "10.amf", 0x020000, 0x8fea8384, BRF_GRA | CPS1_EXTRA_TILES_SF2EBBL_400000 }, +}; + +STD_ROM_PICK(Sf2red2) +STD_ROM_FN(Sf2red2) + static struct BurnRomInfo Sf2v004RomDesc[] = { { "sf2v004.23", 0x080000, 0x52d19f2c, BRF_ESS | BRF_PRG | CPS1_68K_PROGRAM_NO_BYTESWAP }, { "sf2v004.22", 0x080000, 0x4b26fde7, BRF_ESS | BRF_PRG | CPS1_68K_PROGRAM_NO_BYTESWAP }, @@ -9259,34 +9294,6 @@ static struct BurnRomInfo Sf2m11RomDesc[] = { STD_ROM_PICK(Sf2m11) STD_ROM_FN(Sf2m11) -static struct BurnRomInfo Sf2m13RomDesc[] = { - { "sf3d5-1040", 0x0080000, 0xbcdd2c3a, BRF_ESS | BRF_PRG | CPS1_68K_PROGRAM_BYTESWAP }, - { "sf3d5-3040", 0x0080000, 0x01965987, BRF_ESS | BRF_PRG | CPS1_68K_PROGRAM_BYTESWAP }, - { "sf3d5-2010", 0x0020000, 0xdd2e1d31, BRF_ESS | BRF_PRG | CPS1_68K_PROGRAM_BYTESWAP }, - { "sf3d5-4010", 0x0020000, 0xc95e4443, 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(Sf2m13) -STD_ROM_FN(Sf2m13) - static struct BurnRomInfo Sf2m14RomDesc[] = { { "sf6-1.040", 0x0080000, 0xccd74822, BRF_ESS | BRF_PRG | CPS1_68K_PROGRAM_BYTESWAP }, { "sf6-3.040", 0x0080000, 0x2a48b557, BRF_ESS | BRF_PRG | CPS1_68K_PROGRAM_BYTESWAP }, @@ -10924,6 +10931,7 @@ static const struct GameConfig ConfigTable[] = { "sf2rb4" , HACK_B_1 , mapper_S9263B, 0, NULL }, { "sf2rb5" , HACK_B_1 , mapper_S9263B, 0, NULL }, { "sf2red" , CPS_B_21_DEF, mapper_S9263B, 0, NULL }, + { "sf2red2" , CPS_B_21_DEF, mapper_S9263B, 0, NULL }, { "sf2v004" , CPS_B_21_DEF, mapper_S9263B, 0, NULL }, { "sf2acc" , CPS_B_21_DEF, mapper_S9263B, 0, NULL }, { "sf2acca" , CPS_B_21_DEF, mapper_S9263B, 0, NULL }, @@ -10932,7 +10940,6 @@ static const struct GameConfig ConfigTable[] = { "sf2mdt" , CPS_B_21_DEF, mapper_S9263B, 0, NULL }, { "sf2mdta" , CPS_B_21_DEF, mapper_S9263B, 0, NULL }, { "sf2m11" , HACK_B_1 , mapper_S9263B, 0, NULL }, - { "sf2m13" , CPS_B_21_DEF, mapper_S9263B, 0, NULL }, { "sf2m14" , CPS_B_21_DEF, mapper_S9263B, 0, NULL }, { "sf2m15" , CPS_B_21_DEF, mapper_S9263B, 0, NULL }, { "sf2tlona" , CPS_B_21_DEF, mapper_S9263B, 0, NULL }, @@ -15598,6 +15605,16 @@ struct BurnDriver BurnDrvCpsSf2red = { &CpsRecalcPal, 0x1000, 384, 224, 4, 3 }; +struct BurnDriver BurnDrvCpsSf2red2 = { + "sf2red2", "sf2ce", NULL, NULL, "1992", + "Street Fighter II' - champion edition (Red Wave bootleg set 2, 920313 etc)\0", NULL, "bootleg", "CPS1", + NULL, NULL, NULL, NULL, + BDF_GAME_WORKING | BDF_CLONE | BDF_BOOTLEG, 2, HARDWARE_CAPCOM_CPS1, GBF_VSFIGHT, FBF_SF, + NULL, Sf2red2RomInfo, Sf2red2RomName, NULL, NULL, Sf2yycInputInfo, Sf2jDIPInfo, + Sf2yycInit, DrvExit, Cps1Frame, CpsRedraw, CpsAreaScan, + &CpsRecalcPal, 0x1000, 384, 224, 4, 3 +}; + struct BurnDriver BurnDrvCpsSf2v004 = { "sf2v004", "sf2ce", NULL, NULL, "1992", "Street Fighter II' - champion edition (V004 bootleg, 102092 USA)\0", NULL, "bootleg", "CPS1", @@ -15858,16 +15875,6 @@ struct BurnDriver BurnDrvCpsSf2m11 = { &CpsRecalcPal, 0x1000, 384, 224, 4, 3 }; -struct BurnDriver BurnDrvCpsSf2m13 = { - "sf2m13", "sf2ce", NULL, NULL, "1992", - "Street Fighter II' - champion edition (M13 bootleg, 920313 etc)\0", NULL, "Capcom", "CPS1", - NULL, NULL, NULL, NULL, - BDF_GAME_WORKING | BDF_CLONE | BDF_BOOTLEG, 2, HARDWARE_CAPCOM_CPS1, GBF_VSFIGHT, FBF_SF, - NULL, Sf2m13RomInfo, Sf2m13RomName, NULL, NULL, Sf2yycInputInfo, Sf2jDIPInfo, - Sf2yycInit, DrvExit, Cps1Frame, CpsRedraw, CpsAreaScan, - &CpsRecalcPal, 0x1000, 384, 224, 4, 3 -}; - struct BurnDriver BurnDrvCpsSf2m14 = { "sf2m14", "sf2ce", NULL, NULL, "1992", "Street Fighter II' - champion edition (M14 bootleg, 920313 etc)\0", NULL, "Capcom", "CPS1",