From bbc2d716648bfb42be0daf4998d9a06f33f10270 Mon Sep 17 00:00:00 2001
From: 4am <a2_4am@sent.com>
Date: Mon, 18 Oct 2021 17:47:12 -0400
Subject: [PATCH] fix recent bank switching regression

---
 src/macros.a     | 22 +++++++++++-----------
 src/ui.credits.a |  4 +++-
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/macros.a b/src/macros.a
index d551d470c..e248259a5 100755
--- a/src/macros.a
+++ b/src/macros.a
@@ -209,35 +209,35 @@
 
 ; various language card configurations
 !macro   READ_RAM1_NO_WRITE {
-         sta   $C088
+         bit   $C088
 }
 
 !macro   READ_RAM1_WRITE_RAM1 {
-         sta   $C08B
-         sta   $C08B
+         bit   $C08B
+         bit   $C08B
 }
 
 !macro   READ_RAM2_NO_WRITE {
-         sta   $C080
+         bit   $C080
 }
 
 !macro   READ_RAM2_WRITE_RAM2 {
-         sta   $C083
-         sta   $C083
+         bit   $C083
+         bit   $C083
 }
 
 !macro   READ_ROM_WRITE_RAM1 {
-         sta   $C089
-         sta   $C089
+         bit   $C089
+         bit   $C089
 }
 
 !macro   READ_ROM_WRITE_RAM2 {
-         sta   $C081
-         sta   $C081
+         bit   $C081
+         bit   $C081
 }
 
 !macro   READ_ROM_NO_WRITE {
-         sta   $C082
+         bit   $C082
 }
 
 ; requires setting zpCharMask in zero page to #$FF or #$DF before use
diff --git a/src/ui.credits.a b/src/ui.credits.a
index 34230aa07..233a006bc 100644
--- a/src/ui.credits.a
+++ b/src/ui.credits.a
@@ -86,10 +86,11 @@ Credits
          ldx   #0
          stx   VTAB
          php                         ; save C, but Z=1 because of ldx #0
+         jsr   SwitchToBank2
 @drawLine
          lda   $FF
          sta   HTAB
-         jsr   DrawString
+         jsr   DrawStringInternal
          bmi   @donePage
          clc
          adc   PTR
@@ -100,6 +101,7 @@ Credits
          php
          beq   @drawLine             ; always branches
 @donePage
+         jsr   SwitchToBank1
          plp
 ;end inline
          jsr   ShowOtherPage         ; show credits