From 694e5fda51cdc1624ba46d739bf56f01d388df4b Mon Sep 17 00:00:00 2001
From: Bobbi Webber-Manners <bobbi.manners@gmail.com>
Date: Sat, 25 Sep 2021 18:21:09 -0400
Subject: [PATCH] 65816 code fixed. Odd columns in MODE3 work now.

---
 applecorn.po    | Bin 819200 -> 819200 bytes
 applecorn.s     |   1 +
 auxmem.bytwrd.s |   2 --
 auxmem.vdu.s    |  25 ++++++++++++++++++++-----
 4 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/applecorn.po b/applecorn.po
index 7d63e4cd7e5de2aacebf776906d51fa3ae3bdf4d..c1690867f4211b0eae54d79ef75e3972327d25f3 100644
GIT binary patch
delta 3036
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

delta 2965
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

diff --git a/applecorn.s b/applecorn.s
index 3d6509e..9f7fa78 100644
--- a/applecorn.s
+++ b/applecorn.s
@@ -7,6 +7,7 @@
 * Assembled with the Merlin 8 v2.58 assembler on Apple II.
 
             XC                ; 65c02
+            XC                ; 65816
             ORG   $4000       ; Load addr of loader in main memory
                               ; Clear of first HGR frame buffer
 
diff --git a/auxmem.bytwrd.s b/auxmem.bytwrd.s
index 75468b6..f62b6aa 100644
--- a/auxmem.bytwrd.s
+++ b/auxmem.bytwrd.s
@@ -9,8 +9,6 @@
 * 09-Sep-2021 Moved keyboard and VDU OSBYTEs to Keyboard and VDU.
 
 
-             XC                           ; 65c02
-
 *************************
 * OSBYTE DISPATCH TABLE *
 *************************
diff --git a/auxmem.vdu.s b/auxmem.vdu.s
index 7eadb12..8a31aee 100644
--- a/auxmem.vdu.s
+++ b/auxmem.vdu.s
@@ -354,7 +354,12 @@ PRCHR4       JSR   CHARADDR          ; Find character address
              TXA                     ; Get buffer code
              BIT   VDUBANK
              BPL   PRCHR5            ; Not AppleGS, use short write
-             DB    $97,VDUADDR       ; STA [VDUADDR],Y
+             CLC                     ; Enter 65816 native mode
+             XCE
+             SEP   #$30              ; 8-bit M and X
+             STA   [VDUADDR],Y
+             SEC                     ; Return to emulation mode
+             XCE
              BRA   PRCHR8 
 PRCHR5       PHP                     ; Disable IRQs while
              SEI                     ;  toggling memory
@@ -393,7 +398,12 @@ BYTE87
 GETCHRC      JSR   CHARADDR          ; Find character address
              BIT   VDUBANK
              BPL   GETCHR5           ; Not AppleGS, use short read
-             DB    $B7,VDUADDR       ; LDA [VDUADDR],Y
+             CLC                     ; Enter 65816 native mode
+             XCE
+             SEP   #$30              ; 8-bit M and X
+             LDA   [VDUADDR],Y
+             SEC                     ; Enter emulation mode
+             XCE
              BRA   GETCHR7
 GETCHR5      PHP                     ; Disable IRQs while
              SEI                     ;  toggling memory
@@ -606,7 +616,7 @@ VDU22        LDA   VDUQ+8
              JSR   NEGCALL           ; Find machine type
              AND   #$0F
              BEQ   :MODEGS           ; MCHID=$x0 -> Not AppleGS, bank=0
-**DEBUG             LDA   #$E0              ;  Not $x0  -> AppleGS, point to screen bank
+             LDA   #$E0              ;  Not $x0  -> AppleGS, point to screen bank
 :MODEGS      STA   VDUBANK
              LDA   #$01
              JSR   CLRSTATUS         ; Clear everything except PrinterEcho
@@ -750,8 +760,13 @@ SCR1LINE     BIT   VDUSCREEN
              RTS
 SCROLLGS     LDX   #1
 :L4          LDY   #39
-:L5          DB    $B7,VDUADDR       ; LDA [VDUADDR],Y
-             DB    $97,VDUADDR2      ; STA [VDUADDR2],Y
+:L5          CLC                     ; Enter 65816 native mode
+             XCE
+             SEP   #$30              ; 8-bit M and X
+             LDA   [VDUADDR],Y
+             STA   [VDUADDR2],Y
+             SEC                     ; Enter emulation mode
+             XCE
              DEY
              BPL   :L5
              LDA   VDUBANK