From c0d00c27e5e82f8860a4c15cd34e797f37bcfe64 Mon Sep 17 00:00:00 2001
From: Bobbi Webber-Manners <bobbi.manners@gmail.com>
Date: Sun, 10 Oct 2021 14:43:57 -0400
Subject: [PATCH] Minor refactor of mainmem.gfx.s

---
 applecorn.po  | Bin 819200 -> 819200 bytes
 mainmem.gfx.s |  39 ++++++++++++++++++++-------------------
 2 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/applecorn.po b/applecorn.po
index 6628395dee355a3426c23490ef2624c72bce8acb..978a7958bec1779989aff03b4da2a711240e1c21 100644
GIT binary patch
delta 3508
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

delta 659
zcmXw!T}abm6vnqXJx5zEKhW8S{u2vQ(`_2AoO6b#l#*`wI-N5rq#852H}DVT>cY*a
z)zd}Zm_;KeQQ)8uiRdCwiHPWff{GvsV-*%fQtv1)9(d00aGrCHs#;amdMm6qp53L{
zQ<j~nQQvEv(wrL8pBd9@rF2p$Qpq}1Dou*wV|pGcD+`OLGc+oqk#UVlx#^6KhgM1S
zKk*FPqn_cqs0YnvF4uk8hsn8&V!+HrCX44>)wpJ+sUeZ3EUkQ0mt$cuY>$m%!OV)`
zya-K+=#=az_4sAxirn-rHATsK@VT);osG%%GojdEx9}i`#SHJ3hoF5v!xsNx;X~S-
z*J8?{d#uFFv!Rzl(ab)4ArPqIt1!CAh&$E19yS+kfV-M=al}Qf|Jb~XtlIudZkoWv
z4$h8GyXlG+t{N`HiB7U(vW6ARby6PQ)$k_#>7+Ka+9V4IGHRPp<RTLyg0`&sCqhOS
z?&Ml@chNN5wK8<GM=nX){J6iH99rD4b2jew$ip7lxdcl+WJ$6tRC>vZgLQKIke7<H
z%!$}f5wav=%OYe=#J&sMuH!0v@X~1<bI6RrUUK4|gLAOZOBML-kZ<Ps<eQdyuEvO<
zbR73lITq`=00TZM(H7us(ko6jV8us=G3w-vIN3)IEIQ@%(>^N2_6BZ??>#_YQxRz9
zN(B1pC{kKDAD{Z^e*9GnKTm^qfUY6j$(hKE&{mAJb1C{FBw*;^7QBg2BQAHa75gvJ
ew)nRWUTeCrPFET9bI_k2^k)S9Yp(kZd4B<hdFqt_

diff --git a/mainmem.gfx.s b/mainmem.gfx.s
index 7fb6aee..1dc2858 100644
--- a/mainmem.gfx.s
+++ b/mainmem.gfx.s
@@ -19,9 +19,8 @@ SETLINE     >>>   ENTMAIN
             JSR   FDRAWADDR+43      ; FDRAW: SetLineMode
             >>>   XF2AUX,VDU18RET1
 
-* Call FDraw DrawLine routine
-DRAWLINE    >>>   ENTMAIN
-            LDA   PLOTMODE
+* Helper function to set up colors
+SETCOLOR    LDA   PLOTMODE
             AND   #$03
             CMP   #$01              ; Draw in foreground colour
             BNE   :S1
@@ -35,30 +34,32 @@ DRAWLINE    >>>   ENTMAIN
             BRA   :SETCOLOR
 :S2         LDA   BGCOLOR           ; Draw in background colour
 :SETCOLOR   STA   FDRAWADDR+5
-            JSR   FDRAWADDR+16      ; FDRAW: SetColor
+            JMP   FDRAWADDR+16      ; FDRAW: SetColor
+
+* Call FDraw DrawLine routine
+DRAWLINE    >>>   ENTMAIN
+            JSR   SETCOLOR
             JSR   FDRAWADDR+28      ; FDRAW: DrawLine
             >>>   XF2AUX,VDU25RET
 
 * Call FDraw DrawPoint routine
 DRAWPNT     >>>   ENTMAIN
-            LDA   PLOTMODE
-            AND   #$03
-            CMP   #$01              ; Draw in foreground colour
-            BNE   :S1
-            LDA   FGCOLOR
-            BRA   :SETCOLOR
-:S1         CMP   #$02              ; Draw in inverse colour
-            BNE   :S2
-            SEC
-            LDA   #$07
-            SBC   FGCOLOR
-            BRA   :SETCOLOR
-:S2         LDA   BGCOLOR           ; Draw in background colour
-:SETCOLOR   STA   FDRAWADDR+5
-            JSR   FDRAWADDR+16      ; FDRAW: SetColor
+            JSR   SETCOLOR
             JSR   FDRAWADDR+25      ; FDRAW: DrawPoint
             >>>   XF2AUX,VDU25RET
 
+* Call FDraw DrawCircle routine
+DRAWCIRC    >>>   ENTMAIN
+            JSR   SETCOLOR
+            JSR   FDRAWADDR+37      ; FDRAW: DrawCircle
+            >>>   XF2AUX,VDU25RET
+
+* Call FDraw FillCircle routine
+FILLCIRC    >>>   ENTMAIN
+            JSR   SETCOLOR
+            JSR   FDRAWADDR+40      ; FDRAW: FillCircle
+            >>>   XF2AUX,VDU25RET
+
 * Reset colours and linetype
 GFXINIT     JSR   FDRAWADDR+0       ; Initialize FDRAW library
             LDA   #$20