From caa312c12afd49adfa56b1e63f174f4e9af361a0 Mon Sep 17 00:00:00 2001
From: Ivan Izaguirre <ivanizag@gmail.com>
Date: Tue, 11 Aug 2020 23:13:12 +0200
Subject: [PATCH] Fix text mix

---
 screen.go      | 6 +++---
 screenLoRes.go | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

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)
 }