From aa992200c094e07c90d951f33e460fb06a7c6959 Mon Sep 17 00:00:00 2001
From: Bobbi Webber-Manners <bobbi.manners@gmail.com>
Date: Sat, 31 Jul 2021 16:26:32 -0400
Subject: [PATCH] More core cleanup

---
 applecorn.po | Bin 143360 -> 143360 bytes
 applecorn.s  |   2 ++
 mainmem.s    |  32 +++++---------------------------
 3 files changed, 7 insertions(+), 27 deletions(-)

diff --git a/applecorn.po b/applecorn.po
index e428930482948ff26bd54b72ac46452561e11fa0..1251e15941207c963fb37923e908c49f23ce738b 100644
GIT binary patch
delta 386
zcmZp8z|ru4V}k<=|3eOjUs{YJDh!Vq82)QXPWER}W0aX(#&T0olHt2P!yhd^2B@6y
z<^<NgY>Wb%<#>LHZf0b9!MI69k7;wH+9LMNYI=ptn-3YbGj1+1e$TYI&rF$d^Bwc~
z%#(Fo)i$5Bw&t9?*jjCKkgG4#<m2wSo8vtk88@HyG-cXe&&qUxag$GEIJ?K%?gK!y
zIbks$GmJC2bXhK({c@QxoUOb(9nPM(TnElRvb+Vx-t51^nGwdBJac7)Ce((N$-Qrx
zSKjP>$DCoI6Y<|i<nY={YQ2o=3MFb#6_ce_!L4czS+zZ672_J^=?kwgDo>w(j!}9$
z-v!1`jMM8mnfSKzU12=Lxa<-m)A9>f8JU({V`Q6t^(CYBbh(#|qT5C9Fdkssc8_r#
Y*JKV?p2-_LrMIto!Klr+>=mOM0HT4SZ2$lO

delta 470
zcmZp8z|ru4V}k<=|27VWUs{YJDh!Vq82)Q<O!j9{W8|4!#&T0ois85+!yhd^2C&>e
zE%nU_tb5rQ88*xD{1Rn+y_u2eIpZc3JtoaFM-DDna(KgzLko5*Tzazp`WJ;Whu0`P
zdid_O!uxkmdl$gvH|wY^VV~~$g;8{R{0By{%@=eFnWyW$VbtF2XxPp;UGN={b;9U9
z6NI(hR2eFE%WOU~NSnswTh3~m=UZ8GPG9nuQDgHh=VGR*T}&F2ecf`W`!h0WZ{FqR
z$T<Bi6Oi@W-IQsQPh>dz+U^5D<gqznF&{IGGr4qGE}Z>xnK7KLygVJwp152G&OWld
z1;*a&zrvXj#+f{GWrQZwhLy>^Z<$x#?0v_aVWAW8-$&%|+DmG^jOq#{YETuErB=bM
zY7SYoJ!BQ*8s+JN=NNT2$9gSh-0siLWWcoS5+l=ggA0ro7^lzYV$z+y{~{yDcGhc*
qzgf3y-(kGUI9Y&6d)qz6bzIYzy=1hWF7lG`&9pm=+RI)sx&Z+6(a!z=

diff --git a/applecorn.s b/applecorn.s
index 2f7c84f..e42c3d3 100644
--- a/applecorn.s
+++ b/applecorn.s
@@ -86,6 +86,8 @@ XFMAIN      MAC
 * Called by code running in main mem
 XFADDR      MAC
             PHA
+            LDA   $C08B       ; R/W LC RAM, bank 1
+            LDA   $C08B
             LDA   #<]1
             STA   STRTL
             LDA   #>]1
diff --git a/mainmem.s b/mainmem.s
index 1159392..1a22304 100644
--- a/mainmem.s
+++ b/mainmem.s
@@ -70,8 +70,6 @@ DISCONN     LDA   $BF98
 * XFER to AUXMOS ($C000) in aux, AuxZP on, LC on
 RESET       TSX
             STX   $0100
-            LDA   $C08B              ; Rd/Wt LC, bank one
-            LDA   $C08B
             >>>   XFADDR,AUXMOS
             >>>   XFAUX
             RTS
@@ -197,9 +195,7 @@ OFILE       LDX   $0100              ; Recover SP
             BRA   FINDEXIT
 :NOTFND     LDA   #$00
             PHA
-FINDEXIT    LDA   $C08B              ; R/W RAM, LC bank 1
-            LDA   $C08B
-            >>>   XFADDR,OSFINDRET
+FINDEXIT    >>>   XFADDR,OSFINDRET
             PLA
             >>>   XFAUX
 BUFIDX      DB    $00
@@ -255,9 +251,7 @@ FILEGET     LDX   $0100              ; Recover SP
 :NOERR      LDX   #$00
             LDA   BLKBUF
             PHA
-GETEXIT     LDA   $C08B              ; R/W RAM, LC bank 1
-            LDA   $C08B
-            >>>   XFADDR,OSBGETRET
+GETEXIT     >>>   XFADDR,OSBGETRET
             PLA
             >>>   XFAUX
 
@@ -279,8 +273,6 @@ FILEPUT     LDX   $0100              ; Recover SP
 
 * There is no way to report an error it seems!
 
-            LDA   $C08B              ; R/W RAM, LC bank 1
-            LDA   $C08B
             >>>   XFADDR,OSBPUTRET
             >>>   XFAUX
 
@@ -325,8 +317,6 @@ FILEEOF     LDX   $0100              ; Recover SP
             BRA   :EXIT
 :NOTEOF     LDA   #$00
 :EXIT       PHA                      ; Preserve return code
-            LDA   $C08B              ; R/W RAM, LC bank 1
-            LDA   $C08B
             >>>   XFADDR,CHKEOFRET
             PLA                      ; Recover return code
             >>>   XFAUX
@@ -344,8 +334,6 @@ FLUSH       LDX   $0100              ; Recover SP
             DB    FLSHCMD
             DW    FLSHPL
 
-            LDA   $C08B              ; R/W RAM, LC bank 1
-            LDA   $C08B
             >>>   XFADDR,OSARGSRET
             >>>   XFAUX
 
@@ -412,9 +400,7 @@ LOADFILE    LDX   $0100              ; Recover SP
 :EOF2       LDA   OPENPL+5           ; File ref num
             STA   CLSPL+1
             JSR   CLSFILE
-:EXIT       LDA   $C08B              ; R/W RAM, bank 1
-            LDA   $C08B
-            >>>   XFADDR,OSFILERET
+:EXIT       >>>   XFADDR,OSFILERET
             PLA
             >>>   XFAUX
 :BLOCKS     DB    $00
@@ -563,8 +549,6 @@ SAVEFILE    LDX   $0100              ; Recover SP
             BCC   :EXIT              ; If close OK
             LDA   #$02               ; Write error
 :EXIT       PHA
-            LDA   $C08B              ; R/W RAM, bank 1
-            LDA   $C08B
             >>>   XFADDR,OSFILERET
             PLA
             >>>   XFAUX
@@ -608,8 +592,6 @@ CATREENTRY
 
 :S1         JSR   COPYAUXBLK
 
-            LDA   $C08B              ; R/W RAM, bank 1
-            LDA   $C08B
             >>>   XFADDR,PRONEBLK
             >>>   XFAUX
 
@@ -618,9 +600,7 @@ CATREENTRY
             STA   CLSPL+1
             JSR   CLSFILE
 
-CATEXIT     LDA   $C08B              ; R/W LC RAM, bank 1
-            LDA   $C08B
-            >>>   XFADDR,STARCATRET
+CATEXIT     >>>   XFADDR,STARCATRET
             PLA
             >>>   XFAUX
 
@@ -643,9 +623,7 @@ SETPFX      LDX   $0100              ; Recover SP
             BCC   :S1
             JSR   BELL               ; Beep on error
 
-:S1         LDA   $C08B              ; R/W LC RAM, bank 1
-            LDA   $C08B
-            >>>   XFADDR,STARDIRRET
+:S1         >>>   XFADDR,STARDIRRET
             >>>   XFAUX
 
 * Create disk file