Sync with MAME 0.147u3

This commit is contained in:
Barry Harris 2012-11-19 13:18:19 +00:00
parent cfe1762ef7
commit 9c7fe7b58b
3 changed files with 80 additions and 70 deletions

View File

@ -3940,7 +3940,7 @@ static struct BurnRomInfo Captcommr1RomDesc[] = {
{ "cc63b.1a", 0x000117, 0xcae8f0f9, BRF_OPT }, // b-board PLDs
{ "iob1.12d", 0x000117, 0x3abc0700, BRF_OPT },
{ "ccprg.11d", 0x000117, 0xe1c225c4, BRF_OPT },
{ "ccprg.11d", 0x000117, 0x00000000, BRF_OPT | BRF_NODUMP },
{ "ioc1.ic7", 0x000117, 0x0d182081, BRF_OPT }, // c-board PLDs
{ "c632.ic1", 0x000117, 0x0fbd9270, BRF_OPT },
};
@ -4036,7 +4036,7 @@ static struct BurnRomInfo Captcommjr1RomDesc[] = {
{ "cc63b.1a", 0x000117, 0xcae8f0f9, BRF_OPT }, // b-board PLDs
{ "iob1.12d", 0x000117, 0x3abc0700, BRF_OPT },
{ "ccprg.11d", 0x000117, 0xe1c225c4, BRF_OPT },
{ "ccprg.11d", 0x000117, 0x00000000, BRF_OPT | BRF_NODUMP },
{ "ioc1.ic7", 0x000117, 0x0d182081, BRF_OPT }, // c-board PLDs
{ "c632.ic1", 0x000117, 0x0fbd9270, BRF_OPT },
};
@ -7141,29 +7141,34 @@ STD_ROM_PICK(Sf2ebbl)
STD_ROM_FN(Sf2ebbl)
static struct BurnRomInfo Sf2sttRomDesc[] = {
{ "10.bin", 0x040000, 0xa258b4d5, BRF_ESS | BRF_PRG | CPS1_68K_PROGRAM_BYTESWAP },
{ "09.bin", 0x040000, 0x59ccd474, BRF_ESS | BRF_PRG | CPS1_68K_PROGRAM_BYTESWAP },
{ "ce91e-b", 0x040000, 0x0862386e, BRF_ESS | BRF_PRG | CPS1_68K_PROGRAM_BYTESWAP },
{ "ce91e-a", 0x040000, 0x0c83844d, BRF_ESS | BRF_PRG | CPS1_68K_PROGRAM_BYTESWAP },
#if !defined ROM_VERIFY
{ "10.bin", 0x040000, 0xa258b4d5, BRF_ESS | BRF_PRG | CPS1_68K_PROGRAM_BYTESWAP },
{ "09.bin", 0x040000, 0x59ccd474, BRF_ESS | BRF_PRG | CPS1_68K_PROGRAM_BYTESWAP },
#else
{ "prg part 1.stt", 0x040000, 0x00000000, BRF_OPT | BRF_PRG | BRF_NODUMP },
{ "prg part 2.stt", 0x040000, 0x00000000, BRF_OPT | BRF_PRG | BRF_NODUMP },
#endif
{ "ce91e-b", 0x040000, 0x0862386e, BRF_ESS | BRF_PRG | CPS1_68K_PROGRAM_BYTESWAP },
{ "ce91e-a", 0x040000, 0x0c83844d, BRF_ESS | BRF_PRG | CPS1_68K_PROGRAM_BYTESWAP },
{ "stt-a-910913", 0x100000, 0x10a7036d, BRF_GRA | CPS1_TILES },
{ "stt-d-910913", 0x100000, 0x3580b124, BRF_GRA | CPS1_TILES },
{ "stt-b-910913", 0x100000, 0x7a09224e, BRF_GRA | CPS1_TILES },
{ "stt-e-910913", 0x100000, 0x382a612c, BRF_GRA | CPS1_TILES },
{ "stt-c-910913", 0x100000, 0x11701b8f, BRF_GRA | CPS1_TILES },
{ "stt-f-910913", 0x100000, 0x101a0b72, BRF_GRA | CPS1_TILES },
{ "stt-a 910913", 0x100000, 0x10a7036d, BRF_GRA | CPS1_TILES },
{ "stt-d 910913", 0x100000, 0x3580b124, BRF_GRA | CPS1_TILES },
{ "stt-b 910913", 0x100000, 0x7a09224e, BRF_GRA | CPS1_TILES },
{ "stt-e 910913", 0x100000, 0x382a612c, BRF_GRA | CPS1_TILES },
{ "stt-c 910913", 0x100000, 0x11701b8f, BRF_GRA | CPS1_TILES },
{ "stt-f 910913", 0x100000, 0x101a0b72, BRF_GRA | CPS1_TILES },
{ "stt3", 0x010000, 0xa4823a1b, BRF_PRG | CPS1_Z80_PROGRAM },
{ "3.stt", 0x010000, 0xa4823a1b, BRF_PRG | CPS1_Z80_PROGRAM },
{ "stt2", 0x020000, 0x7f162009, BRF_SND | CPS1_OKIM6295_SAMPLES },
{ "stt1", 0x020000, 0xbeade53f, BRF_SND | CPS1_OKIM6295_SAMPLES },
{ "2.stt", 0x020000, 0x7f162009, BRF_SND | CPS1_OKIM6295_SAMPLES },
{ "1.stt", 0x020000, 0xbeade53f, BRF_SND | CPS1_OKIM6295_SAMPLES },
{ "stt5", 0x020000, 0xa505621e, BRF_GRA }, // extra graphics - map over normal roms to remove CAPCOM logo
{ "stt7", 0x020000, 0xde6271fb, BRF_GRA },
{ "stt6", 0x020000, 0x23775344, BRF_GRA },
{ "stt8", 0x020000, 0x81c9550f, BRF_GRA },
{ "5.stt", 0x020000, 0xa505621e, BRF_GRA }, // extra graphics - map over normal roms to remove CAPCOM logo
{ "7.stt", 0x020000, 0xde6271fb, BRF_GRA },
{ "6.stt", 0x020000, 0x23775344, BRF_GRA },
{ "8.stt", 0x020000, 0x81c9550f, BRF_GRA },
{ "stt4", 0x010000, 0x13ea1c44, BRF_OPT }, // unknown
{ "4.stt", 0x010000, 0x13ea1c44, BRF_OPT }, // unknown
};
STD_ROM_PICK(Sf2stt)
@ -8038,9 +8043,9 @@ STD_ROM_PICK(Sf2acc)
STD_ROM_FN(Sf2acc)
static struct BurnRomInfo Sf2accaRomDesc[] = {
{ "sf2ca_23-c.8f", 0x080000, 0x35f9517b, BRF_ESS | BRF_PRG | CPS1_68K_PROGRAM_NO_BYTESWAP },
{ "sf2ca_22-c.7f", 0x080000, 0x99f1cca4, BRF_ESS | BRF_PRG | CPS1_68K_PROGRAM_NO_BYTESWAP },
{ "sf2ca_21-c.6f", 0x080000, 0x2ab2034f, BRF_ESS | BRF_PRG | CPS1_68K_PROGRAM_NO_BYTESWAP },
{ "23-c.8f", 0x080000, 0x35f9517b, BRF_ESS | BRF_PRG | CPS1_68K_PROGRAM_NO_BYTESWAP },
{ "22-c.7f", 0x080000, 0x99f1cca4, BRF_ESS | BRF_PRG | CPS1_68K_PROGRAM_NO_BYTESWAP },
{ "21-c.6f", 0x080000, 0x2ab2034f, BRF_ESS | BRF_PRG | CPS1_68K_PROGRAM_NO_BYTESWAP },
{ "s92_01.bin", 0x080000, 0x03b0d852, BRF_GRA | CPS1_TILES },
{ "s92_02.bin", 0x080000, 0x840289ec, BRF_GRA | CPS1_TILES },
@ -8515,29 +8520,34 @@ STD_ROM_PICK(Sf2koryu2)
STD_ROM_FN(Sf2koryu2)
static struct BurnRomInfo Sf2amfRomDesc[] = {
{ "amf5", 0x080000, 0x03991fba, BRF_ESS | BRF_PRG | CPS1_68K_PROGRAM_BYTESWAP },
{ "amf4", 0x080000, 0x39f15a1e, BRF_ESS | BRF_PRG | CPS1_68K_PROGRAM_BYTESWAP },
{ "stf2th-6.bin", 0x020000, 0x64e6e091, BRF_ESS | BRF_PRG | CPS1_68K_PROGRAM_BYTESWAP }, // wasn't in original dump (set seems to be same as sf2th but with different graphics roms)
{ "stf2th-4.bin", 0x020000, 0xc95e4443, BRF_ESS | BRF_PRG | CPS1_68K_PROGRAM_BYTESWAP }, // wasn't in original dump (set seems to be same as sf2th but with different graphics roms)
{ "5.amf", 0x080000, 0x03991fba, BRF_ESS | BRF_PRG | CPS1_68K_PROGRAM_BYTESWAP },
{ "4.amf", 0x080000, 0x39f15a1e, BRF_ESS | BRF_PRG | CPS1_68K_PROGRAM_BYTESWAP },
#if !defined ROM_VERIFY
{ "stf2th-6.bin", 0x020000, 0x64e6e091, BRF_ESS | BRF_PRG | CPS1_68K_PROGRAM_BYTESWAP }, // wasn't in original dump (set seems to be same as sf2th but with different graphics roms)
{ "stf2th-4.bin", 0x020000, 0xc95e4443, BRF_ESS | BRF_PRG | CPS1_68K_PROGRAM_BYTESWAP }, // wasn't in original dump (set seems to be same as sf2th but with different graphics roms)
#else
{ "prg part 3.amf", 0x040000, 0x00000000, BRF_OPT | BRF_PRG | BRF_NODUMP | CPS1_68K_PROGRAM_BYTESWAP },
{ "prg part 4.amf", 0x040000, 0x00000000, BRF_OPT | BRF_PRG | BRF_NODUMP | CPS1_68K_PROGRAM_BYTESWAP },
#endif
{ "y.c.e.c-m.k.r-001", 0x100000, 0xa258de13, BRF_GRA | CPS1_TILES },
{ "y.c.e.c-m.k.r-003", 0x100000, 0xc781bf87, BRF_GRA | CPS1_TILES },
{ "y.c.e.c-m.k.r-002", 0x100000, 0x5726cab8, BRF_GRA | CPS1_TILES },
{ "y.c.e.c-d.w.c-011", 0x100000, 0xbc90c12f, BRF_GRA | CPS1_TILES },
{ "y.c.e.c-d.w.c-012", 0x100000, 0x187667cc, BRF_GRA | CPS1_TILES },
{ "y.c.e.c-d.w.c-013", 0x100000, 0x5b585071, BRF_GRA | CPS1_TILES },
{ "y.c.e.c m.k.r-001", 0x100000, 0xa258de13, BRF_GRA | CPS1_TILES },
{ "y.c.e.c m.k.r-003", 0x100000, 0xc781bf87, BRF_GRA | CPS1_TILES },
{ "y.c.e.c m.k.r-002", 0x100000, 0x5726cab8, BRF_GRA | CPS1_TILES },
{ "y.c.e.c d.w.c-011", 0x100000, 0xbc90c12f, BRF_GRA | CPS1_TILES },
{ "y.c.e.c d.w.c-012", 0x100000, 0x187667cc, BRF_GRA | CPS1_TILES },
{ "y.c.e.c d.w.c-013", 0x100000, 0x5b585071, BRF_GRA | CPS1_TILES },
{ "amf3", 0x010000, 0xa4823a1b, BRF_PRG | CPS1_Z80_PROGRAM },
{ "3.amf", 0x010000, 0xa4823a1b, BRF_PRG | CPS1_Z80_PROGRAM },
{ "amf2", 0x020000, 0x7f162009, BRF_SND | CPS1_OKIM6295_SAMPLES },
{ "amf1", 0x020000, 0xbeade53f, BRF_SND | CPS1_OKIM6295_SAMPLES },
{ "2.amf", 0x020000, 0x7f162009, BRF_SND | CPS1_OKIM6295_SAMPLES },
{ "1.amf", 0x020000, 0xbeade53f, BRF_SND | CPS1_OKIM6295_SAMPLES },
{ "amf6", 0x020000, 0x3a85a275, BRF_GRA }, // extra graphics - map over normal roms to remove CAPCOM logo
{ "amf9", 0x020000, 0x9156472f, BRF_GRA },
{ "amf8", 0x020000, 0xecdb083b, BRF_GRA },
{ "amf10", 0x020000, 0x8fea8384, BRF_GRA },
{ "6.amf", 0x020000, 0x3a85a275, BRF_GRA }, // extra graphics - map over normal roms to remove CAPCOM logo
{ "9.amf", 0x020000, 0x9156472f, BRF_GRA },
{ "8.amf", 0x020000, 0xecdb083b, BRF_GRA },
{ "10.amf", 0x020000, 0x8fea8384, BRF_GRA },
{ "amf7", 0x010000, 0x13ea1c44, BRF_OPT }, // unknown
{ "7.amf", 0x010000, 0x13ea1c44, BRF_OPT }, // unknown
};
STD_ROM_PICK(Sf2amf)

View File

@ -3413,25 +3413,25 @@ struct BurnDriver BurnDrvThndblst = {
// Dream Soccer '94
static struct BurnRomInfo dsoccr94RomDesc[] = {
{ "ds_h0-c.rom", 0x040000, 0xd01d3fd7, 1 | BRF_PRG | BRF_ESS }, // 0 V33 Code
{ "ds_l0-c.rom", 0x040000, 0x8af0afe2, 1 | BRF_PRG | BRF_ESS }, // 1
{ "ds_h1-c.rom", 0x040000, 0x6109041b, 1 | BRF_PRG | BRF_ESS }, // 2
{ "ds_l1-c.rom", 0x040000, 0x97a01f6b, 1 | BRF_PRG | BRF_ESS }, // 3
{ "a3-4p_h0-c-0.ic59", 0x040000, 0xd01d3fd7, 1 | BRF_PRG | BRF_ESS }, // 0 V33 Code
{ "a3-4p_l0-c-0.ic61", 0x040000, 0x8af0afe2, 1 | BRF_PRG | BRF_ESS }, // 1
{ "a3_h1-c-0.ic60", 0x040000, 0x6109041b, 1 | BRF_PRG | BRF_ESS }, // 2
{ "a3_l1-c-0.ic62", 0x040000, 0x97a01f6b, 1 | BRF_PRG | BRF_ESS }, // 3
{ "ds_sh0.rom", 0x010000, 0x23fe6ffc, 2 | BRF_PRG | BRF_ESS }, // 4 V30 Code
{ "ds_sl0.rom", 0x010000, 0x768132e5, 2 | BRF_PRG | BRF_ESS }, // 5
{ "a3-sh0-c-0.ic31", 0x010000, 0x23fe6ffc, 2 | BRF_PRG | BRF_ESS }, // 4 V30 Code
{ "a3-sl0-c-0.ic37", 0x010000, 0x768132e5, 2 | BRF_PRG | BRF_ESS }, // 5
{ "ds_c00.rom", 0x100000, 0x2d31d418, 3 | BRF_GRA }, // 6 Background Tiles
{ "ds_c10.rom", 0x100000, 0x57f7bcd3, 3 | BRF_GRA }, // 7
{ "ds_c01.rom", 0x100000, 0x9d31a464, 3 | BRF_GRA }, // 8
{ "ds_c11.rom", 0x100000, 0xa372e79f, 3 | BRF_GRA }, // 9
{ "ds_c00.ic29", 0x100000, 0x2d31d418, 3 | BRF_GRA }, // 6 Background Tiles
{ "ds_c10.ic28", 0x100000, 0x57f7bcd3, 3 | BRF_GRA }, // 7
{ "ds_c01.ic21", 0x100000, 0x9d31a464, 3 | BRF_GRA }, // 8
{ "ds_c11.ic20", 0x100000, 0xa372e79f, 3 | BRF_GRA }, // 9
{ "ds_000.rom", 0x100000, 0x366b3e29, 4 | BRF_GRA }, // 10 Sprites
{ "ds_010.rom", 0x100000, 0x28a4cc40, 4 | BRF_GRA }, // 11
{ "ds_020.rom", 0x100000, 0x5a310f7f, 4 | BRF_GRA }, // 12
{ "ds_030.rom", 0x100000, 0x328b1f45, 4 | BRF_GRA }, // 13
{ "ds_000.ic11", 0x100000, 0x366b3e29, 4 | BRF_GRA }, // 10 Sprites
{ "ds_010.ic12", 0x100000, 0x28a4cc40, 4 | BRF_GRA }, // 11
{ "ds_020.ic13", 0x100000, 0x5a310f7f, 4 | BRF_GRA }, // 12
{ "ds_030.ic14", 0x100000, 0x328b1f45, 4 | BRF_GRA }, // 13
{ "ds_da0.rom", 0x100000, 0x67fc52fd, 5 | BRF_SND }, // 14 Irem GA20 Samples
{ "ds_da0.ic24", 0x100000, 0x67fc52fd, 5 | BRF_SND }, // 14 Irem GA20 Samples
};
STD_ROM_PICK(dsoccr94)

View File

@ -645,11 +645,11 @@ static INT32 DrvScan(INT32 nAction,INT32 *pnMin)
}
// Super Locomotive
// Super Locomotive (Rev.A)
static struct BurnRomInfo suprlocoRomDesc[] = {
{ "ic37.bin", 0x4000, 0x57f514dd, 1 | BRF_PRG | BRF_ESS }, // 0 Z80 #0 Code
{ "ic15.bin", 0x4000, 0x5a1d2fb0, 1 | BRF_PRG | BRF_ESS }, // 1
{ "epr-5226a.37", 0x4000, 0x33b02368, 1 | BRF_PRG | BRF_ESS }, // 0 Z80 #0 Code
{ "epr-5227a.15", 0x4000, 0xa5e67f50, 1 | BRF_PRG | BRF_ESS }, // 1
{ "epr-5228.28", 0x4000, 0xa597828a, 1 | BRF_PRG | BRF_ESS }, // 2
{ "epr-5222.64", 0x2000, 0x0aa57207, 2 | BRF_PRG | BRF_ESS }, // 3 Z80 #1 Code
@ -672,7 +672,7 @@ STD_ROM_FN(suprloco)
struct BurnDriver BurnDrvSuprloco = {
"suprloco", NULL, NULL, NULL, "1982",
"Super Locomotive\0", NULL, "Sega", "Miscellaneous",
"Super Locomotive (Rev.A)\0", NULL, "Sega", "Miscellaneous",
NULL, NULL, NULL, NULL,
BDF_GAME_WORKING, 2, HARDWARE_SEGA_MISC, GBF_MISC, 0,
NULL, suprlocoRomInfo, suprlocoRomName, NULL, NULL, SuprlocoInputInfo, SuprlocoDIPInfo,
@ -681,11 +681,11 @@ struct BurnDriver BurnDrvSuprloco = {
};
// Super Locomotive (Rev.A)
// Super Locomotive
static struct BurnRomInfo suprlocoaRomDesc[] = {
{ "epr-5226a.37", 0x4000, 0x33b02368, 1 | BRF_PRG | BRF_ESS }, // 0 Z80 #0 Code
{ "epr-5227a.15", 0x4000, 0xa5e67f50, 1 | BRF_PRG | BRF_ESS }, // 1
static struct BurnRomInfo suprlocooRomDesc[] = {
{ "epr-5226.37", 0x4000, 0x57f514dd, 1 | BRF_PRG | BRF_ESS }, // 0 Z80 #0 Code
{ "epr-5227.15", 0x4000, 0x5a1d2fb0, 1 | BRF_PRG | BRF_ESS }, // 1
{ "epr-5228.28", 0x4000, 0xa597828a, 1 | BRF_PRG | BRF_ESS }, // 2
{ "epr-5222.64", 0x2000, 0x0aa57207, 2 | BRF_PRG | BRF_ESS }, // 3 Z80 #1 Code
@ -703,15 +703,15 @@ static struct BurnRomInfo suprlocoaRomDesc[] = {
{ "pr-5221.7", 0x0020, 0x89ba674f, 0 | BRF_OPT }, // 11 Unknown
};
STD_ROM_PICK(suprlocoa)
STD_ROM_FN(suprlocoa)
STD_ROM_PICK(suprlocoo)
STD_ROM_FN(suprlocoo)
struct BurnDriver BurnDrvSuprlocoa = {
"suprlocoa", "suprloco", NULL, NULL, "1982",
"Super Locomotive (Rev.A)\0", NULL, "Sega", "Miscellaneous",
struct BurnDriver BurnDrvSuprlocoo = {
"suprlocoo", "suprloco", NULL, NULL, "1982",
"Super Locomotive\0", NULL, "Sega", "Miscellaneous",
NULL, NULL, NULL, NULL,
BDF_GAME_WORKING | BDF_CLONE, 2, HARDWARE_SEGA_MISC, GBF_MISC, 0,
NULL, suprlocoaRomInfo, suprlocoaRomName, NULL, NULL, SuprlocoInputInfo, SuprlocoDIPInfo,
NULL, suprlocooRomInfo, suprlocooRomName, NULL, NULL, SuprlocoInputInfo, SuprlocoDIPInfo,
DrvInit, DrvExit, DrvFrame, DrvDraw, DrvScan, &DrvRecalc, 0x300,
240, 224, 4, 3
};