From 6fb5934b87506ef0124c773869290e4b9ac43bd6 Mon Sep 17 00:00:00 2001
From: Dan Sanderson <contact@dansanderson.com>
Date: Tue, 18 Nov 2025 20:22:47 -0800
Subject: [PATCH] Improve CRAM2K flip to preserve previous value

---
 libsrc/c65/cpeekcolor.s | 4 ++--
 libsrc/c65/cputc.s      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/libsrc/c65/cpeekcolor.s b/libsrc/c65/cpeekcolor.s
index 0ed0b1792..c32111b88 100644
--- a/libsrc/c65/cpeekcolor.s
+++ b/libsrc/c65/cpeekcolor.s
@@ -21,13 +21,13 @@ _cpeekcolor:
         php
         sei
         lda     $D030
+        pha
         ora     #$01
         sta     $D030
         ldy     #0
         lda     (ptr1),y
         tay
-        lda     $D030
-        and     #$FE
+        pla
         sta     $D030
         plp
         tya
diff --git a/libsrc/c65/cputc.s b/libsrc/c65/cputc.s
index d033ab234..413521f25 100644
--- a/libsrc/c65/cputc.s
+++ b/libsrc/c65/cputc.s
@@ -119,12 +119,12 @@ putchar:
         php
         sei
         lda     $D030
+        pha
         ora     #$01
         sta     $D030
         lda     CHARCOLOR
         sta     (ptr4),y    ; Set color
-        lda     $D030
-        and     #$FE
+        pla
         sta     $D030
         plp