From 52fc455e3237ee59cfa9bfb80b67ce5706da9e4a Mon Sep 17 00:00:00 2001 From: Barry Harris <44396066+barry65536@users.noreply.github.com> Date: Mon, 19 Dec 2011 12:33:30 +0000 Subject: [PATCH] Changed CPS-3 driver to use MAME flash dumps, and added verification for CPS-3 driver back to ROM_VERIFY dat --- src/burn/drivers/cps3/cps3run.cpp | 21 +- src/burn/drivers/cps3/d_cps3.cpp | 829 +++++++++++++++--------------- src/burner/dat.cpp | 6 - 3 files changed, 422 insertions(+), 434 deletions(-) diff --git a/src/burn/drivers/cps3/cps3run.cpp b/src/burn/drivers/cps3/cps3run.cpp index 3a652f65b..f0f2f9fb5 100644 --- a/src/burn/drivers/cps3/cps3run.cpp +++ b/src/burn/drivers/cps3/cps3run.cpp @@ -1082,11 +1082,15 @@ INT32 cps3Init() ii = 0; offset = 0; while (BurnDrvGetRomInfo(&pri, ii) == 0) { if (pri.nType & BRF_PRG) { - nRet = BurnLoadRom(RomGame + offset, ii, 1); - if (nRet != 0) return 1; - offset += pri.nLen; + nRet = BurnLoadRom(RomGame + offset + 0, ii + 0, 4); if (nRet != 0) return 1; + nRet = BurnLoadRom(RomGame + offset + 1, ii + 1, 4); if (nRet != 0) return 1; + nRet = BurnLoadRom(RomGame + offset + 2, ii + 2, 4); if (nRet != 0) return 1; + nRet = BurnLoadRom(RomGame + offset + 3, ii + 3, 4); if (nRet != 0) return 1; + offset += pri.nLen * 4; + ii += 4; + } else { + ii++; } - ii++; } be_to_le( RomGame, 0x1000000 ); cps3_decrypt_game(); @@ -1095,10 +1099,13 @@ INT32 cps3Init() ii = 0; offset = 0; while (BurnDrvGetRomInfo(&pri, ii) == 0) { if (pri.nType & (BRF_GRA | BRF_SND)) { - BurnLoadRom(RomUser + offset, ii, 1); - offset += pri.nLen; + BurnLoadRom(RomUser + offset + 0, ii + 0, 2); + BurnLoadRom(RomUser + offset + 1, ii + 1, 2); + offset += pri.nLen * 2; + ii += 2; + } else { + ii++; } - ii++; } { diff --git a/src/burn/drivers/cps3/d_cps3.cpp b/src/burn/drivers/cps3/d_cps3.cpp index 787e2007b..14f373cbb 100644 --- a/src/burn/drivers/cps3/d_cps3.cpp +++ b/src/burn/drivers/cps3/d_cps3.cpp @@ -187,32 +187,48 @@ STDDIPINFOEXT(usa, region, usaRegion) STDDIPINFOEXT(jojoba, jojobaRegion, japanRegion) STDDIPINFOEXT(jojobane, jojobaRegion, euroRegion) STDDIPINFOEXT(redearth, redeartnRegion, euroRedeartn) -STDDIPINFOEXT(redeartn, redeartnRegion, euroRedeartn) STDDIPINFOEXT(warzard, redeartnRegion, japanwarzard) STDDIPINFOEXT(sfiiihispanic, sfiii, hispanicRegion) STDDIPINFOEXT(sfiiijapan, sfiii, japanRegion) STDDIPINFOEXT(sfiiiasia, sfiii, asiaRegion) STDDIPINFOEXT(sfiiiusa, sfiii, usaRegion) +// ------------------------------------------- +// Street Fighter III: New Generation (970204) +// ------------------------------------------- + +#define SFIII_970204_FLASH \ + { "sfiii-simm1.0", 0x200000, 0xcfc9e45a, BRF_ESS | BRF_PRG }, \ + { "sfiii-simm1.1", 0x200000, 0x57920546, BRF_ESS | BRF_PRG }, \ + { "sfiii-simm1.2", 0x200000, 0x0d8f2680, BRF_ESS | BRF_PRG }, \ + { "sfiii-simm1.3", 0x200000, 0xea4ca054, BRF_ESS | BRF_PRG }, \ + { "sfiii-simm3.0", 0x200000, 0x080b3bd3, BRF_GRA }, \ + { "sfiii-simm3.1", 0x200000, 0x5c356f2f, BRF_GRA }, \ + { "sfiii-simm3.2", 0x200000, 0xf9c97a45, BRF_GRA }, \ + { "sfiii-simm3.3", 0x200000, 0x09de3ead, BRF_GRA }, \ + { "sfiii-simm3.4", 0x200000, 0x7dd7e1f3, BRF_GRA }, \ + { "sfiii-simm3.5", 0x200000, 0x47a03a3a, BRF_GRA }, \ + { "sfiii-simm3.6", 0x200000, 0xe9eb7a26, BRF_GRA }, \ + { "sfiii-simm3.7", 0x200000, 0x7f44395c, BRF_GRA }, \ + { "sfiii-simm4.0", 0x200000, 0x9ac080fc, BRF_GRA }, \ + { "sfiii-simm4.1", 0x200000, 0x6e2c4c94, BRF_GRA }, \ + { "sfiii-simm4.2", 0x200000, 0x8afc22d4, BRF_GRA }, \ + { "sfiii-simm4.3", 0x200000, 0x9f3873b8, BRF_GRA }, \ + { "sfiii-simm4.4", 0x200000, 0x166b3c97, BRF_GRA }, \ + { "sfiii-simm4.5", 0x200000, 0xe5ea2547, BRF_GRA }, \ + { "sfiii-simm4.6", 0x200000, 0xe85b9fdd, BRF_GRA }, \ + { "sfiii-simm4.7", 0x200000, 0x362c01b7, BRF_GRA }, \ + { "sfiii-simm5.0", 0x200000, 0x9bc108b2, BRF_GRA }, \ + { "sfiii-simm5.1", 0x200000, 0xc6f1c066, BRF_GRA }, + // ----------------------------------------------- // Street Fighter III: New Generation (USA 970204) // ----------------------------------------------- static struct BurnRomInfo sfiiiRomDesc[] = { - { "sfiii_usa.29f400.u2", - 0x080000, 0xfb172a8e, BRF_ESS | BRF_BIOS }, // SH-2 Bios - -#if !defined (ROM_VERIFY) - { "10", 0x800000, 0xe896dc27, BRF_ESS | BRF_PRG }, // SH-2 Code + { "sfiii_usa.29f400.u2", 0x080000, 0xfb172a8e, BRF_ESS | BRF_BIOS }, // SH-2 Bios - { "30", 0x800000, 0x98c2d07c, BRF_GRA }, // cd content region - { "31", 0x800000, 0x7115a396, BRF_GRA }, - { "40", 0x800000, 0x839f0972, BRF_GRA }, - { "41", 0x800000, 0x8a8b252c, BRF_GRA }, - { "50", 0x400000, 0x58933dc2, BRF_GRA }, -#endif - -// { "sf3000", 0x000000, 0x00000000, BRF_ESS | BRF_CHD }, // CD-ROM + SFIII_970204_FLASH }; STD_ROM_PICK(sfiii) @@ -223,19 +239,9 @@ STD_ROM_FN(sfiii) // ------------------------------------------------- static struct BurnRomInfo sfiiijRomDesc[] = { - { "sfiii_japan.29f400.u2", - 0x080000, 0x74205250, BRF_ESS | BRF_BIOS }, // SH-2 Bios -#if !defined (ROM_VERIFY) - { "10", 0x800000, 0xe896dc27, BRF_ESS | BRF_PRG }, // SH-2 Code - - { "30", 0x800000, 0x98c2d07c, BRF_GRA }, // cd content region - { "31", 0x800000, 0x7115a396, BRF_GRA }, - { "40", 0x800000, 0x839f0972, BRF_GRA }, - { "41", 0x800000, 0x8a8b252c, BRF_GRA }, - { "50", 0x400000, 0x58933dc2, BRF_GRA }, -#endif + { "sfiii_japan.29f400.u2", 0x080000, 0x74205250, BRF_ESS | BRF_BIOS }, // SH-2 Bios -// { "sf3000", 0x000000, 0x00000000, BRF_ESS | BRF_CHD }, // CD-ROM + SFIII_970204_FLASH }; STD_ROM_PICK(sfiiij) @@ -246,19 +252,9 @@ STD_ROM_FN(sfiiij) // ---------------------------------------------------- static struct BurnRomInfo sfiiihRomDesc[] = { - { "sfiii_hispanic.29f400.u2", - 0x080000, 0xd2b3cd48, BRF_ESS | BRF_BIOS }, // SH-2 Bios -#if !defined (ROM_VERIFY) - { "10", 0x800000, 0xe896dc27, BRF_ESS | BRF_PRG }, // SH-2 Code + { "sfiii_hispanic.29f400.u2", 0x080000, 0xd2b3cd48, BRF_ESS | BRF_BIOS }, // SH-2 Bios - { "30", 0x800000, 0x98c2d07c, BRF_GRA }, // cd content region - { "31", 0x800000, 0x7115a396, BRF_GRA }, - { "40", 0x800000, 0x839f0972, BRF_GRA }, - { "41", 0x800000, 0x8a8b252c, BRF_GRA }, - { "50", 0x400000, 0x58933dc2, BRF_GRA }, -#endif - -// { "sf3000", 0x000000, 0x00000000, BRF_ESS | BRF_CHD }, // CD-ROM + SFIII_970204_FLASH }; STD_ROM_PICK(sfiiih) @@ -269,42 +265,60 @@ STD_ROM_FN(sfiiih) // -------------------------------------------------------- static struct BurnRomInfo sfiiinRomDesc[] = { - { "sfiii_asia_nocd.29f400.u2", - 0x080000, 0x73e32463, BRF_ESS | BRF_BIOS }, // SH-2 Bios - - { "10", 0x800000, 0xe896dc27, BRF_ESS | BRF_PRG }, // SH-2 Code - - { "30", 0x800000, 0x98c2d07c, BRF_GRA }, // cd content region - { "31", 0x800000, 0x7115a396, BRF_GRA }, - { "40", 0x800000, 0x839f0972, BRF_GRA }, - { "41", 0x800000, 0x8a8b252c, BRF_GRA }, - { "50", 0x400000, 0x58933dc2, BRF_GRA }, + { "sfiii_asia_nocd.29f400.u2", 0x080000, 0x73e32463, BRF_ESS | BRF_BIOS }, // SH-2 Bios + + SFIII_970204_FLASH }; STD_ROM_PICK(sfiiin) STD_ROM_FN(sfiiin) +// ---------------------------------------------------- +// Street Fighter III 2nd Impact: Giant Attack (970930) +// ---------------------------------------------------- + +#define SFIII2_970930_FLASH \ + { "sfiii2-simm1.0", 0x200000, 0x2d666f0b, BRF_ESS | BRF_PRG }, \ + { "sfiii2-simm1.1", 0x200000, 0x2a3a8ef6, BRF_ESS | BRF_PRG }, \ + { "sfiii2-simm1.2", 0x200000, 0x161d2206, BRF_ESS | BRF_PRG }, \ + { "sfiii2-simm1.3", 0x200000, 0x87ded8a3, BRF_ESS | BRF_PRG }, \ + { "sfiii2-simm2.0", 0x200000, 0x94a4ce0f, BRF_ESS | BRF_PRG }, \ + { "sfiii2-simm2.1", 0x200000, 0x67585033, BRF_ESS | BRF_PRG }, \ + { "sfiii2-simm2.2", 0x200000, 0xfabffcd5, BRF_ESS | BRF_PRG }, \ + { "sfiii2-simm2.3", 0x200000, 0x623c09ca, BRF_ESS | BRF_PRG }, \ + { "sfiii2-simm3.0", 0x200000, 0xdab2d766, BRF_GRA }, \ + { "sfiii2-simm3.1", 0x200000, 0x1f2aa34b, BRF_GRA }, \ + { "sfiii2-simm3.2", 0x200000, 0x6f1a04eb, BRF_GRA }, \ + { "sfiii2-simm3.3", 0x200000, 0xe05ef205, BRF_GRA }, \ + { "sfiii2-simm3.4", 0x200000, 0xaffb074f, BRF_GRA }, \ + { "sfiii2-simm3.5", 0x200000, 0x6962872e, BRF_GRA }, \ + { "sfiii2-simm3.6", 0x200000, 0x6eed87de, BRF_GRA }, \ + { "sfiii2-simm3.7", 0x200000, 0xe18f479e, BRF_GRA }, \ + { "sfiii2-simm4.0", 0x200000, 0x764c2503, BRF_GRA }, \ + { "sfiii2-simm4.1", 0x200000, 0x3e16af6e, BRF_GRA }, \ + { "sfiii2-simm4.2", 0x200000, 0x215705e6, BRF_GRA }, \ + { "sfiii2-simm4.3", 0x200000, 0xe30cbd9c, BRF_GRA }, \ + { "sfiii2-simm4.4", 0x200000, 0x4185ded9, BRF_GRA }, \ + { "sfiii2-simm4.5", 0x200000, 0x4e8db013, BRF_GRA }, \ + { "sfiii2-simm4.6", 0x200000, 0x08df48ce, BRF_GRA }, \ + { "sfiii2-simm4.7", 0x200000, 0xbb8f80a5, BRF_GRA }, \ + { "sfiii2-simm5.0", 0x200000, 0xebdc4787, BRF_GRA }, \ + { "sfiii2-simm5.1", 0x200000, 0x6b7c550e, BRF_GRA }, \ + { "sfiii2-simm5.2", 0x200000, 0x56ff8c50, BRF_GRA }, \ + { "sfiii2-simm5.3", 0x200000, 0x3f2ac3e9, BRF_GRA }, \ + { "sfiii2-simm5.4", 0x200000, 0x48cda50e, BRF_GRA }, \ + { "sfiii2-simm5.5", 0x200000, 0x520c0af6, BRF_GRA }, \ + { "sfiii2-simm5.6", 0x200000, 0x2edc5986, BRF_GRA }, \ + { "sfiii2-simm5.7", 0x200000, 0x93ffa199, BRF_GRA }, + // -------------------------------------------------------- // Street Fighter III 2nd Impact: Giant Attack (USA 970930) // -------------------------------------------------------- static struct BurnRomInfo sfiii2RomDesc[] = { - { "sfiii2_usa.29f400.u2", - 0x080000, 0x75dd72e0, BRF_ESS | BRF_BIOS }, // SH-2 Bios + { "sfiii2_usa.29f400.u2", 0x080000, 0x75dd72e0, BRF_ESS | BRF_BIOS }, // SH-2 Bios -#if !defined (ROM_VERIFY) - { "10", 0x800000, 0x682b014a, BRF_ESS | BRF_PRG }, // SH-2 Code - { "20", 0x800000, 0x38090460, BRF_ESS | BRF_PRG }, - - { "30", 0x800000, 0x77c197c0, BRF_GRA }, // cd content region - { "31", 0x800000, 0x7470a6f2, BRF_GRA }, - { "40", 0x800000, 0x01a85ced, BRF_GRA }, - { "41", 0x800000, 0xfb346d74, BRF_GRA }, - { "50", 0x800000, 0x32f79449, BRF_GRA }, - { "51", 0x800000, 0x1102b8eb, BRF_GRA }, -#endif - -// { "3ga000", 0x000000, 0x00000000, BRF_ESS | BRF_CHD }, // CD-ROM + SFIII2_970930_FLASH }; STD_ROM_PICK(sfiii2) @@ -315,22 +329,9 @@ STD_ROM_FN(sfiii2) // ---------------------------------------------------------- static struct BurnRomInfo sfiii2jRomDesc[] = { - { "sfiii2_japan.29f400.u2", - 0x080000, 0xfaea0a3e, BRF_ESS | BRF_BIOS }, // SH-2 Bios - -#if !defined (ROM_VERIFY) - { "10", 0x800000, 0x682b014a, BRF_ESS | BRF_PRG }, // SH-2 Code - { "20", 0x800000, 0x38090460, BRF_ESS | BRF_PRG }, - - { "30", 0x800000, 0x77c197c0, BRF_GRA }, // cd content region - { "31", 0x800000, 0x7470a6f2, BRF_GRA }, - { "40", 0x800000, 0x01a85ced, BRF_GRA }, - { "41", 0x800000, 0xfb346d74, BRF_GRA }, - { "50", 0x800000, 0x32f79449, BRF_GRA }, - { "51", 0x800000, 0x1102b8eb, BRF_GRA }, -#endif - -// { "3ga000", 0x000000, 0x00000000, BRF_ESS | BRF_CHD }, // CD-ROM + { "sfiii2_japan.29f400.u2", 0x080000, 0xfaea0a3e, BRF_ESS | BRF_BIOS }, // SH-2 Bios + + SFIII2_970930_FLASH }; STD_ROM_PICK(sfiii2j) @@ -341,288 +342,346 @@ STD_ROM_FN(sfiii2j) // ---------------------------------------------------------------- static struct BurnRomInfo sfiii2nRomDesc[] = { - { "sfiii2_asia_nocd.29f400.u2", - 0x080000, 0xfd297c0d, BRF_ESS | BRF_BIOS }, // SH-2 Bios - - { "10", 0x800000, 0x682b014a, BRF_ESS | BRF_PRG }, // SH-2 Code - { "20", 0x800000, 0x38090460, BRF_ESS | BRF_PRG }, - - { "30", 0x800000, 0x77c197c0, BRF_GRA }, // cd content region - { "31", 0x800000, 0x7470a6f2, BRF_GRA }, - { "40", 0x800000, 0x01a85ced, BRF_GRA }, - { "41", 0x800000, 0xfb346d74, BRF_GRA }, - { "50", 0x800000, 0x32f79449, BRF_GRA }, - { "51", 0x800000, 0x1102b8eb, BRF_GRA }, + { "sfiii2_asia_nocd.29f400.u2", 0x080000, 0xfd297c0d, BRF_ESS | BRF_BIOS }, // SH-2 Bios + + SFIII2_970930_FLASH }; STD_ROM_PICK(sfiii2n) STD_ROM_FN(sfiii2n) +// ------------------------------------------------------------ +// Street Fighter III 3rd Strike: Fight for the Future (990608) +// ------------------------------------------------------------ + +#define SFIII3_990608_FLASH \ + { "sfiii3-simm1.0", 0x200000, 0x11dfd3cd, BRF_ESS | BRF_PRG }, \ + { "sfiii3-simm1.1", 0x200000, 0xc50585e6, BRF_ESS | BRF_PRG }, \ + { "sfiii3-simm1.2", 0x200000, 0x8e011d9b, BRF_ESS | BRF_PRG }, \ + { "sfiii3-simm1.3", 0x200000, 0xdca8d92f, BRF_ESS | BRF_PRG }, \ + { "sfiii3-simm2.0", 0x200000, 0x06eb969e, BRF_ESS | BRF_PRG }, \ + { "sfiii3-simm2.1", 0x200000, 0xe7039f82, BRF_ESS | BRF_PRG }, \ + { "sfiii3-simm2.2", 0x200000, 0x645c96f7, BRF_ESS | BRF_PRG }, \ + { "sfiii3-simm2.3", 0x200000, 0x610efab1, BRF_ESS | BRF_PRG }, \ + { "sfiii3-simm3.0", 0x200000, 0x7baa1f79, BRF_GRA }, \ + { "sfiii3-simm3.1", 0x200000, 0x234bf8fe, BRF_GRA }, \ + { "sfiii3-simm3.2", 0x200000, 0xd9ebc308, BRF_GRA }, \ + { "sfiii3-simm3.3", 0x200000, 0x293cba77, BRF_GRA }, \ + { "sfiii3-simm3.4", 0x200000, 0x6055e747, BRF_GRA }, \ + { "sfiii3-simm3.5", 0x200000, 0x499aa6fc, BRF_GRA }, \ + { "sfiii3-simm3.6", 0x200000, 0x6c13879e, BRF_GRA }, \ + { "sfiii3-simm3.7", 0x200000, 0xcf4f8ede, BRF_GRA }, \ + { "sfiii3-simm4.0", 0x200000, 0x091fd5ba, BRF_GRA }, \ + { "sfiii3-simm4.1", 0x200000, 0x0bca8917, BRF_GRA }, \ + { "sfiii3-simm4.2", 0x200000, 0xa0fd578b, BRF_GRA }, \ + { "sfiii3-simm4.3", 0x200000, 0x4bf8c699, BRF_GRA }, \ + { "sfiii3-simm4.4", 0x200000, 0x137b8785, BRF_GRA }, \ + { "sfiii3-simm4.5", 0x200000, 0x4fb70671, BRF_GRA }, \ + { "sfiii3-simm4.6", 0x200000, 0x832374a4, BRF_GRA }, \ + { "sfiii3-simm4.7", 0x200000, 0x1c88576d, BRF_GRA }, \ + { "sfiii3-simm5.0", 0x200000, 0xc67d9190, BRF_GRA }, \ + { "sfiii3-simm5.1", 0x200000, 0x6cb79868, BRF_GRA }, \ + { "sfiii3-simm5.2", 0x200000, 0xdf69930e, BRF_GRA }, \ + { "sfiii3-simm5.3", 0x200000, 0x333754e0, BRF_GRA }, \ + { "sfiii3-simm5.4", 0x200000, 0x78f6d417, BRF_GRA }, \ + { "sfiii3-simm5.5", 0x200000, 0x8ccad9b1, BRF_GRA }, \ + { "sfiii3-simm5.6", 0x200000, 0x85de59e5, BRF_GRA }, \ + { "sfiii3-simm5.7", 0x200000, 0xee7e29b3, BRF_GRA }, \ + { "sfiii3-simm6.0", 0x200000, 0x8da69042, BRF_GRA }, \ + { "sfiii3-simm6.1", 0x200000, 0x1c8c7ac4, BRF_GRA }, \ + { "sfiii3-simm6.2", 0x200000, 0xa671341d, BRF_GRA }, \ + { "sfiii3-simm6.3", 0x200000, 0x1a990249, BRF_GRA }, \ + { "sfiii3-simm6.4", 0x200000, 0x20cb39ac, BRF_GRA }, \ + { "sfiii3-simm6.5", 0x200000, 0x5f844b2f, BRF_GRA }, \ + { "sfiii3-simm6.6", 0x200000, 0x450e8d28, BRF_GRA }, \ + { "sfiii3-simm6.7", 0x200000, 0xcc5f4187, BRF_GRA }, + // ---------------------------------------------------------------- // Street Fighter III 3rd Strike: Fight for the Future (USA 990608) // ---------------------------------------------------------------- static struct BurnRomInfo sfiii3RomDesc[] = { - { "sfiii3_usa.29f400.u2", - 0x080000, 0xecc545c1, BRF_ESS | BRF_BIOS }, // SH-2 Bios - -#if !defined (ROM_VERIFY) - { "10", 0x800000, 0xba7f76b2, BRF_ESS | BRF_PRG }, // SH-2 Code - { "20", 0x800000, 0x5ca8faba, BRF_ESS | BRF_PRG }, - - { "30", 0x800000, 0xb37cf960, BRF_GRA }, // cd content region - { "31", 0x800000, 0x450ec982, BRF_GRA }, - { "40", 0x800000, 0x632c965f, BRF_GRA }, - { "41", 0x800000, 0x7a4c5f33, BRF_GRA }, - { "50", 0x800000, 0x8562358e, BRF_GRA }, - { "51", 0x800000, 0x7baf234b, BRF_GRA }, - { "60", 0x800000, 0xbc9487b7, BRF_GRA }, - { "61", 0x800000, 0xb813a1b1, BRF_GRA }, -#endif - -// { "33s000", 0x000000, 0x00000000, BRF_ESS | BRF_CHD }, // CD-ROM + { "sfiii3_usa.29f400.u2", 0x080000, 0xecc545c1, BRF_ESS | BRF_BIOS }, // SH-2 Bios + + SFIII3_990608_FLASH }; STD_ROM_PICK(sfiii3) STD_ROM_FN(sfiii3) +// ------------------------------------------------------------------------- +// Street Fighter III 3rd Strike: Fight for the Future (Japan 990608, NO CD) +// ------------------------------------------------------------------------- +static struct BurnRomInfo sfiii3nRomDesc[] = { + + { "sfiii3_japan_nocd.29f400.u2", 0x080000, 0x1edc6366, BRF_ESS | BRF_BIOS }, // SH-2 Bios + + SFIII3_990608_FLASH +}; + +STD_ROM_PICK(sfiii3n) +STD_ROM_FN(sfiii3n) + +// ------------------------------------------------------------ +// Street Fighter III 3rd Strike: Fight for the Future (990512) +// ------------------------------------------------------------ + +#define SFIII3_990512_FLASH \ + { "sfiii3a-simm1.0", 0x200000, 0x66e66235, BRF_ESS | BRF_PRG }, \ + { "sfiii3a-simm1.1", 0x200000, 0x186e8c5f, BRF_ESS | BRF_PRG }, \ + { "sfiii3a-simm1.2", 0x200000, 0xbce18cab, BRF_ESS | BRF_PRG }, \ + { "sfiii3a-simm1.3", 0x200000, 0x129dc2c9, BRF_ESS | BRF_PRG }, \ + { "sfiii3-simm2.0", 0x200000, 0x06eb969e, BRF_ESS | BRF_PRG }, \ + { "sfiii3-simm2.1", 0x200000, 0xe7039f82, BRF_ESS | BRF_PRG }, \ + { "sfiii3-simm2.2", 0x200000, 0x645c96f7, BRF_ESS | BRF_PRG }, \ + { "sfiii3-simm2.3", 0x200000, 0x610efab1, BRF_ESS | BRF_PRG }, \ + { "sfiii3-simm3.0", 0x200000, 0x7baa1f79, BRF_GRA }, \ + { "sfiii3-simm3.1", 0x200000, 0x234bf8fe, BRF_GRA }, \ + { "sfiii3-simm3.2", 0x200000, 0xd9ebc308, BRF_GRA }, \ + { "sfiii3-simm3.3", 0x200000, 0x293cba77, BRF_GRA }, \ + { "sfiii3-simm3.4", 0x200000, 0x6055e747, BRF_GRA }, \ + { "sfiii3-simm3.5", 0x200000, 0x499aa6fc, BRF_GRA }, \ + { "sfiii3-simm3.6", 0x200000, 0x6c13879e, BRF_GRA }, \ + { "sfiii3-simm3.7", 0x200000, 0xcf4f8ede, BRF_GRA }, \ + { "sfiii3-simm4.0", 0x200000, 0x091fd5ba, BRF_GRA }, \ + { "sfiii3-simm4.1", 0x200000, 0x0bca8917, BRF_GRA }, \ + { "sfiii3-simm4.2", 0x200000, 0xa0fd578b, BRF_GRA }, \ + { "sfiii3-simm4.3", 0x200000, 0x4bf8c699, BRF_GRA }, \ + { "sfiii3-simm4.4", 0x200000, 0x137b8785, BRF_GRA }, \ + { "sfiii3-simm4.5", 0x200000, 0x4fb70671, BRF_GRA }, \ + { "sfiii3-simm4.6", 0x200000, 0x832374a4, BRF_GRA }, \ + { "sfiii3-simm4.7", 0x200000, 0x1c88576d, BRF_GRA }, \ + { "sfiii3-simm5.0", 0x200000, 0xc67d9190, BRF_GRA }, \ + { "sfiii3-simm5.1", 0x200000, 0x6cb79868, BRF_GRA }, \ + { "sfiii3-simm5.2", 0x200000, 0xdf69930e, BRF_GRA }, \ + { "sfiii3-simm5.3", 0x200000, 0x333754e0, BRF_GRA }, \ + { "sfiii3-simm5.4", 0x200000, 0x78f6d417, BRF_GRA }, \ + { "sfiii3-simm5.5", 0x200000, 0x8ccad9b1, BRF_GRA }, \ + { "sfiii3-simm5.6", 0x200000, 0x85de59e5, BRF_GRA }, \ + { "sfiii3-simm5.7", 0x200000, 0xee7e29b3, BRF_GRA }, \ + { "sfiii3-simm6.0", 0x200000, 0x8da69042, BRF_GRA }, \ + { "sfiii3-simm6.1", 0x200000, 0x1c8c7ac4, BRF_GRA }, \ + { "sfiii3-simm6.2", 0x200000, 0xa671341d, BRF_GRA }, \ + { "sfiii3-simm6.3", 0x200000, 0x1a990249, BRF_GRA }, \ + { "sfiii3-simm6.4", 0x200000, 0x20cb39ac, BRF_GRA }, \ + { "sfiii3-simm6.5", 0x200000, 0x5f844b2f, BRF_GRA }, \ + { "sfiii3-simm6.6", 0x200000, 0x450e8d28, BRF_GRA }, \ + { "sfiii3-simm6.7", 0x200000, 0xcc5f4187, BRF_GRA }, + // ---------------------------------------------------------------- // Street Fighter III 3rd Strike: Fight for the Future (USA 990512) // ---------------------------------------------------------------- static struct BurnRomInfo sfiii3aRomDesc[] = { - { "sfiii3_usa.29f400.u2", - 0x080000, 0xecc545c1, BRF_ESS | BRF_BIOS }, // SH-2 Bios - -#if !defined (ROM_VERIFY) - { "10", 0x800000, 0x77233d39, BRF_ESS | BRF_PRG }, // SH-2 Code - { "20", 0x800000, 0x5ca8faba, BRF_ESS | BRF_PRG }, - - { "30", 0x800000, 0xb37cf960, BRF_GRA }, // cd content region - { "31", 0x800000, 0x450ec982, BRF_GRA }, - { "40", 0x800000, 0x632c965f, BRF_GRA }, - { "41", 0x800000, 0x7a4c5f33, BRF_GRA }, - { "50", 0x800000, 0x8562358e, BRF_GRA }, - { "51", 0x800000, 0x7baf234b, BRF_GRA }, - { "60", 0x800000, 0xbc9487b7, BRF_GRA }, - { "61", 0x800000, 0xb813a1b1, BRF_GRA }, -#endif - -// { "cap-33s-2", 0x000000, 0x00000000, BRF_ESS | BRF_CHD }, // CD-ROM + { "sfiii3_usa.29f400.u2", 0x080000, 0xecc545c1, BRF_ESS | BRF_BIOS }, // SH-2 Bios + + SFIII3_990512_FLASH }; STD_ROM_PICK(sfiii3a) STD_ROM_FN(sfiii3a) // ------------------------------------------------------------------------- -// Street Fighter III 3rd Strike: Fight for the Future (Japan 990608, NO CD) +// Street Fighter III 3rd Strike: Fight for the Future (Japan 990512, NO CD) // ------------------------------------------------------------------------- static struct BurnRomInfo sfiii3anRomDesc[] = { - { "sfiii3_japan_nocd.29f400.u2", - 0x080000, 0x1edc6366, BRF_ESS | BRF_BIOS }, // SH-2 Bios - - { "10", 0x800000, 0x77233d39, BRF_ESS | BRF_PRG }, // SH-2 Code - { "20", 0x800000, 0x5ca8faba, BRF_ESS | BRF_PRG }, - - { "30", 0x800000, 0xb37cf960, BRF_GRA }, // cd content region - { "31", 0x800000, 0x450ec982, BRF_GRA }, - { "40", 0x800000, 0x632c965f, BRF_GRA }, - { "41", 0x800000, 0x7a4c5f33, BRF_GRA }, - { "50", 0x800000, 0x8562358e, BRF_GRA }, - { "51", 0x800000, 0x7baf234b, BRF_GRA }, - { "60", 0x800000, 0xbc9487b7, BRF_GRA }, - { "61", 0x800000, 0xb813a1b1, BRF_GRA }, + { "sfiii3_japan_nocd.29f400.u2", 0x080000, 0x1edc6366, BRF_ESS | BRF_BIOS }, // SH-2 Bios + + SFIII3_990512_FLASH }; STD_ROM_PICK(sfiii3an) STD_ROM_FN(sfiii3an) -// ------------------------------------------------------------------------- -// Street Fighter III 3rd Strike: Fight for the Future (Japan 990512, NO CD) -// ------------------------------------------------------------------------- -static struct BurnRomInfo sfiii3nRomDesc[] = { +// ------------------------------------------------- +// JoJo no Kimyouna Bouken / JoJo's Venture (990108) +// ------------------------------------------------- - { "sfiii3_japan_nocd.29f400.u2", - 0x080000, 0x1edc6366, BRF_ESS | BRF_BIOS }, // SH-2 Bios +#define JOJO_990108_FLASH \ + { "jojo-simm1.0", 0x200000, 0xcfbc38d6, BRF_ESS | BRF_PRG }, \ + { "jojo-simm1.1", 0x200000, 0x42578d94, BRF_ESS | BRF_PRG }, \ + { "jojo-simm1.2", 0x200000, 0x1b40c566, BRF_ESS | BRF_PRG }, \ + { "jojo-simm1.3", 0x200000, 0xbba709b4, BRF_ESS | BRF_PRG }, \ + { "jojo-simm2.0", 0x200000, 0x417e5dc1, BRF_ESS | BRF_PRG }, \ + { "jojo-simm2.1", 0x200000, 0xd3b3267d, BRF_ESS | BRF_PRG }, \ + { "jojo-simm2.2", 0x200000, 0xc66d96b1, BRF_ESS | BRF_PRG }, \ + { "jojo-simm2.3", 0x200000, 0xaa34cc85, BRF_ESS | BRF_PRG }, \ + { "jojo-simm3.0", 0x200000, 0xde7fc9c1, BRF_GRA }, \ + { "jojo-simm3.1", 0x200000, 0x43d053d3, BRF_GRA }, \ + { "jojo-simm3.2", 0x200000, 0x2ffd7fa5, BRF_GRA }, \ + { "jojo-simm3.3", 0x200000, 0x4da4985b, BRF_GRA }, \ + { "jojo-simm3.4", 0x200000, 0xfde98d72, BRF_GRA }, \ + { "jojo-simm3.5", 0x200000, 0xedb2a266, BRF_GRA }, \ + { "jojo-simm3.6", 0x200000, 0xbe7cf319, BRF_GRA }, \ + { "jojo-simm3.7", 0x200000, 0x56fe1a9f, BRF_GRA }, \ + { "jojo-simm4.0", 0x200000, 0xc4e7bf68, BRF_GRA }, \ + { "jojo-simm4.1", 0x200000, 0xb62b2719, BRF_GRA }, \ + { "jojo-simm4.2", 0x200000, 0x18d15809, BRF_GRA }, \ + { "jojo-simm4.3", 0x200000, 0x9af0ad79, BRF_GRA }, \ + { "jojo-simm4.4", 0x200000, 0x4124c1f0, BRF_GRA }, \ + { "jojo-simm4.5", 0x200000, 0x5e001fd1, BRF_GRA }, \ + { "jojo-simm4.6", 0x200000, 0x9affa23b, BRF_GRA }, \ + { "jojo-simm4.7", 0x200000, 0x2511572a, BRF_GRA }, \ + { "jojo-simm5.0", 0x200000, 0x797615fc, BRF_GRA }, \ + { "jojo-simm5.1", 0x200000, 0x734fd162, BRF_GRA }, - { "10", 0x800000, 0xba7f76b2, BRF_ESS | BRF_PRG }, // SH-2 Code - { "20", 0x800000, 0x5ca8faba, BRF_ESS | BRF_PRG }, - - { "30", 0x800000, 0xb37cf960, BRF_GRA }, // cd content region - { "31", 0x800000, 0x450ec982, BRF_GRA }, - { "40", 0x800000, 0x632c965f, BRF_GRA }, - { "41", 0x800000, 0x7a4c5f33, BRF_GRA }, - { "50", 0x800000, 0x8562358e, BRF_GRA }, - { "51", 0x800000, 0x7baf234b, BRF_GRA }, - { "60", 0x800000, 0xbc9487b7, BRF_GRA }, - { "61", 0x800000, 0xb813a1b1, BRF_GRA }, -}; - -STD_ROM_PICK(sfiii3n) -STD_ROM_FN(sfiii3n) - -// ------------------------------------------------------- +// ----------------------------------------------------- // JoJo no Kimyouna Bouken / JoJo's Venture (USA 990108) -// ------------------------------------------------------- +// ----------------------------------------------------- static struct BurnRomInfo jojoRomDesc[] = { - { "jojo_usa.29f400.u2", - 0x080000, 0x8d40f7be, BRF_ESS | BRF_BIOS }, // SH-2 Bios -#if !defined (ROM_VERIFY) - { "10", 0x800000, 0xbc612872, BRF_ESS | BRF_PRG }, // SH-2 Code - { "20", 0x800000, 0x0e1daddf, BRF_ESS | BRF_PRG }, + { "jojo_usa.29f400.u2", 0x080000, 0x8d40f7be, BRF_ESS | BRF_BIOS }, // SH-2 Bios - { "30", 0x800000, 0x1d99181b, BRF_GRA }, // cd content region - { "31", 0x800000, 0x6889fbda, BRF_GRA }, - { "40", 0x800000, 0x8069f9de, BRF_GRA }, - { "41", 0x800000, 0x9c426823, BRF_GRA }, - { "50", 0x400000, 0x1c749cc7, BRF_GRA }, -#endif - -// { "jjk000", 0x000000, 0x00000000, BRF_ESS | BRF_CHD }, // CD-ROM + JOJO_990108_FLASH }; STD_ROM_PICK(jojo) STD_ROM_FN(jojo) -// ------------------------------------------------------- -// JoJo no Kimyouna Bouken / JoJo's Venture (USA 981202) -// ------------------------------------------------------- -static struct BurnRomInfo jojoaRomDesc[] = { - - { "jojo_usa.29f400.u2", - 0x080000, 0x8d40f7be, BRF_ESS | BRF_BIOS }, // SH-2 Bios - -#if !defined (ROM_VERIFY) - { "10", 0x800000, 0xe40dc123, BRF_ESS | BRF_PRG }, // SH-2 Code - { "20", 0x800000, 0x0571e37c, BRF_ESS | BRF_PRG }, - - { "30", 0x800000, 0x1d99181b, BRF_GRA }, // cd content region - { "31", 0x800000, 0x6889fbda, BRF_GRA }, - { "40", 0x800000, 0x8069f9de, BRF_GRA }, - { "41", 0x800000, 0x9c426823, BRF_GRA }, - { "50", 0x400000, 0x1c749cc7, BRF_GRA }, -#endif - -// { "cap-jjk-160", 0x000000, 0x00000000, BRF_ESS | BRF_CHD }, // CD-ROM -}; - -STD_ROM_PICK(jojoa) -STD_ROM_FN(jojoa) - // ------------------------------------------------------- // JoJo no Kimyouna Bouken / JoJo's Venture (Japan 990108) // ------------------------------------------------------- static struct BurnRomInfo jojojRomDesc[] = { - { "jojo_japan.29f400.u2", - 0x080000, 0x02778f60, BRF_ESS | BRF_BIOS }, // SH-2 Bios -#if !defined (ROM_VERIFY) - { "10", 0x800000, 0xbc612872, BRF_ESS | BRF_PRG }, // SH-2 Code - { "20", 0x800000, 0x0e1daddf, BRF_ESS | BRF_PRG }, + { "jojo_japan.29f400.u2", 0x080000, 0x02778f60, BRF_ESS | BRF_BIOS }, // SH-2 Bios - { "30", 0x800000, 0x1d99181b, BRF_GRA }, // cd content region - { "31", 0x800000, 0x6889fbda, BRF_GRA }, - { "40", 0x800000, 0x8069f9de, BRF_GRA }, - { "41", 0x800000, 0x9c426823, BRF_GRA }, - { "50", 0x400000, 0x1c749cc7, BRF_GRA }, -#endif - -// { "jjk000", 0x000000, 0x00000000, BRF_ESS | BRF_CHD }, // CD-ROM + JOJO_990108_FLASH }; STD_ROM_PICK(jojoj) STD_ROM_FN(jojoj) -// ------------------------------------------------------- -// JoJo no Kimyouna Bouken / JoJo's Venture (Japan 981202) -// ------------------------------------------------------- -static struct BurnRomInfo jojoajRomDesc[] = { - - { "jojo_japan.29f400.u2", - 0x080000, 0x02778f60, BRF_ESS | BRF_BIOS }, // SH-2 Bios - -#if !defined (ROM_VERIFY) - { "10", 0x800000, 0xe40dc123, BRF_ESS | BRF_PRG }, // SH-2 Code - { "20", 0x800000, 0x0571e37c, BRF_ESS | BRF_PRG }, - - { "30", 0x800000, 0x1d99181b, BRF_GRA }, // cd content region - { "31", 0x800000, 0x6889fbda, BRF_GRA }, - { "40", 0x800000, 0x8069f9de, BRF_GRA }, - { "41", 0x800000, 0x9c426823, BRF_GRA }, - { "50", 0x400000, 0x1c749cc7, BRF_GRA }, -#endif - -// { "cap-jjk-160", 0x000000, 0x00000000, BRF_ESS | BRF_CHD }, // CD-ROM -}; - -STD_ROM_PICK(jojoaj) -STD_ROM_FN(jojoaj) - // ------------------------------------------------------------- // JoJo's Venture / JoJo no Kimyouna Bouken (Asia 990108, NO CD) // ------------------------------------------------------------- static struct BurnRomInfo jojonRomDesc[] = { - { "jojo_asia_nocd.29f400.u2", - 0x080000, 0x05b4f953, BRF_ESS | BRF_BIOS }, // SH-2 Bios + { "jojo_asia_nocd.29f400.u2", 0x080000, 0x05b4f953, BRF_ESS | BRF_BIOS }, // SH-2 Bios - { "10", 0x800000, 0xbc612872, BRF_ESS | BRF_PRG }, // SH-2 Code - { "20", 0x800000, 0x0e1daddf, BRF_ESS | BRF_PRG }, - - { "30", 0x800000, 0x1d99181b, BRF_GRA }, // cd content region - { "31", 0x800000, 0x6889fbda, BRF_GRA }, - { "40", 0x800000, 0x8069f9de, BRF_GRA }, - { "41", 0x800000, 0x9c426823, BRF_GRA }, - { "50", 0x400000, 0x1c749cc7, BRF_GRA }, + JOJO_990108_FLASH }; STD_ROM_PICK(jojon) STD_ROM_FN(jojon) +// ------------------------------------------------- +// JoJo no Kimyouna Bouken / JoJo's Venture (981202) +// ------------------------------------------------- + +#define JOJO_981202_FLASH \ + { "jojoa-simm1.0", 0x200000, 0xe06ba886, BRF_ESS | BRF_PRG }, \ + { "jojoa-simm1.1", 0x200000, 0x6dd177c8, BRF_ESS | BRF_PRG }, \ + { "jojoa-simm1.2", 0x200000, 0xd35a15e0, BRF_ESS | BRF_PRG }, \ + { "jojoa-simm1.3", 0x200000, 0x66d865ac, BRF_ESS | BRF_PRG }, \ + { "jojoa-simm2.0", 0x200000, 0x417e5dc1, BRF_ESS | BRF_PRG }, \ + { "jojoa-simm2.1", 0x200000, 0xc891c887, BRF_ESS | BRF_PRG }, \ + { "jojoa-simm2.2", 0x200000, 0x1e101f30, BRF_ESS | BRF_PRG }, \ + { "jojoa-simm2.3", 0x200000, 0x1fd1d3e4, BRF_ESS | BRF_PRG }, \ + { "jojo-simm3.0", 0x200000, 0xde7fc9c1, BRF_GRA }, \ + { "jojo-simm3.1", 0x200000, 0x43d053d3, BRF_GRA }, \ + { "jojo-simm3.2", 0x200000, 0x2ffd7fa5, BRF_GRA }, \ + { "jojo-simm3.3", 0x200000, 0x4da4985b, BRF_GRA }, \ + { "jojo-simm3.4", 0x200000, 0xfde98d72, BRF_GRA }, \ + { "jojo-simm3.5", 0x200000, 0xedb2a266, BRF_GRA }, \ + { "jojo-simm3.6", 0x200000, 0xbe7cf319, BRF_GRA }, \ + { "jojo-simm3.7", 0x200000, 0x56fe1a9f, BRF_GRA }, \ + { "jojo-simm4.0", 0x200000, 0xc4e7bf68, BRF_GRA }, \ + { "jojo-simm4.1", 0x200000, 0xb62b2719, BRF_GRA }, \ + { "jojo-simm4.2", 0x200000, 0x18d15809, BRF_GRA }, \ + { "jojo-simm4.3", 0x200000, 0x9af0ad79, BRF_GRA }, \ + { "jojo-simm4.4", 0x200000, 0x4124c1f0, BRF_GRA }, \ + { "jojo-simm4.5", 0x200000, 0x5e001fd1, BRF_GRA }, \ + { "jojo-simm4.6", 0x200000, 0x9affa23b, BRF_GRA }, \ + { "jojo-simm4.7", 0x200000, 0x2511572a, BRF_GRA }, \ + { "jojo-simm5.0", 0x200000, 0x797615fc, BRF_GRA }, \ + { "jojo-simm5.1", 0x200000, 0x734fd162, BRF_GRA }, + +// ----------------------------------------------------- +// JoJo no Kimyouna Bouken / JoJo's Venture (USA 981202) +// ----------------------------------------------------- +static struct BurnRomInfo jojoaRomDesc[] = { + + { "jojo_usa.29f400.u2", 0x080000, 0x8d40f7be, BRF_ESS | BRF_BIOS }, // SH-2 Bios + + JOJO_981202_FLASH +}; + +STD_ROM_PICK(jojoa) +STD_ROM_FN(jojoa) + +// ------------------------------------------------------- +// JoJo no Kimyouna Bouken / JoJo's Venture (Japan 981202) +// ------------------------------------------------------- +static struct BurnRomInfo jojoajRomDesc[] = { + + { "jojo_japan.29f400.u2", 0x080000, 0x02778f60, BRF_ESS | BRF_BIOS }, // SH-2 Bios + + JOJO_981202_FLASH +}; + +STD_ROM_PICK(jojoaj) +STD_ROM_FN(jojoaj) + // ------------------------------------------------------------- // JoJo's Venture / JoJo no Kimyouna Bouken (Asia 981202, NO CD) // ------------------------------------------------------------- static struct BurnRomInfo jojoanRomDesc[] = { - { "jojo_asia_nocd.29f400.u2", - 0x080000, 0x05b4f953, BRF_ESS | BRF_BIOS }, // SH-2 Bios - - { "10", 0x800000, 0xe40dc123, BRF_ESS | BRF_PRG }, // SH-2 Code - { "20", 0x800000, 0x0571e37c, BRF_ESS | BRF_PRG }, + { "jojo_asia_nocd.29f400.u2", 0x080000, 0x05b4f953, BRF_ESS | BRF_BIOS }, // SH-2 Bios - { "30", 0x800000, 0x1d99181b, BRF_GRA }, // cd content region - { "31", 0x800000, 0x6889fbda, BRF_GRA }, - { "40", 0x800000, 0x8069f9de, BRF_GRA }, - { "41", 0x800000, 0x9c426823, BRF_GRA }, - { "50", 0x400000, 0x1c749cc7, BRF_GRA }, + JOJO_981202_FLASH }; STD_ROM_PICK(jojoan) STD_ROM_FN(jojoan) +// --------------------------------------------------------------------------- +// JoJo no Kimyouna Bouken: Miraie no Isan / JoJo's Bizarre Adventure (990913) +// --------------------------------------------------------------------------- + +#define JOJOBA_990913_FLASH \ + { "jojoba-simm1.0", 0x200000, 0x76976231, BRF_ESS | BRF_PRG }, \ + { "jojoba-simm1.1", 0x200000, 0xcedd78e7, BRF_ESS | BRF_PRG }, \ + { "jojoba-simm1.2", 0x200000, 0x2955b77f, BRF_ESS | BRF_PRG }, \ + { "jojoba-simm1.3", 0x200000, 0x280139d7, BRF_ESS | BRF_PRG }, \ + { "jojoba-simm2.0", 0x200000, 0x305c4914, BRF_ESS | BRF_PRG }, \ + { "jojoba-simm2.1", 0x200000, 0x18af4f3b, BRF_ESS | BRF_PRG }, \ + { "jojoba-simm2.2", 0x200000, 0x397e5c9e, BRF_ESS | BRF_PRG }, \ + { "jojoba-simm2.3", 0x200000, 0xa9d0a7d7, BRF_ESS | BRF_PRG }, \ + { "jojoba-simm3.0", 0x200000, 0x4d16e111, BRF_GRA }, \ + { "jojoba-simm3.1", 0x200000, 0x9b3406d3, BRF_GRA }, \ + { "jojoba-simm3.2", 0x200000, 0xf2414997, BRF_GRA }, \ + { "jojoba-simm3.3", 0x200000, 0x954b9c7d, BRF_GRA }, \ + { "jojoba-simm3.4", 0x200000, 0x625adc1d, BRF_GRA }, \ + { "jojoba-simm3.5", 0x200000, 0x20a70bb4, BRF_GRA }, \ + { "jojoba-simm3.6", 0x200000, 0xa10ec5af, BRF_GRA }, \ + { "jojoba-simm3.7", 0x200000, 0x0bd0de7a, BRF_GRA }, \ + { "jojoba-simm4.0", 0x200000, 0x6ea14adc, BRF_GRA }, \ + { "jojoba-simm4.1", 0x200000, 0x8f4c42fb, BRF_GRA }, \ + { "jojoba-simm4.2", 0x200000, 0xef0586d1, BRF_GRA }, \ + { "jojoba-simm4.3", 0x200000, 0x93ccc470, BRF_GRA }, \ + { "jojoba-simm4.4", 0x200000, 0x3d9ec7d2, BRF_GRA }, \ + { "jojoba-simm4.5", 0x200000, 0x03e66850, BRF_GRA }, \ + { "jojoba-simm4.6", 0x200000, 0x01606ac3, BRF_GRA }, \ + { "jojoba-simm4.7", 0x200000, 0x36392b87, BRF_GRA }, \ + { "jojoba-simm5.0", 0x200000, 0x2ef8c60c, BRF_GRA }, \ + { "jojoba-simm5.1", 0x200000, 0xcf7d7ca6, BRF_GRA }, \ + { "jojoba-simm5.2", 0x200000, 0xb7815bfa, BRF_GRA }, \ + { "jojoba-simm5.3", 0x200000, 0x9bfec049, BRF_GRA }, \ + { "jojoba-simm5.4", 0x200000, 0xd167536b, BRF_GRA }, \ + { "jojoba-simm5.5", 0x200000, 0x55e7a042, BRF_GRA }, \ + { "jojoba-simm5.6", 0x200000, 0x4fb32906, BRF_GRA }, \ + { "jojoba-simm5.7", 0x200000, 0x8c8be520, BRF_GRA }, + // --------------------------------------------------------------------------------- // JoJo no Kimyouna Bouken: Miraie no Isan / JoJo's Bizarre Adventure (Japan 990913) // --------------------------------------------------------------------------------- static struct BurnRomInfo jojobaRomDesc[] = { - { "jojoba_japan.29f400.u2", - 0x080000, 0x3085478c, BRF_ESS | BRF_BIOS }, // SH-2 Bios + { "jojoba_japan.29f400.u2", 0x080000, 0x3085478c, BRF_ESS | BRF_BIOS }, // SH-2 Bios -#if !defined (ROM_VERIFY) - { "10", 0x800000, 0x6e2490f6, BRF_ESS | BRF_PRG }, // SH-2 Code - { "20", 0x800000, 0x1293892b, BRF_ESS | BRF_PRG }, - - { "30", 0x800000, 0xd25c5005, BRF_GRA }, // cd content region - { "31", 0x800000, 0x51bb3dba, BRF_GRA }, - { "40", 0x800000, 0x94dc26d4, BRF_GRA }, - { "41", 0x800000, 0x1c53ee62, BRF_GRA }, - { "50", 0x800000, 0x36e416ed, BRF_GRA }, - { "51", 0x800000, 0xeedf19ca, BRF_GRA }, -#endif - -// { "jjm000", 0x000000, 0x00000000, BRF_ESS | BRF_CHD }, // CD-ROM + JOJOBA_990913_FLASH }; STD_ROM_PICK(jojoba) @@ -633,18 +692,9 @@ STD_ROM_FN(jojoba) // ---------------------------------------------------------------------------------------- static struct BurnRomInfo jojobanRomDesc[] = { - { "jojoba_japan_nocd.29f400.u2", - 0x080000, 0x4dab19f5, BRF_ESS | BRF_BIOS }, // SH-2 Bios - - { "10", 0x800000, 0x6e2490f6, BRF_ESS | BRF_PRG }, // SH-2 Code - { "20", 0x800000, 0x1293892b, BRF_ESS | BRF_PRG }, - - { "30", 0x800000, 0xd25c5005, BRF_GRA }, // cd content region - { "31", 0x800000, 0x51bb3dba, BRF_GRA }, - { "40", 0x800000, 0x94dc26d4, BRF_GRA }, - { "41", 0x800000, 0x1c53ee62, BRF_GRA }, - { "50", 0x800000, 0x36e416ed, BRF_GRA }, - { "51", 0x800000, 0xeedf19ca, BRF_GRA }, + { "jojoba_japan_nocd.29f400.u2", 0x080000, 0x4dab19f5, BRF_ESS | BRF_BIOS }, // SH-2 Bios + + JOJOBA_990913_FLASH }; STD_ROM_PICK(jojoban) @@ -655,42 +705,50 @@ STD_ROM_FN(jojoban) // --------------------------------------------------------------------------------------- static struct BurnRomInfo jojobaneRomDesc[] = { - { "jojoba_euro_nocd.29f400.u2", - 0x080000, 0x1ee2d679, BRF_ESS | BRF_BIOS }, // SH-2 Bios - - { "10", 0x800000, 0x6e2490f6, BRF_ESS | BRF_PRG }, // SH-2 Code - { "20", 0x800000, 0x1293892b, BRF_ESS | BRF_PRG }, - - { "30", 0x800000, 0xd25c5005, BRF_GRA }, // cd content region - { "31", 0x800000, 0x51bb3dba, BRF_GRA }, - { "40", 0x800000, 0x94dc26d4, BRF_GRA }, - { "41", 0x800000, 0x1c53ee62, BRF_GRA }, - { "50", 0x800000, 0x36e416ed, BRF_GRA }, - { "51", 0x800000, 0xeedf19ca, BRF_GRA }, + { "jojoba_euro_nocd.29f400.u2", 0x080000, 0x1ee2d679, BRF_ESS | BRF_BIOS }, // SH-2 Bios + + JOJOBA_990913_FLASH }; STD_ROM_PICK(jojobane) STD_ROM_FN(jojobane) +// ----------------------------- +// Red Earth / War-Zard (961121) +// ----------------------------- + +#define REDEARTH_961121_FLASH \ + { "redearth-simm1.0", 0x200000, 0xcad468f8, BRF_ESS | BRF_PRG }, \ + { "redearth-simm1.1", 0x200000, 0xe9721d89, BRF_ESS | BRF_PRG }, \ + { "redearth-simm1.2", 0x200000, 0x2889ec98, BRF_ESS | BRF_PRG }, \ + { "redearth-simm1.3", 0x200000, 0x5a6cd148, BRF_ESS | BRF_PRG }, \ + { "redearth-simm3.0", 0x200000, 0x83350cc5, BRF_GRA }, \ + { "redearth-simm3.1", 0x200000, 0x56734de6, BRF_GRA }, \ + { "redearth-simm3.2", 0x200000, 0x800ea0f1, BRF_GRA }, \ + { "redearth-simm3.3", 0x200000, 0x97e9146c, BRF_GRA }, \ + { "redearth-simm3.4", 0x200000, 0x0cb1d648, BRF_GRA }, \ + { "redearth-simm3.5", 0x200000, 0x7a1099f0, BRF_GRA }, \ + { "redearth-simm3.6", 0x200000, 0xaeff8f54, BRF_GRA }, \ + { "redearth-simm3.7", 0x200000, 0xf770acd0, BRF_GRA }, \ + { "redearth-simm4.0", 0x200000, 0x301e56f2, BRF_GRA }, \ + { "redearth-simm4.1", 0x200000, 0x2048e103, BRF_GRA }, \ + { "redearth-simm4.2", 0x200000, 0xc9433455, BRF_GRA }, \ + { "redearth-simm4.3", 0x200000, 0xc02171a8, BRF_GRA }, \ + { "redearth-simm4.4", 0x200000, 0x2ddbf276, BRF_GRA }, \ + { "redearth-simm4.5", 0x200000, 0xfea820a6, BRF_GRA }, \ + { "redearth-simm4.6", 0x200000, 0xc7528df1, BRF_GRA }, \ + { "redearth-simm4.7", 0x200000, 0x2449cf3b, BRF_GRA }, \ + { "redearth-simm5.0", 0x200000, 0x424451b9, BRF_GRA }, \ + { "redearth-simm5.1", 0x200000, 0x9b8cb56b, BRF_GRA }, + // ---------------------------------- // Red Earth / War-Zard (Euro 961121) // ---------------------------------- static struct BurnRomInfo redearthRomDesc[] = { - { "warzard_euro.29f400.u2", - 0x080000, 0x02e0f336, BRF_ESS | BRF_BIOS }, // SH-2 Bios - -#if !defined (ROM_VERIFY) - { "10", 0x800000, 0x68188016, BRF_ESS | BRF_PRG }, // SH-2 Code - - { "30", 0x800000, 0x074cab4d, BRF_GRA }, // cd content region - { "31", 0x800000, 0x14e2cad4, BRF_GRA }, - { "40", 0x800000, 0x72d98890, BRF_GRA }, - { "41", 0x800000, 0x88ccb33c, BRF_GRA }, - { "50", 0x400000, 0x2f5b44bd, BRF_GRA }, -#endif - -// { "wzd000", 0x000000, 0x00000000, BRF_ESS | BRF_CHD }, // CD-ROM + { "redearth_euro.29f400.u2", 0x080000, 0x02e0f336, BRF_ESS | BRF_BIOS }, // SH-2 Bios + + REDEARTH_961121_FLASH }; STD_ROM_PICK(redearth) @@ -701,67 +759,50 @@ STD_ROM_FN(redearth) // ----------------------------------- static struct BurnRomInfo warzardRomDesc[] = { - { "warzard_japan.29f400.u2", - 0x080000, 0xf8e2f0c6, BRF_ESS | BRF_BIOS }, // SH-2 Bios - -#if !defined (ROM_VERIFY) - { "10", 0x800000, 0x68188016, BRF_ESS | BRF_PRG }, // SH-2 Code - - { "30", 0x800000, 0x074cab4d, BRF_GRA }, // cd content region - { "31", 0x800000, 0x14e2cad4, BRF_GRA }, - { "40", 0x800000, 0x72d98890, BRF_GRA }, - { "41", 0x800000, 0x88ccb33c, BRF_GRA }, - { "50", 0x400000, 0x2f5b44bd, BRF_GRA }, -#endif - -// { "wzd000", 0x000000, 0x00000000, BRF_ESS | BRF_CHD }, // CD-ROM + { "warzard_japan.29f400.u2", 0x080000, 0xf8e2f0c6, BRF_ESS | BRF_BIOS }, // SH-2 Bios + + REDEARTH_961121_FLASH }; STD_ROM_PICK(warzard) STD_ROM_FN(warzard) -// ----------------------------------------- -// Red Earth / War-Zard (Euro 961121, NO CD) -// ----------------------------------------- -static struct BurnRomInfo redeartnRomDesc[] = { +// ----------------------------- +// Red Earth / War-Zard (961023) +// ----------------------------- -#if !defined (ROM_VERIFY) - { "warzard_euro.29f400.u2",0x080000, 0x02e0f336, BRF_ESS | BRF_BIOS }, // SH-2 Bios -#else - { "redearth_nocd.bios", 0x080000, 0x00000000, BRF_ESS | BRF_BIOS | BRF_NODUMP }, // SH-2 Bios -#endif - - { "10", 0x800000, 0x68188016, BRF_ESS | BRF_PRG }, // SH-2 Code - - { "30", 0x800000, 0x074cab4d, BRF_GRA }, // cd content region - { "31", 0x800000, 0x14e2cad4, BRF_GRA }, - { "40", 0x800000, 0x72d98890, BRF_GRA }, - { "41", 0x800000, 0x88ccb33c, BRF_GRA }, - { "50", 0x400000, 0x2f5b44bd, BRF_GRA }, -}; - -STD_ROM_PICK(redeartn) -STD_ROM_FN(redeartn) +#define REDEARTH_961023_FLASH \ + { "redeartha-simm1.0", 0x200000, 0x65bac346, BRF_ESS | BRF_PRG }, \ + { "redeartha-simm1.1", 0x200000, 0xa8ec4aae, BRF_ESS | BRF_PRG }, \ + { "redeartha-simm1.2", 0x200000, 0x2caf8995, BRF_ESS | BRF_PRG }, \ + { "redeartha-simm1.3", 0x200000, 0x13ebc21d, BRF_ESS | BRF_PRG }, \ + { "redearth-simm3.0", 0x200000, 0x83350cc5, BRF_GRA }, \ + { "redearth-simm3.1", 0x200000, 0x56734de6, BRF_GRA }, \ + { "redearth-simm3.2", 0x200000, 0x800ea0f1, BRF_GRA }, \ + { "redearth-simm3.3", 0x200000, 0x97e9146c, BRF_GRA }, \ + { "redearth-simm3.4", 0x200000, 0x0cb1d648, BRF_GRA }, \ + { "redearth-simm3.5", 0x200000, 0x7a1099f0, BRF_GRA }, \ + { "redearth-simm3.6", 0x200000, 0xaeff8f54, BRF_GRA }, \ + { "redearth-simm3.7", 0x200000, 0xf770acd0, BRF_GRA }, \ + { "redearth-simm4.0", 0x200000, 0x301e56f2, BRF_GRA }, \ + { "redearth-simm4.1", 0x200000, 0x2048e103, BRF_GRA }, \ + { "redearth-simm4.2", 0x200000, 0xc9433455, BRF_GRA }, \ + { "redearth-simm4.3", 0x200000, 0xc02171a8, BRF_GRA }, \ + { "redearth-simm4.4", 0x200000, 0x2ddbf276, BRF_GRA }, \ + { "redearth-simm4.5", 0x200000, 0xfea820a6, BRF_GRA }, \ + { "redearth-simm4.6", 0x200000, 0xc7528df1, BRF_GRA }, \ + { "redearth-simm4.7", 0x200000, 0x2449cf3b, BRF_GRA }, \ + { "redearth-simm5.0", 0x200000, 0x424451b9, BRF_GRA }, \ + { "redearth-simm5.1", 0x200000, 0x9b8cb56b, BRF_GRA }, // ---------------------------------- // Red Earth / War-Zard (Euro 961023) // ---------------------------------- static struct BurnRomInfo redearthaRomDesc[] = { - { "warzard_euro.29f400.u2", - 0x080000, 0x02e0f336, BRF_ESS | BRF_BIOS }, // SH-2 Bios - -#if !defined (ROM_VERIFY) - { "10", 0x800000, 0xb3db2393, BRF_ESS | BRF_PRG }, // SH-2 Code - - { "30", 0x800000, 0x074cab4d, BRF_GRA }, // cd content region - { "31", 0x800000, 0x14e2cad4, BRF_GRA }, - { "40", 0x800000, 0x72d98890, BRF_GRA }, - { "41", 0x800000, 0x88ccb33c, BRF_GRA }, - { "50", 0x400000, 0x2f5b44bd, BRF_GRA }, -#endif - -// { "wzd000", 0x000000, 0x00000000, BRF_ESS | BRF_CHD }, // CD-ROM + { "redearth_euro.29f400.u2", 0x080000, 0x02e0f336, BRF_ESS | BRF_BIOS }, // SH-2 Bios + + REDEARTH_961023_FLASH }; STD_ROM_PICK(redeartha) @@ -772,48 +813,14 @@ STD_ROM_FN(redeartha) // ----------------------------------- static struct BurnRomInfo warzardaRomDesc[] = { - { "warzard_japan.29f400.u2", - 0x080000, 0xf8e2f0c6, BRF_ESS | BRF_BIOS }, // SH-2 Bios - -#if !defined (ROM_VERIFY) - { "10", 0x800000, 0xb3db2393, BRF_ESS | BRF_PRG }, // SH-2 Code - - { "30", 0x800000, 0x074cab4d, BRF_GRA }, // cd content region - { "31", 0x800000, 0x14e2cad4, BRF_GRA }, - { "40", 0x800000, 0x72d98890, BRF_GRA }, - { "41", 0x800000, 0x88ccb33c, BRF_GRA }, - { "50", 0x400000, 0x2f5b44bd, BRF_GRA }, -#endif - -// { "wzd000", 0x000000, 0x00000000, BRF_ESS | BRF_CHD }, // CD-ROM + { "warzard_japan.29f400.u2", 0x080000, 0xf8e2f0c6, BRF_ESS | BRF_BIOS }, // SH-2 Bios + + REDEARTH_961023_FLASH }; STD_ROM_PICK(warzarda) STD_ROM_FN(warzarda) -// ----------------------------------------- -// Red Earth / War-Zard (Euro 961023, NO CD) -// ----------------------------------------- -static struct BurnRomInfo redeartnaRomDesc[] = { - -#if !defined (ROM_VERIFY) - { "warzard_euro.29f400.u2",0x080000, 0x02e0f336, BRF_ESS | BRF_BIOS }, // SH-2 Bios -#else - { "redearth_nocd.bios", 0x080000, 0x00000000, BRF_ESS | BRF_BIOS | BRF_NODUMP }, // SH-2 Bios -#endif - - { "10", 0x800000, 0xb3db2393, BRF_ESS | BRF_PRG }, // SH-2 Code - - { "30", 0x800000, 0x074cab4d, BRF_GRA }, // cd content region - { "31", 0x800000, 0x14e2cad4, BRF_GRA }, - { "40", 0x800000, 0x72d98890, BRF_GRA }, - { "41", 0x800000, 0x88ccb33c, BRF_GRA }, - { "50", 0x400000, 0x2f5b44bd, BRF_GRA }, -}; - -STD_ROM_PICK(redeartna) -STD_ROM_FN(redeartna) - // ------------------------------------------------------------------------------------ static INT32 sfiiiInit() @@ -1163,16 +1170,6 @@ struct BurnDriver BurnDrvWarzard = { 384, 224, 4, 3 }; -struct BurnDriver BurnDrvRedeartn = { - "redeartn", "redearth", NULL, NULL, "1996", - "Red Earth / War-Zard (Euro 961121, NO CD)\0", NULL, "Capcom", "CPS-3", - L"Red Earth\0War-Zard (Euro 961121, NO CD)\0", NULL, NULL, NULL, - BDF_GAME_WORKING | BDF_16BIT_ONLY | BDF_CLONE, 2, HARDWARE_CAPCOM_CPS3 | HARDWARE_CAPCOM_CPS3_NO_CD, GBF_VSFIGHT, 0, - NULL, redeartnRomInfo, redeartnRomName, NULL, NULL, cps3InputInfo, redeartnDIPInfo, - redearthInit, cps3Exit, cps3Frame, NULL, cps3Scan, &cps3_palette_change, 0x40000, - 384, 224, 4, 3 -}; - struct BurnDriver BurnDrvRedeartha = { "redeartha", "redearth", NULL, NULL, "1996", "Red Earth / War-Zard (Euro 961023)\0", NULL, "Capcom", "CPS-3", @@ -1192,13 +1189,3 @@ struct BurnDriver BurnDrvWarzarda = { redearthInit, cps3Exit, cps3Frame, NULL, cps3Scan, &cps3_palette_change, 0x40000, 384, 224, 4, 3 }; - -struct BurnDriver BurnDrvRedeartna = { - "redeartna", "redearth", NULL, NULL, "1996", - "Red Earth / War-Zard (Euro 961023, NO CD)\0", NULL, "Capcom", "CPS-3", - L"Red Earth\0War-Zard (Euro 961023, NO CD)\0", NULL, NULL, NULL, - BDF_GAME_WORKING | BDF_16BIT_ONLY | BDF_CLONE, 2, HARDWARE_CAPCOM_CPS3 | HARDWARE_CAPCOM_CPS3_NO_CD, GBF_VSFIGHT, 0, - NULL, redeartnaRomInfo, redeartnaRomName, NULL, NULL, cps3InputInfo, redeartnDIPInfo, - redearthInit, cps3Exit, cps3Frame, NULL, cps3Scan, &cps3_palette_change, 0x40000, - 384, 224, 4, 3 -}; diff --git a/src/burner/dat.cpp b/src/burner/dat.cpp index d0c756493..dc72e7d7c 100644 --- a/src/burner/dat.cpp +++ b/src/burner/dat.cpp @@ -92,12 +92,6 @@ INT32 write_datfile(INT32 bIncMegadrive, FILE* fDat) continue; } -#if defined (ROM_VERIFY) - if ((BurnDrvGetHardwareCode() & HARDWARE_PUBLIC_MASK) == HARDWARE_CAPCOM_CPS3) { - continue; - } -#endif - strcpy(sgName, BurnDrvGetTextA(DRV_NAME)); strcpy(spName, ""); // make sure this string is empty before we start strcpy(sbName, ""); // make sure this string is empty before we start