From deb7ae87b14061d89ed0a91dc1f02300cbfc9b5b Mon Sep 17 00:00:00 2001
From: Bobbi Webber-Manners <bobbi.manners@gmail.com>
Date: Fri, 1 Oct 2021 18:37:30 -0400
Subject: [PATCH] Merge JGH PR #113 - loader for for 12K of MOS!

---
 applecorn.po  | Bin 819200 -> 819200 bytes
 mainmem.ldr.s |  15 +++++----------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/applecorn.po b/applecorn.po
index e7a2a60aaa9c2f4e659fdb2ae302623842d93047..8fa42b7c477fb927c180190468153c4cca2a6a1d 100644
GIT binary patch
delta 171
zcmZo@FluNp+R()!vWr2E!PJVuQCn4rq2V!u1BkJC9?La$VaEUe7#Qpu7$86nNU=|E
z6k>LqzQB%IVY2{}1Y;B5GCsyMCJD*uj7DtI(^=zK9#3aH#wjyh{we!IW}t?)GRC$t
zrnWNXwlbEsGS;>-wq<4PyLc4({wf4GD>OQ<RFIj@Q^IJ+*s<NagmEk5vH*6uwg8T{
Q0M51muC@T~WdS?}07wxpi2wiq

delta 143
zcmZo@FluNp+R()!vYc6-!PJUDp21FAh2b%SgPpdzz~*@@*VrcuF!3|WPj3`rcA37w
zj#*)|0Fwk`6W=mE#xx#<zP}0q&I*mrD;0RA^B8d0F;;B%HsILG*j5HaOl@V%ZDlNN
tWvp#wY|F~ncP&ffU;%3X#0WH#Z&?VtR9gT?TL5QU09RW8_p$&U0{|?SD8m2%

diff --git a/mainmem.ldr.s b/mainmem.ldr.s
index 0d08a08..838f5ac 100644
--- a/mainmem.ldr.s
+++ b/mainmem.ldr.s
@@ -2,6 +2,7 @@
 * (c) Bobbi 2021 GPLv3
 *
 * Applecorn loader code.  Runs in main memory.
+* 01-Oct-2021 Copies MOS code to whole $D000-$FFFF.
 
 * Loads Acorn ROM file (16KB) from disk and writes it
 * to aux memory starting at $08000. Copies Applecorn MOS
@@ -12,8 +13,8 @@ START       JSR   CROUT
             JSR   SETPRFX
             JSR   DISCONN
 
-            LDA   #$20             ; Turn off PAGE2 shadow on ROM3 GS
-            TSB   $C035
+            LDA   #$20             ; PAGE2 shadow on ROM3 GS
+            TRB   $C035
 
             JSR   ROMMENU
             LDA   #>AUXADDR        ; Address in aux
@@ -44,9 +45,9 @@ START       JSR   CROUT
             LDA   #>MOSSHIM
             STA   A1H
 
-            LDA   #<MOSSHIM+$2000  ; End address of MOS shim
+            LDA   #<MOSSHIM+$3000  ; End address of MOS shim
             STA   A2L
-            LDA   #>MOSSHIM+$2000
+            LDA   #>MOSSHIM+$3000
             STA   A2H
 
             LDA   #<AUXMOS1        ; To AUXMOS1 in aux memory
@@ -166,9 +167,3 @@ LOADCODE    PHP                    ; Save carry flag
 
 
 
-
-
-
-
-
-