Sync with MAME 0.148u1

This commit is contained in:
Barry Harris 2013-02-11 10:32:38 +00:00
parent 7e9c4df308
commit a29e96885e
7 changed files with 53 additions and 37 deletions

View File

@ -5591,8 +5591,8 @@ static struct BurnRomInfo GanbareRomDesc[] = {
A_BOARD_PLDS A_BOARD_PLDS
{ "gbpr2.1a", 0x000117, 0x00000000, BRF_OPT | BRF_NODUMP }, // b-board PLDs { "gbpr2.1a", 0x000117, 0x00000000, BRF_OPT | BRF_NODUMP }, // b-board PLDs
{ "iob1.12d", 0x000117, 0x3abc0700, BRF_OPT | BRF_NODUMP }, { "iob1.12d", 0x000117, 0x3abc0700, BRF_OPT },
{ "bprg1.11d", 0x000117, 0x31793da7, BRF_OPT | BRF_NODUMP }, { "bprg1.11d", 0x000117, 0x31793da7, BRF_OPT },
{ "ioc1.ic7", 0x000117, 0x0d182081, BRF_OPT }, // c-board PLDs { "ioc1.ic7", 0x000117, 0x0d182081, BRF_OPT }, // c-board PLDs
{ "c632.ic1", 0x000117, 0x0fbd9270, BRF_OPT }, { "c632.ic1", 0x000117, 0x0fbd9270, BRF_OPT },
@ -6891,7 +6891,7 @@ static struct BurnRomInfo Pang3RomDesc[] = {
{ "cp1b1f.1f", 0x000117, 0x3979b8e3, BRF_OPT }, // b-board PLDs { "cp1b1f.1f", 0x000117, 0x3979b8e3, BRF_OPT }, // b-board PLDs
{ "cp1b8k.8k", 0x000117, 0x8a52ea7a, BRF_OPT }, { "cp1b8k.8k", 0x000117, 0x8a52ea7a, BRF_OPT },
{ "cp1b9ka.9k", 0x000117, 0x13ce9ac1, BRF_OPT }, { "cp1b9ka.9k", 0x000117, 0x00000000, BRF_OPT | BRF_NODUMP },
{ "ioc1.ic7", 0x000117, 0x0d182081, BRF_OPT }, // c-board PLDs { "ioc1.ic7", 0x000117, 0x0d182081, BRF_OPT }, // c-board PLDs
{ "c632.ic1", 0x000117, 0x0fbd9270, BRF_OPT }, { "c632.ic1", 0x000117, 0x0fbd9270, BRF_OPT },
}; };
@ -8818,27 +8818,35 @@ STD_ROM_PICK(Sf2v0043)
STD_ROM_FN(Sf2v0043) STD_ROM_FN(Sf2v0043)
static struct BurnRomInfo Sf2dongbRomDesc[] = { static struct BurnRomInfo Sf2dongbRomDesc[] = {
{ "3.8f", 0x0080000, 0x19fffa37, BRF_ESS | BRF_PRG | CPS1_68K_PROGRAM_NO_BYTESWAP }, { "1.8f", 0x0080000, 0x19fffa37, BRF_ESS | BRF_PRG | CPS1_68K_PROGRAM_NO_BYTESWAP },
{ "2.7f", 0x0080000, 0x99f1cca4, BRF_ESS | BRF_PRG | CPS1_68K_PROGRAM_NO_BYTESWAP }, { "1.7f", 0x0080000, 0x99f1cca4, BRF_ESS | BRF_PRG | CPS1_68K_PROGRAM_NO_BYTESWAP },
{ "1.6f", 0x0080000, 0x65c2c719, BRF_ESS | BRF_PRG | CPS1_68K_PROGRAM_NO_BYTESWAP }, { "1.6f", 0x0080000, 0x65c2c719, BRF_ESS | BRF_PRG | CPS1_68K_PROGRAM_NO_BYTESWAP },
{ "s92_01.bin", 0x0080000, 0x03b0d852, BRF_GRA | CPS1_TILES }, { "s92-1m.3a", 0x080000, 0x03b0d852, BRF_GRA | CPS1_TILES },
{ "s92_02.bin", 0x0080000, 0x840289ec, BRF_GRA | CPS1_TILES }, { "s92-3m.5a", 0x080000, 0x840289ec, BRF_GRA | CPS1_TILES },
{ "s92_03.bin", 0x0080000, 0xcdb5f027, BRF_GRA | CPS1_TILES }, { "s92-2m.4a", 0x080000, 0xcdb5f027, BRF_GRA | CPS1_TILES },
{ "s92_04.bin", 0x0080000, 0xe2799472, BRF_GRA | CPS1_TILES }, { "s92-4m.6a", 0x080000, 0xe2799472, BRF_GRA | CPS1_TILES },
{ "s92_05.bin", 0x0080000, 0xba8a2761, BRF_GRA | CPS1_TILES }, { "s92-5m.7a", 0x080000, 0xba8a2761, BRF_GRA | CPS1_TILES },
{ "s92_06.bin", 0x0080000, 0xe584bfb5, BRF_GRA | CPS1_TILES }, { "s92-7m.9a", 0x080000, 0xe584bfb5, BRF_GRA | CPS1_TILES },
{ "s92_07.bin", 0x0080000, 0x21e3f87d, BRF_GRA | CPS1_TILES }, { "s92-6m.8a", 0x080000, 0x21e3f87d, BRF_GRA | CPS1_TILES },
{ "s92_08.bin", 0x0080000, 0xbefc47df, BRF_GRA | CPS1_TILES }, { "s92-8m.10a", 0x080000, 0xbefc47df, BRF_GRA | CPS1_TILES },
{ "s92_10.bin", 0x0080000, 0x960687d5, BRF_GRA | CPS1_TILES }, { "s92-10m.3c", 0x080000, 0x960687d5, BRF_GRA | CPS1_TILES },
{ "s92_11.bin", 0x0080000, 0x978ecd18, BRF_GRA | CPS1_TILES }, { "s92-12m.5c", 0x080000, 0x978ecd18, BRF_GRA | CPS1_TILES },
{ "s92_12.bin", 0x0080000, 0xd6ec9a0a, BRF_GRA | CPS1_TILES }, { "s92-11m.4c", 0x080000, 0xd6ec9a0a, BRF_GRA | CPS1_TILES },
{ "s92_13.bin", 0x0080000, 0xed2c67f6, BRF_GRA | CPS1_TILES }, { "s92-13m.6c", 0x080000, 0xed2c67f6, BRF_GRA | CPS1_TILES },
{ "s92_09.bin", 0x0010000, 0x08f6b60e, BRF_PRG | CPS1_Z80_PROGRAM }, { "s92_09.11a", 0x010000, 0x08f6b60e, BRF_PRG | CPS1_Z80_PROGRAM },
{ "s92_18.bin", 0x0020000, 0x7f162009, BRF_SND | CPS1_OKIM6295_SAMPLES }, { "s92_18.11c", 0x020000, 0x7f162009, BRF_SND | CPS1_OKIM6295_SAMPLES },
{ "s92_19.bin", 0x0020000, 0xbeade53f, BRF_SND | CPS1_OKIM6295_SAMPLES }, { "s92_19.12c", 0x020000, 0xbeade53f, BRF_SND | CPS1_OKIM6295_SAMPLES },
A_BOARD_PLDS
{ "s9263b.1a", 0x000117, 0x00000000, BRF_OPT | BRF_NODUMP }, // b-board PLDs
{ "iob1.12d", 0x000117, 0x3abc0700, BRF_OPT },
{ "bprg1.11d", 0x000117, 0x31793da7, BRF_OPT },
{ "ioc1.ic7", 0x000117, 0x0d182081, BRF_OPT }, // c-board PLDs
{ "c632.ic1", 0x000117, 0x0fbd9270, BRF_OPT },
}; };
STD_ROM_PICK(Sf2dongb) STD_ROM_PICK(Sf2dongb)

