From d06f914b544f74d8af92c8884174f562603f1cad Mon Sep 17 00:00:00 2001 From: Barry Harris <44396066+barry65536@users.noreply.github.com> Date: Wed, 4 Apr 2012 14:14:12 +0000 Subject: [PATCH] Add good dump of sf2m8, rename sets greater than 8 to reflect (JacKc) --- src/burn/drv/capcom/d_cps1.cpp | 125 +++++++++++++++++++++++---------- 1 file changed, 86 insertions(+), 39 deletions(-) diff --git a/src/burn/drv/capcom/d_cps1.cpp b/src/burn/drv/capcom/d_cps1.cpp index 8c9248fbd..a673bcc50 100644 --- a/src/burn/drv/capcom/d_cps1.cpp +++ b/src/burn/drv/capcom/d_cps1.cpp @@ -8324,10 +8324,10 @@ STD_ROM_PICK(Sf2m7) STD_ROM_FN(Sf2m7) static struct BurnRomInfo Sf2m8RomDesc[] = { - { "sf3a-1.040", 0x0080000, 0x9e6d058a, BRF_ESS | BRF_PRG | CPS1_68K_PROGRAM_BYTESWAP }, - { "sf3a-3.040", 0x0080000, 0x518d8404, BRF_ESS | BRF_PRG | CPS1_68K_PROGRAM_BYTESWAP }, - { "sf3a-2", 0x0020000, 0xfca4fc1e, BRF_ESS | BRF_PRG | CPS1_68K_PROGRAM_BYTESWAP }, - { "sf3a-4", 0x0020000, 0xcfdd6f54, BRF_ESS | BRF_PRG | CPS1_68K_PROGRAM_BYTESWAP }, + { "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, 0x1073b7b6, 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 }, @@ -8352,10 +8352,10 @@ STD_ROM_PICK(Sf2m8) STD_ROM_FN(Sf2m8) static struct BurnRomInfo Sf2m9RomDesc[] = { - { "sfu9-1.040", 0x0080000, 0x95306baf, BRF_ESS | BRF_PRG | CPS1_68K_PROGRAM_BYTESWAP }, - { "sfu9-3.040", 0x0080000, 0x21024d5f, BRF_ESS | BRF_PRG | CPS1_68K_PROGRAM_BYTESWAP }, - { "sfu9-2.020", 0x0040000, 0x0b3fe5dd, BRF_ESS | BRF_PRG | CPS1_68K_PROGRAM_BYTESWAP }, - { "sfu9-4.020", 0x0040000, 0xdbee7b18, BRF_ESS | BRF_PRG | CPS1_68K_PROGRAM_BYTESWAP }, + { "sf3a-1.040", 0x0080000, 0x9e6d058a, BRF_ESS | BRF_PRG | CPS1_68K_PROGRAM_BYTESWAP }, + { "sf3a-3.040", 0x0080000, 0x518d8404, BRF_ESS | BRF_PRG | CPS1_68K_PROGRAM_BYTESWAP }, + { "sf3a-2", 0x0020000, 0xfca4fc1e, BRF_ESS | BRF_PRG | CPS1_68K_PROGRAM_BYTESWAP }, + { "sf3a-4", 0x0020000, 0xcfdd6f54, 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 }, @@ -8380,10 +8380,10 @@ STD_ROM_PICK(Sf2m9) STD_ROM_FN(Sf2m9) static struct BurnRomInfo Sf2m10RomDesc[] = { - { "sfu7-1.040", 0x0080000, 0x866a9b31, BRF_ESS | BRF_PRG | CPS1_68K_PROGRAM_BYTESWAP }, - { "sfu7-3.040", 0x0080000, 0xf3a45593, BRF_ESS | BRF_PRG | CPS1_68K_PROGRAM_BYTESWAP }, - { "sfu7-2.010", 0x0020000, 0xd1707134, BRF_ESS | BRF_PRG | CPS1_68K_PROGRAM_BYTESWAP }, - { "sfu7-4.010", 0x0020000, 0xcd1d5666, BRF_ESS | BRF_PRG | CPS1_68K_PROGRAM_BYTESWAP }, + { "sfu9-1.040", 0x0080000, 0x95306baf, BRF_ESS | BRF_PRG | CPS1_68K_PROGRAM_BYTESWAP }, + { "sfu9-3.040", 0x0080000, 0x21024d5f, BRF_ESS | BRF_PRG | CPS1_68K_PROGRAM_BYTESWAP }, + { "sfu9-2.020", 0x0040000, 0x0b3fe5dd, BRF_ESS | BRF_PRG | CPS1_68K_PROGRAM_BYTESWAP }, + { "sfu9-4.020", 0x0040000, 0xdbee7b18, 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 }, @@ -8408,10 +8408,10 @@ STD_ROM_PICK(Sf2m10) STD_ROM_FN(Sf2m10) static struct BurnRomInfo Sf2m11RomDesc[] = { - { "sfu8-1.040", 0x0080000, 0x10ec67fe, BRF_ESS | BRF_PRG | CPS1_68K_PROGRAM_BYTESWAP }, - { "sfu8-3.040", 0x0080000, 0x92eb3a1c, BRF_ESS | BRF_PRG | CPS1_68K_PROGRAM_BYTESWAP }, - { "sfu8-2.010", 0x0020000, 0x1073b7b6, BRF_ESS | BRF_PRG | CPS1_68K_PROGRAM_BYTESWAP }, - { "sfu8-4.010", 0x0020000, 0x924c6ce2, BRF_ESS | BRF_PRG | CPS1_68K_PROGRAM_BYTESWAP }, + { "sfu7-1.040", 0x0080000, 0x866a9b31, BRF_ESS | BRF_PRG | CPS1_68K_PROGRAM_BYTESWAP }, + { "sfu7-3.040", 0x0080000, 0xf3a45593, BRF_ESS | BRF_PRG | CPS1_68K_PROGRAM_BYTESWAP }, + { "sfu7-2.010", 0x0020000, 0xd1707134, BRF_ESS | BRF_PRG | CPS1_68K_PROGRAM_BYTESWAP }, + { "sfu7-4.010", 0x0020000, 0xcd1d5666, 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 }, @@ -8436,10 +8436,10 @@ STD_ROM_PICK(Sf2m11) STD_ROM_FN(Sf2m11) static struct BurnRomInfo Sf2m12RomDesc[] = { - { "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 }, + { "sfu8-1.040", 0x0080000, 0x10ec67fe, BRF_ESS | BRF_PRG | CPS1_68K_PROGRAM_BYTESWAP }, + { "sfu8-3.040", 0x0080000, 0x92eb3a1c, BRF_ESS | BRF_PRG | CPS1_68K_PROGRAM_BYTESWAP }, + { "sfu8-2.010", 0x0020000, 0x1073b7b6, BRF_ESS | BRF_PRG | CPS1_68K_PROGRAM_BYTESWAP }, + { "sfu8-4.010", 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 }, @@ -8464,10 +8464,10 @@ STD_ROM_PICK(Sf2m12) STD_ROM_FN(Sf2m12) static struct BurnRomInfo Sf2m13RomDesc[] = { - { "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 }, - { "sf6-2.010", 0x0020000, 0x64e6e091, BRF_ESS | BRF_PRG | CPS1_68K_PROGRAM_BYTESWAP }, - { "sf6-4.010", 0x0020000, 0xc95e4443, BRF_ESS | BRF_PRG | CPS1_68K_PROGRAM_BYTESWAP }, + { "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 }, @@ -8492,10 +8492,10 @@ STD_ROM_PICK(Sf2m13) STD_ROM_FN(Sf2m13) static struct BurnRomInfo Sf2m14RomDesc[] = { - { "sf3g-1.040", 0x0080000, 0xc90559a5, BRF_ESS | BRF_PRG | CPS1_68K_PROGRAM_BYTESWAP }, - { "sf3g-3.040", 0x0080000, 0x81f36682, BRF_ESS | BRF_PRG | CPS1_68K_PROGRAM_BYTESWAP }, - { "sf3g-2.010", 0x0020000, 0x9eee20a1, BRF_ESS | BRF_PRG | CPS1_68K_PROGRAM_BYTESWAP }, - { "sf3g-4.010", 0x0020000, 0x6ac3d875, BRF_ESS | BRF_PRG | CPS1_68K_PROGRAM_BYTESWAP }, + { "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 }, + { "sf6-2.010", 0x0020000, 0x64e6e091, BRF_ESS | BRF_PRG | CPS1_68K_PROGRAM_BYTESWAP }, + { "sf6-4.010", 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 }, @@ -8520,6 +8520,34 @@ STD_ROM_PICK(Sf2m14) STD_ROM_FN(Sf2m14) static struct BurnRomInfo Sf2m15RomDesc[] = { + { "sf3g-1.040", 0x0080000, 0xc90559a5, BRF_ESS | BRF_PRG | CPS1_68K_PROGRAM_BYTESWAP }, + { "sf3g-3.040", 0x0080000, 0x81f36682, BRF_ESS | BRF_PRG | CPS1_68K_PROGRAM_BYTESWAP }, + { "sf3g-2.010", 0x0020000, 0x9eee20a1, BRF_ESS | BRF_PRG | CPS1_68K_PROGRAM_BYTESWAP }, + { "sf3g-4.010", 0x0020000, 0x6ac3d875, 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 Sf2m16RomDesc[] = { { "t-2.u52", 0x0080000, 0x0d305e8b, BRF_ESS | BRF_PRG | CPS1_68K_PROGRAM_BYTESWAP }, { "t-1.u36", 0x0080000, 0x137d8665, BRF_ESS | BRF_PRG | CPS1_68K_PROGRAM_BYTESWAP }, { "t-4.u54", 0x0040000, 0x0b3fe5dd, BRF_ESS | BRF_PRG | CPS1_68K_PROGRAM_BYTESWAP }, @@ -8544,8 +8572,8 @@ static struct BurnRomInfo Sf2m15RomDesc[] = { { "s92_19.bin", 0x0020000, 0xbeade53f, BRF_SND | CPS1_OKIM6295_SAMPLES }, }; -STD_ROM_PICK(Sf2m15) -STD_ROM_FN(Sf2m15) +STD_ROM_PICK(Sf2m16) +STD_ROM_FN(Sf2m16) static struct BurnRomInfo Sf2tlonaRomDesc[] = { { "tl4mt.1", 0x080000, 0x158635ca, BRF_ESS | BRF_PRG | CPS1_68K_PROGRAM_BYTESWAP }, @@ -10275,14 +10303,15 @@ static const struct GameConfig ConfigTable[] = { "sf2m5" , CPS_B_21_DEF, mapper_S9263B, 0, NULL }, { "sf2m6" , CPS_B_21_DEF, mapper_S9263B, 0, NULL }, { "sf2m7" , CPS_B_21_DEF, mapper_S9263B, 0, NULL }, - { "sf2m8" , CPS_B_21_DEF, mapper_S9263B, 0, NULL }, + { "sf2m8" , HACK_B_2 , mapper_S9263B, 0, NULL }, { "sf2m9" , CPS_B_21_DEF, mapper_S9263B, 0, NULL }, - { "sf2m10" , HACK_B_1 , mapper_S9263B, 0, NULL }, + { "sf2m10" , CPS_B_21_DEF, mapper_S9263B, 0, NULL }, { "sf2m11" , HACK_B_1 , mapper_S9263B, 0, NULL }, - { "sf2m12" , CPS_B_21_DEF, mapper_S9263B, 0, NULL }, + { "sf2m12" , 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 }, + { "sf2m16" , CPS_B_21_DEF, 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 }, @@ -11593,6 +11622,14 @@ static INT32 Sf2m3Init() return nRet; } +static INT32 Sf2m8Init() +{ + Scroll1TileMask = 0x4fff; + Scroll3TileMask = 0x1fff; + + return Sf2m3Init(); +} + static INT32 SfzchInit() { INT32 nRet = 0; @@ -13324,8 +13361,8 @@ struct BurnDriver BurnDrvCpsSf2m8 = { "Street Fighter II' - champion edition (bootleg, M8)\0", NULL, "Capcom", "CPS1", NULL, NULL, NULL, NULL, BDF_GAME_WORKING | BDF_CLONE | BDF_BOOTLEG, 2, HARDWARE_CAPCOM_CPS1, GBF_VSFIGHT, FBF_SF, - NULL, Sf2m8RomInfo, Sf2m8RomName, NULL, NULL, Sf2yycInputInfo, Sf2DIPInfo, - Sf2m2Init, DrvExit, Cps1Frame, CpsRedraw, CpsAreaScan, + NULL, Sf2m8RomInfo, Sf2m8RomName, NULL, NULL, Sf2m3InputInfo, Sf2DIPInfo, + Sf2m8Init, DrvExit, Cps1Frame, CpsRedraw, CpsAreaScan, &CpsRecalcPal, 0x1000, 384, 224, 4, 3 }; @@ -13335,7 +13372,7 @@ struct BurnDriver BurnDrvCpsSf2m9 = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING | BDF_CLONE | BDF_BOOTLEG, 2, HARDWARE_CAPCOM_CPS1, GBF_VSFIGHT, FBF_SF, NULL, Sf2m9RomInfo, Sf2m9RomName, NULL, NULL, Sf2yycInputInfo, Sf2DIPInfo, - Sf2m4Init, DrvExit, Cps1Frame, CpsRedraw, CpsAreaScan, + Sf2m2Init, DrvExit, Cps1Frame, CpsRedraw, CpsAreaScan, &CpsRecalcPal, 0x1000, 384, 224, 4, 3 }; @@ -13344,7 +13381,7 @@ struct BurnDriver BurnDrvCpsSf2m10 = { "Street Fighter II' - champion edition (bootleg, M10)\0", NULL, "Capcom", "CPS1", NULL, NULL, NULL, NULL, BDF_GAME_WORKING | BDF_CLONE | BDF_BOOTLEG, 2, HARDWARE_CAPCOM_CPS1, GBF_VSFIGHT, FBF_SF, - NULL, Sf2m10RomInfo, Sf2m10RomName, NULL, NULL, Sf2yycInputInfo, Sf2jDIPInfo, + NULL, Sf2m10RomInfo, Sf2m10RomName, NULL, NULL, Sf2yycInputInfo, Sf2DIPInfo, Sf2m4Init, DrvExit, Cps1Frame, CpsRedraw, CpsAreaScan, &CpsRecalcPal, 0x1000, 384, 224, 4, 3 }; @@ -13365,7 +13402,7 @@ struct BurnDriver BurnDrvCpsSf2m12 = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING | BDF_CLONE | BDF_BOOTLEG, 2, HARDWARE_CAPCOM_CPS1, GBF_VSFIGHT, FBF_SF, NULL, Sf2m12RomInfo, Sf2m12RomName, NULL, NULL, Sf2yycInputInfo, Sf2jDIPInfo, - Sf2yycInit, DrvExit, Cps1Frame, CpsRedraw, CpsAreaScan, + Sf2m4Init, DrvExit, Cps1Frame, CpsRedraw, CpsAreaScan, &CpsRecalcPal, 0x1000, 384, 224, 4, 3 }; @@ -13394,7 +13431,17 @@ struct BurnDriver BurnDrvCpsSf2m15 = { "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, Sf2yycInputInfo, Sf2DIPInfo, + NULL, Sf2m15RomInfo, Sf2m15RomName, NULL, NULL, Sf2yycInputInfo, Sf2jDIPInfo, + Sf2yycInit, DrvExit, Cps1Frame, CpsRedraw, CpsAreaScan, + &CpsRecalcPal, 0x1000, 384, 224, 4, 3 +}; + +struct BurnDriver BurnDrvCpsSf2m16 = { + "sf2m16", "sf2ce", NULL, NULL, "1992", + "Street Fighter II' - champion edition (bootleg, M16)\0", NULL, "Capcom", "CPS1", + NULL, NULL, NULL, NULL, + BDF_GAME_WORKING | BDF_CLONE | BDF_BOOTLEG, 2, HARDWARE_CAPCOM_CPS1, GBF_VSFIGHT, FBF_SF, + NULL, Sf2m16RomInfo, Sf2m16RomName, NULL, NULL, Sf2yycInputInfo, Sf2DIPInfo, Sf2m4Init, DrvExit, Cps1Frame, CpsRedraw, CpsAreaScan, &CpsRecalcPal, 0x1000, 384, 224, 4, 3 };