ShuriZma
/
fbneo
mirror of https://github.com/finalburnneo/FBNeo.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

d_jack.cpp - fix music todo: fix jacks messed up palette

This commit is contained in:
dinkc64 2015-01-15 08:31:54 +00:00
parent e3089d70e5
commit 8151c9de7f
1 changed files with 29 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/burn/drv/pre90s/d_jack.cpp
View File

@ -13,11 +13,11 @@ extern "C" {
static UINT8 *Mem, *Rom0, *Rom1, *Gfx, *Prom, *User; static UINT8 *Mem, *Rom0, *Rom1, *Gfx, *Prom, *User;
static UINT8 DrvJoy1[8], DrvJoy2[8], DrvJoy3[8], DrvJoy4[8], DrvReset, DrvDips[2]; static UINT8 DrvJoy1[8], DrvJoy2[8], DrvJoy3[8], DrvJoy4[8], DrvReset, DrvDips[2];
static INT16 *pAY8910Buffer[3], *pFMBuffer = NULL; static INT16 *pAY8910Buffer[3], *pFMBuffer = NULL;
static INT32 tri_fix = 0, joinem = 0, loverb = 0, suprtriv = 0, unclepoo = 0; static INT32 tri_fix = 0, joinem = 0, loverb = 0, suprtriv = 0, unclepoo = 0, zzyzzyxx = 0;
static INT32 timer_rate, flip_screen; static INT32 timer_rate, flip_screen;
static UINT32 *Palette, *DrvPal; static UINT32 *Palette, *DrvPal;
static UINT8 DrvCalcPal; static UINT8 DrvCalcPal;
static UINT8 joinem_palette_bank = 0; static UINT8 joinem_palette_bank = 0, joinem_nmi_enable = 0;
static INT32 joinem_scroll_w[300]; static INT32 joinem_scroll_w[300];
static UINT8 soundlatch; static UINT8 soundlatch;
@ -713,7 +713,7 @@ static UINT8 timer_r(UINT32)
static UINT8 soundlatch_r(UINT32) static UINT8 soundlatch_r(UINT32)
{ {
ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); //ZetSetIRQLine(0, ZET_IRQSTATUS_NONE);
return soundlatch; return soundlatch;
} }
@ -858,6 +858,8 @@ void __fastcall jack_cpu0_write(UINT16 address, UINT8 data)
ZetClose(); ZetClose();
ZetOpen(1); ZetOpen(1);
ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); ZetSetIRQLine(0, ZET_IRQSTATUS_ACK);
ZetRun(100);
ZetSetIRQLine(0, ZET_IRQSTATUS_NONE);
ZetClose(); ZetClose();
ZetOpen(0); ZetOpen(0);
break; break;
@ -870,6 +872,8 @@ void __fastcall jack_cpu0_write(UINT16 address, UINT8 data)
flip_screen = data >> 7; flip_screen = data >> 7;
joinem_snd_bit = data & 1; joinem_snd_bit = data & 1;
joinem_palette_bank = (data & 0x18) << 1; joinem_palette_bank = (data & 0x18) << 1;
joinem_nmi_enable = data & 0x20;
//from MAME: palette_bank = data & (m_palette->entries() - 1) >> 3 & 0x18; //from MAME: palette_bank = data & (m_palette->entries() - 1) >> 3 & 0x18;
//Why do we do it differently? :/ - dink //Why do we do it differently? :/ - dink
//bprintf(0, _T("pbank[%X] data[%X],"), joinem_palette_bank, data); //bprintf(0, _T("pbank[%X] data[%X],"), joinem_palette_bank, data);
@ -928,6 +932,9 @@ static INT32 DrvDoReset()
question_address = question_rom = 0; question_address = question_rom = 0;
joinem_snd_bit = 0; joinem_snd_bit = 0;
joinem_nmi_enable = 0;
joinem_palette_bank = 0;
memset(&joinem_scroll_w, 0, sizeof(joinem_scroll_w));
soundlatch = 0; soundlatch = 0;
for (INT32 i = 0; i < 2; i++) { for (INT32 i = 0; i < 2; i++) {
@ -1114,7 +1121,7 @@ static INT32 DrvInit()
AY8910Init(0, 1500000, nBurnSoundRate, &soundlatch_r, &timer_r, NULL, NULL); AY8910Init(0, 1500000, nBurnSoundRate, &soundlatch_r, &timer_r, NULL, NULL);
AY8910SetAllRoutes(0, 1.00, BURN_SND_ROUTE_BOTH); AY8910SetAllRoutes(0, 1.00, BURN_SND_ROUTE_BOTH);
if (loverb || joinem) { if (loverb || joinem || zzyzzyxx) {
AY8910SetAllRoutes(0, 0.20, BURN_SND_ROUTE_BOTH); AY8910SetAllRoutes(0, 0.20, BURN_SND_ROUTE_BOTH);
} }
@ -1144,6 +1151,8 @@ static INT32 DrvExit()
loverb = 0; loverb = 0;
suprtriv = 0; suprtriv = 0;
unclepoo = 0; unclepoo = 0;
zzyzzyxx = 0;
memset(joinem_scroll_w, 0, sizeof(joinem_scroll_w)); memset(joinem_scroll_w, 0, sizeof(joinem_scroll_w));
return 0; return 0;
@ -1152,7 +1161,7 @@ static INT32 DrvExit()
static INT32 DrvDraw() static INT32 DrvDraw()
{ {
if (1) //DrvCalcPal) if (DrvCalcPal)
{ {
for (INT32 i = 0; i < 0x100; i++) { for (INT32 i = 0; i < 0x100; i++) {
UINT32 col = Palette[i]; UINT32 col = Palette[i];
@ -1252,7 +1261,7 @@ static INT32 DrvFrame()
INT32 nSoundBufferPos = 0; INT32 nSoundBufferPos = 0;
nCyclesTotal[0] = 3000000 / 60; nCyclesTotal[0] = 3000000 / 60;
nCyclesTotal[1] = 1500000 / 60; nCyclesTotal[1] = 3000000 / 60;
nCyclesDone[0] = nCyclesDone[1] = 0; nCyclesDone[0] = nCyclesDone[1] = 0;
ZetNewFrame(); ZetNewFrame();
@ -1267,16 +1276,18 @@ static INT32 DrvFrame()
nCyclesSegment = nNext - nCyclesDone[nCurrentCPU]; nCyclesSegment = nNext - nCyclesDone[nCurrentCPU];
nCyclesDone[nCurrentCPU] += ZetRun(nCyclesSegment); nCyclesDone[nCurrentCPU] += ZetRun(nCyclesSegment);
if (joinem) //if (joinem)
if (i == (nInterleave / 3) || i == ((nInterleave / 3) * 2)) //if (i == (nInterleave / 3) || i == ((nInterleave / 3) * 2))
ZetRaiseIrq(0); if (joinem && (i % 249) == 0)
ZetRaiseIrq(0); // game speed (joinem, uncle poo)
if (tri_fix && i == (nInterleave / 2)) ZetRaiseIrq(0); if (tri_fix && i == (nInterleave / 2)) ZetRaiseIrq(0);
if (i == (nInterleave - 1)) if (i == (nInterleave - 1)) // vblank
{ {
if (joinem) { // joinem if (joinem) { // joinem, uncle poo
if (!DrvJoy3[7]) ZetNmi(); if (joinem_nmi_enable)
ZetNmi();
} else if (loverb) { // loverboy } else if (loverb) { // loverboy
ZetNmi(); ZetNmi();
@ -1373,6 +1384,7 @@ static INT32 DrvScan(INT32 nAction,INT32 *pnMin)
SCAN_VAR(soundlatch); SCAN_VAR(soundlatch);
SCAN_VAR(joinem_snd_bit); SCAN_VAR(joinem_snd_bit);
SCAN_VAR(joinem_palette_bank); SCAN_VAR(joinem_palette_bank);
SCAN_VAR(joinem_nmi_enable);
SCAN_VAR(joinem_scroll_w); SCAN_VAR(joinem_scroll_w);
} }
@ -1405,7 +1417,7 @@ STD_ROM_FN(jack)
static INT32 jackInit() static INT32 jackInit()
{ {
timer_rate = 128; timer_rate = 256;
return DrvInit(); return DrvInit();
} }
@ -1581,7 +1593,8 @@ STD_ROM_FN(zzyzzyxx)
static INT32 zzyzzyxxInit() static INT32 zzyzzyxxInit()
{ {
timer_rate = 16; timer_rate = 32;
zzyzzyxx = 1;
return DrvInit(); return DrvInit();
} }
@ -1851,7 +1864,7 @@ static void joinem_palette_init()
static INT32 joinemInit() static INT32 joinemInit()
{ {
joinem = 1; joinem = 1;
timer_rate = 16; timer_rate = 32;
INT32 nRet = DrvInit(); INT32 nRet = DrvInit();
@ -1874,7 +1887,7 @@ static INT32 unclepooInit()
{ {
joinem = 1; joinem = 1;
unclepoo = 1; unclepoo = 1;
timer_rate = 16; //32 in mame? timer_rate = 32;
INT32 nRet = DrvInit(); INT32 nRet = DrvInit();