View File

@ -755,7 +755,7 @@ struct BurnDriver BurnDrvXmen = {
static struct BurnRomInfo xmenaRomDesc[] = { static struct BurnRomInfo xmenaRomDesc[] = {
{ "065-aea04.10d", 0x020000, 0x0e8d2e98, 1 | BRF_PRG | BRF_ESS }, // 0 68k Code { "065-aea04.10d", 0x020000, 0x0e8d2e98, 1 | BRF_PRG | BRF_ESS }, // 0 68k Code
{ "065-aea04.10f", 0x020000, 0x0b742a4e, 1 | BRF_PRG | BRF_ESS }, // 1 { "065-aea05.10f", 0x020000, 0x0b742a4e, 1 | BRF_PRG | BRF_ESS }, // 1
{ "065-a02.9d", 0x040000, 0xb31dc44c, 1 | BRF_PRG | BRF_ESS }, // 2 { "065-a02.9d", 0x040000, 0xb31dc44c, 1 | BRF_PRG | BRF_ESS }, // 2
{ "065-a03.9f", 0x040000, 0x13842fe6, 1 | BRF_PRG | BRF_ESS }, // 3 { "065-a03.9f", 0x040000, 0x13842fe6, 1 | BRF_PRG | BRF_ESS }, // 3
@ -791,8 +791,8 @@ struct BurnDriver BurnDrvXmena = {
// X-Men (4 Players ver ADA) // X-Men (4 Players ver ADA)
static struct BurnRomInfo xmenaaRomDesc[] = { static struct BurnRomInfo xmenaaRomDesc[] = {
{ "065-ada.10d", 0x020000, 0xb8276624, 1 | BRF_PRG | BRF_ESS }, // 0 68k Code { "065-ada04.10d", 0x020000, 0xb8276624, 1 | BRF_PRG | BRF_ESS }, // 0 68k Code
{ "065-ada.10f", 0x020000, 0xc68582ad, 1 | BRF_PRG | BRF_ESS }, // 1 { "065-ada05.10f", 0x020000, 0xc68582ad, 1 | BRF_PRG | BRF_ESS }, // 1
{ "065-a02.9d", 0x040000, 0xb31dc44c, 1 | BRF_PRG | BRF_ESS }, // 2 { "065-a02.9d", 0x040000, 0xb31dc44c, 1 | BRF_PRG | BRF_ESS }, // 2
{ "065-a03.9f", 0x040000, 0x13842fe6, 1 | BRF_PRG | BRF_ESS }, // 3 { "065-a03.9f", 0x040000, 0x13842fe6, 1 | BRF_PRG | BRF_ESS }, // 3

View File

@ -2468,7 +2468,7 @@ struct BurnDriver BurnDrvDmnfrnt = {
// Demon Front (V103) // Demon Front (V103)
static struct BurnRomInfo dmnfrnt103RomDesc[] = { static struct BurnRomInfo dmnfrntbRomDesc[] = {
{ "v103_16m.u5", 0x200000, 0x2ddafb3d, 1 | BRF_PRG | BRF_ESS }, // 0 68K Code { "v103_16m.u5", 0x200000, 0x2ddafb3d, 1 | BRF_PRG | BRF_ESS }, // 0 68K Code
{ "t04501.u29", 0x800000, 0x900eaaac, 2 | BRF_GRA }, // 1 Tile data { "t04501.u29", 0x800000, 0x900eaaac, 2 | BRF_GRA }, // 1 Tile data
@ -2487,15 +2487,15 @@ static struct BurnRomInfo dmnfrnt103RomDesc[] = {
{ "v103_32m.u26", 0x400000, 0xe78383a3, 8 | BRF_PRG | BRF_ESS }, // 9 External ARM7 Rom { "v103_32m.u26", 0x400000, 0xe78383a3, 8 | BRF_PRG | BRF_ESS }, // 9 External ARM7 Rom
}; };
STDROMPICKEXT(dmnfrnt103, dmnfrnt103, pgm) STDROMPICKEXT(dmnfrntb, dmnfrntb, pgm)
STD_ROM_FN(dmnfrnt103) STD_ROM_FN(dmnfrntb)
struct BurnDriver BurnDrvdmnfrnt103 = { struct BurnDriver BurnDrvdmnfrntb = {
"dmnfrnt103", "dmnfrnt", "pgm", NULL, "2002", "dmnfrntb", "dmnfrnt", "pgm", NULL, "2002",
"Demon Front (V103)\0", NULL, "IGS", "PolyGameMaster", "Demon Front (V103)\0", NULL, "IGS", "PolyGameMaster",
L"Demon Front\0\u9B54\u57DF\u6218\u7EBF\0\u9B54\u57DF\u6230\u7DDA (V103)\0", NULL, NULL, NULL, L"Demon Front\0\u9B54\u57DF\u6218\u7EBF\0\u9B54\u57DF\u6230\u7DDA (V103)\0", NULL, NULL, NULL,
BDF_GAME_WORKING | BDF_CLONE, 4, HARDWARE_IGS_PGM | HARDWARE_IGS_USE_ARM_CPU, GBF_PLATFORM, 0, BDF_GAME_WORKING | BDF_CLONE, 4, HARDWARE_IGS_PGM | HARDWARE_IGS_USE_ARM_CPU, GBF_PLATFORM, 0,
NULL, dmnfrnt103RomInfo, dmnfrnt103RomName, NULL, NULL, pgmInputInfo, kovDIPInfo, NULL, dmnfrntbRomInfo, dmnfrntbRomName, NULL, NULL, pgmInputInfo, kovDIPInfo,
dmnfrntInit, pgmExit, pgmFrame, pgmDraw, pgmScan, &nPgmPalRecalc, 0x900, dmnfrntInit, pgmExit, pgmFrame, pgmDraw, pgmScan, &nPgmPalRecalc, 0x900,
448, 224, 4, 3 448, 224, 4, 3
}; };
@ -2503,7 +2503,7 @@ struct BurnDriver BurnDrvdmnfrnt103 = {
// Demon Front (V102, China) // Demon Front (V102, China)
static struct BurnRomInfo dmnfrnt102RomDesc[] = { static struct BurnRomInfo dmnfrntaRomDesc[] = {
{ "v102_16m.u5", 0x200000, 0x3d4d481a, 1 | BRF_PRG | BRF_ESS }, // 0 68K Code { "v102_16m.u5", 0x200000, 0x3d4d481a, 1 | BRF_PRG | BRF_ESS }, // 0 68K Code
{ "t04501.u29", 0x800000, 0x900eaaac, 2 | BRF_GRA }, // 1 Tile data { "t04501.u29", 0x800000, 0x900eaaac, 2 | BRF_GRA }, // 1 Tile data
@ -2522,15 +2522,15 @@ static struct BurnRomInfo dmnfrnt102RomDesc[] = {
{ "v101_32m.u26", 0x400000, 0x93965281, 8 | BRF_PRG | BRF_ESS }, // 9 External ARM7 Rom { "v101_32m.u26", 0x400000, 0x93965281, 8 | BRF_PRG | BRF_ESS }, // 9 External ARM7 Rom
}; };
STDROMPICKEXT(dmnfrnt102, dmnfrnt102, pgm) STDROMPICKEXT(dmnfrnta, dmnfrnta, pgm)
STD_ROM_FN(dmnfrnt102) STD_ROM_FN(dmnfrnta)
struct BurnDriver BurnDrvdmnfrnt102 = { struct BurnDriver BurnDrvdmnfrnta = {
"dmnfrnt102", "dmnfrnt", "pgm", NULL, "2002", "dmnfrnta", "dmnfrnt", "pgm", NULL, "2002",
"Demon Front (V102, China)\0", NULL, "IGS", "PolyGameMaster", "Demon Front (V102, China)\0", NULL, "IGS", "PolyGameMaster",
L"Demon Front\0\u9B54\u57DF\u6218\u7EBF\0\u9B54\u57DF\u6230\u7DDA (V102, China)\0", NULL, NULL, NULL, L"Demon Front\0\u9B54\u57DF\u6218\u7EBF\0\u9B54\u57DF\u6230\u7DDA (V102, China)\0", NULL, NULL, NULL,
BDF_GAME_WORKING | BDF_CLONE, 4, HARDWARE_IGS_PGM | HARDWARE_IGS_USE_ARM_CPU, GBF_PLATFORM, 0, BDF_GAME_WORKING | BDF_CLONE, 4, HARDWARE_IGS_PGM | HARDWARE_IGS_USE_ARM_CPU, GBF_PLATFORM, 0,
NULL, dmnfrnt102RomInfo, dmnfrnt102RomName, NULL, NULL, pgmInputInfo, kovDIPInfo, NULL, dmnfrntaRomInfo, dmnfrntaRomName, NULL, NULL, pgmInputInfo, kovDIPInfo,
dmnfrntInit, pgmExit, pgmFrame, pgmDraw, pgmScan, &nPgmPalRecalc, 0x900, dmnfrntInit, pgmExit, pgmFrame, pgmDraw, pgmScan, &nPgmPalRecalc, 0x900,
448, 224, 4, 3 448, 224, 4, 3
}; };
@ -2798,10 +2798,10 @@ STDROMPICKEXT(kovytzy, kovytzy, pgm)
STD_ROM_FN(kovytzy) STD_ROM_FN(kovytzy)
struct BurnDriver BurnDrvkovytzy = { struct BurnDriver BurnDrvkovytzy = {
"kovytzy", "kovshp", "pgm", NULL, "1999", "kovytzy", NULL, "pgm", NULL, "1999",
"Knights of Valour: Yi Tong Zhong Yuan / Sangoku Senki: Yi Tong Zhong Yuan (ver. 201, China)\0", "Imperfect Protection Emulation", "IGS", "PolyGameMaster", "Knights of Valour: Yi Tong Zhong Yuan / Sangoku Senki: Yi Tong Zhong Yuan (ver. 201, China)\0", "Imperfect Protection Emulation", "IGS", "PolyGameMaster",
L"Knights of Valour: Yi Tong Zhong Yuan\0\u4E09\u56FD\u6218\u7EAA\0\u4E00\u7EDF\u4E2D\u539F (ver. 201, China)\0", NULL, NULL, NULL, L"Knights of Valour: Yi Tong Zhong Yuan\0\u4E09\u56FD\u6218\u7EAA\0\u4E00\u7EDF\u4E2D\u539F (ver. 201, China)\0", NULL, NULL, NULL,
BDF_GAME_WORKING | BDF_CLONE, 4, HARDWARE_IGS_PGM | HARDWARE_IGS_USE_ARM_CPU, GBF_SCRFIGHT, 0, BDF_GAME_WORKING, 4, HARDWARE_IGS_PGM | HARDWARE_IGS_USE_ARM_CPU, GBF_SCRFIGHT, 0,
NULL, kovytzyRomInfo, kovytzyRomName, NULL, NULL, pgmInputInfo, kovshxasDIPInfo, NULL, kovytzyRomInfo, kovytzyRomName, NULL, NULL, pgmInputInfo, kovshxasDIPInfo,
kovshpInit, pgmExit, pgmFrame, pgmDraw, pgmScan, &nPgmPalRecalc, 0x900, kovshpInit, pgmExit, pgmFrame, pgmDraw, pgmScan, &nPgmPalRecalc, 0x900,
448, 224, 4, 3 448, 224, 4, 3

View File

@ -732,6 +732,7 @@ static INT32 DrvFrame()
static struct BurnSampleInfo ghoxSampleDesc[] = { static struct BurnSampleInfo ghoxSampleDesc[] = {
#ifdef TOAPLAN_SOUND_SAMPLES_HACK #ifdef TOAPLAN_SOUND_SAMPLES_HACK
#if !defined ROM_VERIFY
{ "d0.wav", SAMPLE_NOLOOP }, { "d0.wav", SAMPLE_NOLOOP },
{ "01.wav", SAMPLE_NOLOOP }, { "01.wav", SAMPLE_NOLOOP },
{ "02.wav", SAMPLE_NOLOOP }, { "02.wav", SAMPLE_NOLOOP },
@ -812,6 +813,7 @@ static struct BurnSampleInfo ghoxSampleDesc[] = {
{ "4d.wav", SAMPLE_NOLOOP }, { "4d.wav", SAMPLE_NOLOOP },
{ "4e.wav", SAMPLE_NOLOOP }, { "4e.wav", SAMPLE_NOLOOP },
{ "d1.wav", SAMPLE_NOLOOP }, { "d1.wav", SAMPLE_NOLOOP },
#endif
#endif #endif
{ "", 0 } { "", 0 }
}; };

View File

@ -925,6 +925,7 @@ static INT32 DrvScan(INT32 nAction, INT32* pnMin)
static struct BurnSampleInfo samesameSampleDesc[] = { static struct BurnSampleInfo samesameSampleDesc[] = {
#ifdef TOAPLAN_SOUND_SAMPLES_HACK #ifdef TOAPLAN_SOUND_SAMPLES_HACK
#if !defined ROM_VERIFY
{ "dm.wav", SAMPLE_NOLOOP }, { "dm.wav", SAMPLE_NOLOOP },
{ "01.wav", SAMPLE_NOLOOP }, { "01.wav", SAMPLE_NOLOOP },
{ "02.wav", SAMPLE_NOLOOP }, { "02.wav", SAMPLE_NOLOOP },
@ -966,6 +967,7 @@ static struct BurnSampleInfo samesameSampleDesc[] = {
{ "26.wav", SAMPLE_NOLOOP }, { "26.wav", SAMPLE_NOLOOP },
{ "27.wav", SAMPLE_NOLOOP }, { "27.wav", SAMPLE_NOLOOP },
{ "28.wav", SAMPLE_NOLOOP }, { "28.wav", SAMPLE_NOLOOP },
#endif
#endif #endif
{ "", 0 } { "", 0 }
}; };

View File

@ -719,6 +719,7 @@ static INT32 DrvFrame()
static struct BurnSampleInfo tekipakiSampleDesc[] = { static struct BurnSampleInfo tekipakiSampleDesc[] = {
#ifdef TOAPLAN_SOUND_SAMPLES_HACK #ifdef TOAPLAN_SOUND_SAMPLES_HACK
#if !defined ROM_VERIFY
{ "dm.wav", SAMPLE_NOLOOP }, { "dm.wav", SAMPLE_NOLOOP },
{ "01.wav", SAMPLE_NOLOOP }, { "01.wav", SAMPLE_NOLOOP },
{ "02.wav", SAMPLE_NOLOOP }, { "02.wav", SAMPLE_NOLOOP },
@ -741,6 +742,7 @@ static struct BurnSampleInfo tekipakiSampleDesc[] = {
{ "13.wav", SAMPLE_NOLOOP }, { "13.wav", SAMPLE_NOLOOP },
{ "14.wav", SAMPLE_NOLOOP }, { "14.wav", SAMPLE_NOLOOP },
{ "15.wav", SAMPLE_NOLOOP }, { "15.wav", SAMPLE_NOLOOP },
#endif
#endif #endif
{ "", 0 } { "", 0 }
}; };

View File

@ -861,6 +861,7 @@ static INT32 DrvScan(INT32 nAction, INT32* pnMin)
static struct BurnSampleInfo vimanaSampleDesc[] = { static struct BurnSampleInfo vimanaSampleDesc[] = {
#ifdef TOAPLAN_SOUND_SAMPLES_HACK #ifdef TOAPLAN_SOUND_SAMPLES_HACK
#if !defined ROM_VERIFY
{ "00.wav", SAMPLE_NOLOOP }, { "00.wav", SAMPLE_NOLOOP },
{ "01.wav", SAMPLE_NOLOOP }, { "01.wav", SAMPLE_NOLOOP },
{ "02.wav", SAMPLE_NOLOOP }, { "02.wav", SAMPLE_NOLOOP },
@ -896,6 +897,7 @@ static struct BurnSampleInfo vimanaSampleDesc[] = {
{ "20.wav", SAMPLE_NOLOOP }, { "20.wav", SAMPLE_NOLOOP },
{ "dm.wav", SAMPLE_NOLOOP }, { "dm.wav", SAMPLE_NOLOOP },
{ "22.wav", SAMPLE_NOLOOP }, { "22.wav", SAMPLE_NOLOOP },
#endif
#endif #endif
{ "", 0 } { "", 0 }
}; };