diff --git a/screen.go b/screen.go index ad7b8c8..6c193e9 100644 --- a/screen.go +++ b/screen.go @@ -92,9 +92,9 @@ func getCurrentVideoMode(a *Apple2) uint16 { if isMixMode { if is80Columns { mode |= videoMixText80 - } else if isStore80Active { + } else /* if isStore80Active { mode |= videoMixText40RGB - } else { + } else */{ mode |= videoMixText40 } } @@ -171,7 +171,7 @@ func snapshotByMode(a *Apple2, videoMode uint16) *image.RGBA { applyNTSCFilter = false } if applyNTSCFilter { - snap = filterNTSCColor(snap, ntscMask) + bottom = filterNTSCColor(bottom, ntscMask) } snap = mixSnapshots(snap, bottom) } diff --git a/screenLoRes.go b/screenLoRes.go index 1b046f4..cb60299 100644 --- a/screenLoRes.go +++ b/screenLoRes.go @@ -39,7 +39,7 @@ func getColorPatterns(light color.Color) [16][16]color.Color { } func snapshotLoResModeMono(a *Apple2, isSecondPage bool, light color.Color) *image.RGBA { - data := getTextFromMemory(a.mmu.physicalMainRAM, isSecondPage) + data := getTextFromMemory(a.mmu.getVideoRAM(false), isSecondPage) return renderGrMode(data, false /*isMeres*/, light) }