d_nmg5.cpp : added Multi 5 / New Multi Game 5 (set 2) [system11]

d_galpanic.cpp : synch with MAME (pgalvipa & fantasiab) [system11]
This commit is contained in:
jackchatelet 2014-01-25 13:58:58 +00:00
parent 7d7df26c7e
commit a33f87d498
2 changed files with 65 additions and 25 deletions

View File

@ -431,9 +431,9 @@ STD_ROM_PICK(Fantasiaa)
STD_ROM_FN(Fantasiaa) STD_ROM_FN(Fantasiaa)
// Rom information // Rom information
static struct BurnRomInfo Fantasia1RomDesc[] = { static struct BurnRomInfo FantasiabRomDesc[] = {
{ "prog2.16", 0x080000, 0xc5d93077, BRF_ESS | BRF_PRG }, // 68000 code { "fantasia_16", 0x080000, 0xc5d93077, BRF_ESS | BRF_PRG }, // 68000 code
{ "prog1.13", 0x080000, 0xd88529bd, BRF_ESS | BRF_PRG }, { "fantasia_13", 0x080000, 0xd88529bd, BRF_ESS | BRF_PRG },
{ "9.bg7", 0x080000, 0x2a588393, BRF_ESS | BRF_PRG }, { "9.bg7", 0x080000, 0x2a588393, BRF_ESS | BRF_PRG },
{ "5.bg3", 0x080000, 0x6160e0f0, BRF_ESS | BRF_PRG }, { "5.bg3", 0x080000, 0x6160e0f0, BRF_ESS | BRF_PRG },
{ "8.bg6", 0x080000, 0xf776b743, BRF_ESS | BRF_PRG }, { "8.bg6", 0x080000, 0xf776b743, BRF_ESS | BRF_PRG },
@ -454,8 +454,8 @@ static struct BurnRomInfo Fantasia1RomDesc[] = {
{ "11.obj2", 0x080000, 0x6d00a4c5, BRF_OPT }, { "11.obj2", 0x080000, 0x6d00a4c5, BRF_OPT },
}; };
STD_ROM_PICK(Fantasia1) STD_ROM_PICK(Fantasiab)
STD_ROM_FN(Fantasia1) STD_ROM_FN(Fantasiab)
// Rom information // Rom information
static struct BurnRomInfo SupmodelRomDesc[] = { static struct BurnRomInfo SupmodelRomDesc[] = {
@ -470,7 +470,7 @@ static struct BurnRomInfo SupmodelRomDesc[] = {
{ "i-scr8.11", 0x080000, 0x7c1813c8, BRF_ESS | BRF_PRG }, { "i-scr8.11", 0x080000, 0x7c1813c8, BRF_ESS | BRF_PRG },
{ "i-scr7.6", 0x080000, 0x19c73268, BRF_ESS | BRF_PRG }, { "i-scr7.6", 0x080000, 0x19c73268, BRF_ESS | BRF_PRG },
{ "obj1.13", 0x080000, 0x832cd451, BRF_GRA }, // graphics { "(__1994)obj1.13", 0x080000, 0x832cd451, BRF_GRA }, // graphics
{ "music1.1", 0x080000, 0x2b1f6655, BRF_SND }, // PCM { "music1.1", 0x080000, 0x2b1f6655, BRF_SND }, // PCM
{ "music2.2", 0x080000, 0xcccae65a, BRF_SND }, { "music2.2", 0x080000, 0xcccae65a, BRF_SND },
@ -492,7 +492,7 @@ static struct BurnRomInfo NewfantRomDesc[] = {
{ "iscr8.11", 0x080000, 0xf4148528, BRF_ESS | BRF_PRG }, { "iscr8.11", 0x080000, 0xf4148528, BRF_ESS | BRF_PRG },
{ "iscr7.06", 0x080000, 0x2dee0c31, BRF_ESS | BRF_PRG }, { "iscr7.06", 0x080000, 0x2dee0c31, BRF_ESS | BRF_PRG },
{ "nf95obj1.13", 0x080000, 0xe6d1bc71, BRF_GRA }, // graphics { "(__1995)nf95obj1.13", 0x080000, 0xe6d1bc71, BRF_GRA }, // graphics
{ "musc1.01", 0x080000, 0x10347fce, BRF_SND }, // PCM { "musc1.01", 0x080000, 0x10347fce, BRF_SND }, // PCM
{ "musc2.02", 0x080000, 0xb9646a8c, BRF_SND }, { "musc2.02", 0x080000, 0xb9646a8c, BRF_SND },
@ -514,7 +514,7 @@ static struct BurnRomInfo NewfantaRomDesc[] = {
{ "iscr8.11", 0x080000, 0xf4148528, BRF_ESS | BRF_PRG }, { "iscr8.11", 0x080000, 0xf4148528, BRF_ESS | BRF_PRG },
{ "iscr7.06", 0x080000, 0x2dee0c31, BRF_ESS | BRF_PRG }, { "iscr7.06", 0x080000, 0x2dee0c31, BRF_ESS | BRF_PRG },
{ "obj1.13", 0x080000, 0x832cd451, BRF_GRA }, // graphics { "(__1994)obj1.13", 0x080000, 0x832cd451, BRF_GRA }, // graphics
{ "musc1.01", 0x080000, 0x10347fce, BRF_SND }, // PCM { "musc1.01", 0x080000, 0x10347fce, BRF_SND }, // PCM
{ "musc2.02", 0x080000, 0xb9646a8c, BRF_SND }, { "musc2.02", 0x080000, 0xb9646a8c, BRF_SND },
@ -536,7 +536,7 @@ static struct BurnRomInfo Fantsy95RomDesc[] = {
{ "i-scr8.11", 0x080000, 0x33db8177, BRF_ESS | BRF_PRG }, { "i-scr8.11", 0x080000, 0x33db8177, BRF_ESS | BRF_PRG },
{ "i-scr7.6", 0x080000, 0x8662dd01, BRF_ESS | BRF_PRG }, { "i-scr7.6", 0x080000, 0x8662dd01, BRF_ESS | BRF_PRG },
{ "obj1.13", 0x080000, 0x832cd451, BRF_GRA }, // graphics { "(__1994)obj1.13", 0x080000, 0x832cd451, BRF_GRA }, // graphics
{ "music1.1", 0x080000, 0x3117e2ef, BRF_SND }, // PCM { "music1.1", 0x080000, 0x3117e2ef, BRF_SND }, // PCM
{ "music2.2", 0x080000, 0x0c1109f9, BRF_SND }, { "music2.2", 0x080000, 0x0c1109f9, BRF_SND },
@ -682,7 +682,7 @@ STD_ROM_FN(Pgalvip)
// Rom information // Rom information
static struct BurnRomInfo PgalvipaRomDesc[] = { static struct BurnRomInfo PgalvipaRomDesc[] = {
{ "pgalvip_3.ue17", 0x80000, 0xa48e8255, BRF_ESS | BRF_PRG }, // 68000 code { "pgalvip_3.ue17", 0x80000, 0xa48e8255, BRF_ESS | BRF_PRG }, // 68000 code
{ "pgalvip_4.ud17", 0x80000, 0x829a2085, BRF_ESS | BRF_PRG }, { "pgalvip_4.ud17", 0x80000, 0x829a2085, BRF_ESS | BRF_PRG },
{ "pgalvip_5.u5", 0x80000, 0xa8a50745, BRF_GRA }, // graphics { "pgalvip_5.u5", 0x80000, 0xa8a50745, BRF_GRA }, // graphics
@ -2035,7 +2035,7 @@ struct BurnDriver BurnDrvGalpanic = {
struct BurnDriver BurnDrvFantasia = { struct BurnDriver BurnDrvFantasia = {
"fantasia", NULL, NULL, NULL, "1994", "fantasia", NULL, NULL, NULL, "1994",
"Fantasia (940429 PCB)\0", NULL, "Comad / New Japan System", "Miscellaneous", "Fantasia (940429 PCB, set 1)\0", NULL, "Comad / New Japan System", "Miscellaneous",
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
BDF_GAME_WORKING | BDF_ORIENTATION_VERTICAL | BDF_16BIT_ONLY, 2, HARDWARE_MISC_POST90S, GBF_PUZZLE, 0, BDF_GAME_WORKING | BDF_ORIENTATION_VERTICAL | BDF_16BIT_ONLY, 2, HARDWARE_MISC_POST90S, GBF_PUZZLE, 0,
NULL, FantasiaRomInfo, FantasiaRomName, NULL, NULL, GalpanicInputInfo, FantasiaDIPInfo, NULL, FantasiaRomInfo, FantasiaRomName, NULL, NULL, GalpanicInputInfo, FantasiaDIPInfo,
@ -2053,12 +2053,12 @@ struct BurnDriver BurnDrvFantasiaa = {
224, 256, 3, 4 224, 256, 3, 4
}; };
struct BurnDriver BurnDrvFantasia1 = { struct BurnDriver BurnDrvFantasiab = {
"fantasia1", "fantasia", NULL, NULL, "1994", "fantasiab", "fantasia", NULL, NULL, "1994",
"Fantasia (Newer revision)\0", NULL, "Comad / New Japan System", "Miscellaneous", "Fantasia (940429 PCB, set 2)\0", NULL, "Comad / New Japan System", "Miscellaneous",
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
BDF_GAME_WORKING | BDF_CLONE | BDF_ORIENTATION_VERTICAL | BDF_16BIT_ONLY, 2, HARDWARE_MISC_POST90S, GBF_PUZZLE, 0, BDF_GAME_WORKING | BDF_CLONE | BDF_ORIENTATION_VERTICAL | BDF_16BIT_ONLY, 2, HARDWARE_MISC_POST90S, GBF_PUZZLE, 0,
NULL, Fantasia1RomInfo, Fantasia1RomName, NULL, NULL, GalpanicInputInfo, FantasiaDIPInfo, NULL, FantasiabRomInfo, FantasiabRomName, NULL, NULL, GalpanicInputInfo, FantasiaDIPInfo,
FantasiaInit, GalpanicExit, ComadFrame, ComadDraw, GalpanicScan, &RecalcBgPalette, 0x400, FantasiaInit, GalpanicExit, ComadFrame, ComadDraw, GalpanicScan, &RecalcBgPalette, 0x400,
224, 256, 3, 4 224, 256, 3, 4
}; };
@ -2075,7 +2075,7 @@ struct BurnDriver BurnDrvSupmodel = {
struct BurnDriver BurnDrvNewfant = { struct BurnDriver BurnDrvNewfant = {
"newfant", NULL, NULL, NULL, "1995", "newfant", NULL, NULL, NULL, "1995",
"New Fantasia\0", NULL, "Comad / New Japan System", "Miscellaneous", "New Fantasia (1995 copyright)\0", NULL, "Comad / New Japan System", "Miscellaneous",
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
BDF_GAME_WORKING | BDF_ORIENTATION_VERTICAL | BDF_16BIT_ONLY, 2, HARDWARE_MISC_POST90S, GBF_PUZZLE, 0, BDF_GAME_WORKING | BDF_ORIENTATION_VERTICAL | BDF_16BIT_ONLY, 2, HARDWARE_MISC_POST90S, GBF_PUZZLE, 0,
NULL, NewfantRomInfo, NewfantRomName, NULL, NULL, GalpanicInputInfo, FantasiaDIPInfo, NULL, NewfantRomInfo, NewfantRomName, NULL, NULL, GalpanicInputInfo, FantasiaDIPInfo,
@ -2085,7 +2085,7 @@ struct BurnDriver BurnDrvNewfant = {
struct BurnDriver BurnDrvNewfanta = { struct BurnDriver BurnDrvNewfanta = {
"newfanta", "newfant", NULL, NULL, "1995", "newfanta", "newfant", NULL, NULL, "1995",
"New Fantasia (set 2)\0", NULL, "Comad / New Japan System", "Miscellaneous", "New Fantasia (1994 copyright)\0", NULL, "Comad / New Japan System", "Miscellaneous",
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
BDF_GAME_WORKING | BDF_CLONE | BDF_ORIENTATION_VERTICAL | BDF_16BIT_ONLY, 2, HARDWARE_MISC_POST90S, GBF_PUZZLE, 0, BDF_GAME_WORKING | BDF_CLONE | BDF_ORIENTATION_VERTICAL | BDF_16BIT_ONLY, 2, HARDWARE_MISC_POST90S, GBF_PUZZLE, 0,
NULL, NewfantaRomInfo, NewfantaRomName, NULL, NULL, GalpanicInputInfo, FantasiaDIPInfo, NULL, NewfantaRomInfo, NewfantaRomName, NULL, NULL, GalpanicInputInfo, FantasiaDIPInfo,
@ -2154,8 +2154,8 @@ struct BurnDriver BurnDrvWownfant = {
}; };
struct BurnDriver BurnDrvPgalvip = { struct BurnDriver BurnDrvPgalvip = {
"pgalvip", NULL, NULL, NULL, "1997", "pgalvip", NULL, NULL, NULL, "1996",
"Pocket Gals V.I.P\0", NULL, "ACE International / Afega", "Miscellaneous", "Pocket Gals V.I.P (set 1)\0", NULL, "ACE International / Afega", "Miscellaneous",
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
BDF_GAME_WORKING | BDF_16BIT_ONLY | BDF_ORIENTATION_FLIPPED, 2, HARDWARE_MISC_POST90S, GBF_SPORTSMISC, 0, BDF_GAME_WORKING | BDF_16BIT_ONLY | BDF_ORIENTATION_FLIPPED, 2, HARDWARE_MISC_POST90S, GBF_SPORTSMISC, 0,
NULL, PgalvipRomInfo, PgalvipRomName, NULL, NULL, GalhustlInputInfo, GalhustlDIPInfo, NULL, PgalvipRomInfo, PgalvipRomName, NULL, NULL, GalhustlInputInfo, GalhustlDIPInfo,
@ -2174,8 +2174,8 @@ struct BurnDriver BurnDrvGalhustl = {
}; };
struct BurnDriver BurnDrvPgalvipa = { struct BurnDriver BurnDrvPgalvipa = {
"pgalvipa", "pgalvip", NULL, NULL, "1997", "pgalvipa", "pgalvip", NULL, NULL, "1996",
"Pocket Gals V.I.P (Newer?)\0", NULL, "ACE International / Afega", "Miscellaneous", "Pocket Gals V.I.P (set 2)\0", NULL, "unknown", "Miscellaneous",
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
BDF_GAME_WORKING | BDF_CLONE | BDF_16BIT_ONLY | BDF_ORIENTATION_FLIPPED, 2, HARDWARE_MISC_POST90S, GBF_SPORTSMISC, 0, BDF_GAME_WORKING | BDF_CLONE | BDF_16BIT_ONLY | BDF_ORIENTATION_FLIPPED, 2, HARDWARE_MISC_POST90S, GBF_SPORTSMISC, 0,
NULL, PgalvipaRomInfo, PgalvipaRomName, NULL, NULL, GalhustlInputInfo, GalhustlDIPInfo, NULL, PgalvipaRomInfo, PgalvipaRomName, NULL, NULL, GalhustlInputInfo, GalhustlDIPInfo,

View File

@ -1362,7 +1362,7 @@ static INT32 DrvScan(INT32 nAction, INT32 *pnMin)
//----------------------------------------------------------------------------------------------- //-----------------------------------------------------------------------------------------------
// Multi 5 / New Multi Game 5 // Multi 5 / New Multi Game 5 (set 1)
static struct BurnRomInfo nmg5RomDesc[] = { static struct BurnRomInfo nmg5RomDesc[] = {
{ "ub15.bin", 0x80000, 0x36af3e2f, 1 | BRF_PRG | BRF_ESS }, // 0 - 68k Code { "ub15.bin", 0x80000, 0x36af3e2f, 1 | BRF_PRG | BRF_ESS }, // 0 - 68k Code
@ -1400,7 +1400,7 @@ static INT32 Nmg5Init()
struct BurnDriver BurnDrvNmg5 = { struct BurnDriver BurnDrvNmg5 = {
"nmg5", NULL, NULL, NULL, "1998", "nmg5", NULL, NULL, NULL, "1998",
"Multi 5 / New Multi Game 5\0", NULL, "Yun Sung", "Miscellaneous", "Multi 5 / New Multi Game 5 (set 1)\0", NULL, "Yun Sung", "Miscellaneous",
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
BDF_GAME_WORKING, 2, HARDWARE_MISC_POST90S, GBF_MINIGAMES, 0, BDF_GAME_WORKING, 2, HARDWARE_MISC_POST90S, GBF_MINIGAMES, 0,
NULL, nmg5RomInfo, nmg5RomName, NULL, NULL, Nmg5InputInfo, Nmg5DIPInfo, NULL, nmg5RomInfo, nmg5RomName, NULL, NULL, Nmg5InputInfo, Nmg5DIPInfo,
@ -1409,7 +1409,47 @@ struct BurnDriver BurnDrvNmg5 = {
}; };
// Multi 5 / New Multi Game 5 (earlier) // Multi 5 / New Multi Game 5 (set 2)
static struct BurnRomInfo nmg5aRomDesc[] = {
{ "m5_p1.ub15", 0x80000, 0x0d63a21d, 1 | BRF_PRG | BRF_ESS }, // 0 - 68k Code
{ "m5_p2.ub16", 0x80000, 0x230438db, 1 | BRF_PRG | BRF_ESS }, // 1
{ "m5_sndcpu.xh15", 0x10000, 0x12d047c4, 2 | BRF_PRG | BRF_ESS }, // 2 - Z80 Code
{ "m5_12.srom1", 0x80000, 0x3adff261, 3 | BRF_GRA }, // 3 - Tiles
{ "m5_8.srom2", 0x80000, 0xb0736b66, 3 | BRF_GRA }, // 4
{ "m5_13.srom3", 0x80000, 0x8e904919, 3 | BRF_GRA }, // 5
{ "m5_9.srom4", 0x80000, 0x779e0e30, 3 | BRF_GRA }, // 6
{ "m5_6.srom5", 0x80000, 0x41061258, 3 | BRF_GRA }, // 7
{ "m5_10.srom6", 0x80000, 0x8147d8ef, 3 | BRF_GRA }, // 8
{ "m5_7.srom7", 0x80000, 0xacb00d15, 3 | BRF_GRA }, // 9
{ "m5_11.srom8", 0x80000, 0x0ba74fce, 3 | BRF_GRA }, // 10
{ "m5_3.uf1", 0x40000, 0x9a9fb6f4, 4 | BRF_GRA }, // 11 - Sprites
{ "m5_5.uf2", 0x40000, 0x66954d63, 4 | BRF_GRA }, // 12
{ "m5_1.ufa1", 0x40000, 0xba73ed2d, 4 | BRF_GRA }, // 13
{ "m5_4.uh1", 0x40000, 0xf7726e8e, 4 | BRF_GRA }, // 14
{ "m5_2.uj1", 0x40000, 0x54f7486e, 4 | BRF_GRA }, // 15
{ "m5_oki.xra1", 0x20000, 0xc74a4f3e, 5 | BRF_SND }, // 16 - Samples
};
STD_ROM_PICK(nmg5a)
STD_ROM_FN(nmg5a)
struct BurnDriver BurnDrvNmg5a = {
"nmg5a", "nmg5", NULL, NULL, "1997",
"Multi 5 / New Multi Game 5 (set 2)\0", NULL, "Yun Sung", "Miscellaneous",
NULL, NULL, NULL, NULL,
BDF_GAME_WORKING | BDF_CLONE, 2, HARDWARE_MISC_POST90S, GBF_MINIGAMES, 0,
NULL, nmg5aRomInfo, nmg5aRomName, NULL, NULL, Nmg5InputInfo, Nmg5DIPInfo,
Nmg5Init, DrvExit, DrvFrame, DrvDraw, DrvScan,
&DrvRecalc, 0x400, 320, 240, 4, 3
};
// Multi 5 / New Multi Game 5 (set 3, earlier)
static struct BurnRomInfo nmg5eRomDesc[] = { static struct BurnRomInfo nmg5eRomDesc[] = {
{ "ub15.rom", 0x80000, 0x578516e2, 1 | BRF_PRG | BRF_ESS }, // 0 - 68k Code { "ub15.rom", 0x80000, 0x578516e2, 1 | BRF_PRG | BRF_ESS }, // 0 - 68k Code
@ -1440,7 +1480,7 @@ STD_ROM_FN(nmg5e)
struct BurnDriver BurnDrvNmg5e = { struct BurnDriver BurnDrvNmg5e = {
"nmg5e", "nmg5", NULL, NULL, "1997", "nmg5e", "nmg5", NULL, NULL, "1997",
"Multi 5 / New Multi Game 5 (earlier)\0", NULL, "Yun Sung", "Miscellaneous", "Multi 5 / New Multi Game 5 (set 3, earlier)\0", NULL, "Yun Sung", "Miscellaneous",
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
BDF_GAME_WORKING | BDF_CLONE, 2, HARDWARE_MISC_POST90S, GBF_MINIGAMES, 0, BDF_GAME_WORKING | BDF_CLONE, 2, HARDWARE_MISC_POST90S, GBF_MINIGAMES, 0,
NULL, nmg5eRomInfo, nmg5eRomName, NULL, NULL, Nmg5InputInfo, Nmg5DIPInfo, NULL, nmg5eRomInfo, nmg5eRomName, NULL, NULL, Nmg5InputInfo, Nmg5DIPInfo,