diff --git a/hardware/memory/cartridge/harmony/arm7tdmi/arm7.go b/hardware/memory/cartridge/harmony/arm7tdmi/arm7.go index 600c16f15..32b01dd3d 100644 --- a/hardware/memory/cartridge/harmony/arm7tdmi/arm7.go +++ b/hardware/memory/cartridge/harmony/arm7tdmi/arm7.go @@ -576,16 +576,16 @@ func (arm *ARM) Run(mamcr uint32) (uint32, float32, error) { fallthrough case 0: stretchedCycles += (arm.cyclesInstruction.Npc + arm.cyclesInstruction.Spc) * arm.stretchFlash - stretchedCycles += (arm.cyclesInstruction.Spcmerged) * arm.stretchFlash + // stretchedCycles += (arm.cyclesInstruction.Spcmerged) * arm.stretchFlash stretchedCycles += (arm.cyclesInstruction.Ndata + arm.cyclesInstruction.Sdata) * arm.stretchSRAM case 1: stretchedCycles += (arm.cyclesInstruction.Npc * arm.stretchFlash) stretchedCycles += (arm.cyclesInstruction.Spc * arm.stretchMAM) - stretchedCycles += (arm.cyclesInstruction.Spcmerged) * arm.stretchMAM + // stretchedCycles += (arm.cyclesInstruction.Spcmerged) * arm.stretchMAM stretchedCycles += (arm.cyclesInstruction.Ndata + arm.cyclesInstruction.Sdata) * arm.stretchSRAM case 2: stretchedCycles += (arm.cyclesInstruction.Npc + arm.cyclesInstruction.Spc) * arm.stretchMAM - stretchedCycles += (arm.cyclesInstruction.Spcmerged) * arm.stretchMAM + // stretchedCycles += (arm.cyclesInstruction.Spcmerged) * arm.stretchMAM stretchedCycles += (arm.cyclesInstruction.Ndata + arm.cyclesInstruction.Sdata) * arm.stretchMAM } diff --git a/hardware/television/resizer.go b/hardware/television/resizer.go index 1f721fb93..4d4b4df35 100644 --- a/hardware/television/resizer.go +++ b/hardware/television/resizer.go @@ -29,7 +29,6 @@ import ( // // * changes size after setup phase // - Ladybug -// - aTaRSI (demo) // // * the occasional unsynced frame // - Hack Em Hangly Pacman @@ -94,6 +93,10 @@ func (sr *resizer) examine(tv *Television, sig signal.SignalAttributes) { // TV. the best example of this is Andrew Davie's chess which simply does // not care about frames during the computer's thinking time. if !tv.state.syncedFrame { + // reset any pending changes on an unsynced frame + tv.state.resizer.pendingCt = 0 + sr.pendingTop = sr.currTop + sr.pendingBottom = sr.currBottom return }