ShuriZma
/
stella
mirror of https://github.com/stella-emu/stella.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add a 1 cycle delay to ENABL (including delayed mode) -> fixes Super Challenge Football.

This commit is contained in:
Christian Speckner 2016-12-18 14:38:31 +01:00
parent afcaf8581f
commit b700149cde
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/emucore/tia/TIA.cxx
View File

@ -41,17 +41,20 @@ enum Delay: uInt8 {
pf = 2, pf = 2,
grp = 1, grp = 1,
shufflePlayer = 1, shufflePlayer = 1,
shuffleBall = 1,
hmp = 2, hmp = 2,
hmm = 2, hmm = 2,
hmbl = 2, hmbl = 2,
hmclr = 2, hmclr = 2,
refp = 1, refp = 1,
enabl = 1,
vblank = 1 vblank = 1
}; };
enum DummyRegisters: uInt8 { enum DummyRegisters: uInt8 {
shuffleP0 = 0xF0, shuffleP0 = 0xF0,
shuffleP1 = 0xF1 shuffleP1 = 0xF1,
shuffleBL = 0xF2
}; };
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@ -504,10 +507,9 @@ bool TIA::poke(uInt16 address, uInt8 value)
case GRP1: case GRP1:
{ {
myLinesSinceChange = 0;
myDelayQueue.push(GRP1, value, Delay::grp); myDelayQueue.push(GRP1, value, Delay::grp);
myDelayQueue.push(DummyRegisters::shuffleP0, 0, Delay::shufflePlayer); myDelayQueue.push(DummyRegisters::shuffleP0, 0, Delay::shufflePlayer);
myBall.shuffleStatus(); myDelayQueue.push(DummyRegisters::shuffleBL, 0, Delay::shuffleBall);
#ifdef DEBUGGER_SUPPORT #ifdef DEBUGGER_SUPPORT
uInt16 dataAddr = mySystem->m6502().lastDataAddressForPoke(); uInt16 dataAddr = mySystem->m6502().lastDataAddressForPoke();
if(dataAddr) if(dataAddr)
@ -553,8 +555,7 @@ bool TIA::poke(uInt16 address, uInt8 value)
break; break;
case ENABL: case ENABL:
myLinesSinceChange = 0; myDelayQueue.push(ENABL, value, Delay::enabl);
myBall.enabl(value);
break; break;
case RESBL: case RESBL:
@ -1166,6 +1167,11 @@ void TIA::delayedWrite(uInt8 address, uInt8 value)
myPlayer1.shufflePatterns(); myPlayer1.shufflePatterns();
break; break;
case DummyRegisters::shuffleBL:
myLinesSinceChange = 0;
myBall.shuffleStatus();
break;
case HMP0: case HMP0:
myLinesSinceChange = 0; myLinesSinceChange = 0;
myPlayer0.hmp(value); myPlayer0.hmp(value);
@ -1190,6 +1196,11 @@ void TIA::delayedWrite(uInt8 address, uInt8 value)
myLinesSinceChange = 0; myLinesSinceChange = 0;
myPlayer1.refp(value); myPlayer1.refp(value);
break; break;
case ENABL:
myLinesSinceChange = 0;
myBall.enabl(value);
break;
} }
} }