From d91816019ee81bf524313682848f4a03c87edf10 Mon Sep 17 00:00:00 2001
From: David Schmenk <dschmenk@sbcglobal.net>
Date: Mon, 11 Nov 2024 15:58:25 -0800
Subject: [PATCH] Move GREASY IMPORT back intro SPRED

---
 images/apple/DCGR-TK.PO         | Bin 143360 -> 143360 bytes
 src/inc/dcgrutils.plh           |   1 -
 src/libsrc/apple/dcgrutils.pla  |  28 ----------------------------
 src/utilsrc/apple/dcgrspred.pla |  29 +++++++++++++++++++++++++++++
 4 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/images/apple/DCGR-TK.PO b/images/apple/DCGR-TK.PO
index 4e8513e38b7cb33ddd7466681e6bbe22788231a8..fdf59beda4699c1f4be21051b73659ae72ab9d0d 100755
GIT binary patch
delta 1644
zcmZY9ZERCj90u_JJ-v6Y?R{zQWy0P!SST>VM3;<6W`qstV5_4SaH0Vs5=S(`5@=+x
zJ4ir{0S^V_n_*@e48*Z!X~;6hGCNYNOBpkaj51zKNFd<@hKS;ZPnkxIOMdrx{^y>a
zZT)aMZe(@b$m*UaOS2;ta*ZTaMK&oxR#9L#HZ(S^Z+!0Awf<%z${<OiJw)51HCh(k
zo+&Icoyl6A*A=#vXr3pBu2~W1&POb)v#E%*tBFOD!IM(X9g|p#MeMK@KJY<vXro*p
zT49GgOYA}JMSg}n2EDQ>hL9t&CaxfV1yTw`HsnDmEQA-p2d~09rBG}_w!vQb1P)^D
zIPwI13;mFQ%SwSmj4R>L9)5()s=k~YjgQ4fV}mQQ)|fNH6|B@{-7zl@jmBalPhYiI
zGsDa){1+12*x6p~Y_r(b^>j90Cw*?j*|XUQ`-2@hvQ+VY{@WC2EsX3Q+Qy_K;mKH?
zbT>S2xQo>ng%iWeGItgQBl-S);Y-8wSzs)(^g@711K~sQlJtf%@$$@pGQS}OlHrN?
z;aa=gA0!q)>>!5E1q#aoc>mVS(E4;(PbC4O#etsU_MZGkl_))>AAy1Jsf#TO?iLb`
zCbkofz!>xt6Duqu)(QiV1iL)E=!dFe(dP0A?o!1;<d-f@^diq8N03)torz;1P26(%
z_<a}gUtA=nTpD+%Byv<HDpXl4R25OJ%De_^FJi7$9o&b$My(f{RgG^~iSL4su=csS
zQruEK;-2ag53u*4>JX1rRWQvbva|-FLO_$n7LAGBa1866Av{iMnmDaF_*sp_pvL(3
z$P3t*&@#nU&Ek`of5$wfWeCzOk*hmIvF_#@b^LOj#E0nn&<{WujzcGO!D;A*emD;!
za0$jC1)<wGU|N@jWMl~0u!LqfM7iPS%M22A$X5*F4d`3Y+mZW_2e9@j`U&(X`Z@Hg
zhAgh(j7gkv7iVa0na_8VSmJi`YB%v(^fl;y<R)YgYx~_4;zv=w!s4KNKEH_k(Ou5R
zu{HrW;UU%@xhwf&^l5a-Q^K=7B%bk9@_Y~RBJ@&EiCB)g9`h>9tFh-b^f%GJ@p#24
zPc835Kj(Q~Jn_^D+4PERa}jr%3JJrsqL&UyH>K#Ut<w004OM^N3su@Ac~>l7*=z?^
ztzL_}13%MCNujPxTp$16h6|={#b4W6NTqwT|FbRX9+2+86f&n&!?yjlV%xToOWl6N
zM5;d>sZ<J)O!ZH=5O4JLrbFrTyYMR4_NV+xvfIve`E^`jx-RL`nZA5PuF+?7ONwL|
zhVHisK{(7X&ZN&YjE@mE{;a1DiUwu2SBgrEJt+<q3ezm&c_#5WPzrNR5(`W>uS8!A
zOP~g8FPjFhNBZ#1HQ}3U#`*@#ubUR%jQ$S13vJL29k3q`!eKZLC!h;X!FSLT!lM`Z
z;5-f+GAsEodK^7rmhe&ZakvgY!##Kazri2y1Trk*+2FKDcq}i^L!X0QYI#M4wTOE$
zZ^Qha<)!3LW6O1xjzpvGpyU_p%Glt7f9_7bp8j=r>MLnDo`}VpbRQ*Sqs@8)?#sNd
H=Q8J?VYL7}

delta 1504
zcmZ9|eQXnT7zgm*{d(;xu6NhFYcsR=ZUbhv2#a8ljLt9^NEzKYWdmfQ!zClWfI;VY
z>3+Bvr^NYqh7k;!p%5oAA{SX^Fa&2i_XeW_K_oKfA4XIXArTS@`rS)3vB{^;_j!I#
z@1-qc-j*@%(E?dYb7sm5Bq_^z(%r;u&SxL=Hl}Xy@J);r827UEK__+VZQk*Gm6T;`
z{E8#Jw2Ir$_O>|DrY=btHW_aSFn$U2pzUg|jy*1CP`#|s7S!FcO8ZbdQ9nmLff`4>
z4A<ZfIY@t@a(9qY-5C^wd2WRkqgJ|AT7&vBv_KnlKqnl5FJJ)9!guaW8biJ5&X`5q
zlR@`@;>n~m)Lgh9N+ANPp~hohXch-|%ul^(@=a@4PrAz9&T~?aZS>EOrI|0JKf^4>
zoLjvOTr%yt#1g5|K9o4b6Pb3TuQcUGW|Na1ZMCcVW^>DOzU;HO6t>lYoQZ|G19>Uo
zP}DD3QG4CMJK^)8XcOZW$`;1)JL^EMh4cEU=GtVlhUMUXbF7l=9mmou6*h7AITK%2
z*e)7eJ2R2V_zf_#a3v_oX8b@d<JTY@Vmu1xL-x_ZxiRsakI{?1rL@zhidT`}@Nqiq
zlj(@hO~-w*=)vp+`jbAF7(gEORnS%J{_11mPjD%WG-Vk*r5LnXSwUMBnYJk|+O8<H
z8~y7_gx-R4n2#%*Zb498K_Mtq^HnNVU1EXC=n<8Ra?}b{rihwCwQ4}rp>I|X4(*M}
zv{Us^iyELeRTq7r>f*AB2f+DVWLaY(1q?`o5EMW$%z;uUgG#7^8h8Sp))?*5WD=T(
zTD1VRYcBdw)5TYq$5Fq<&LHx549y(`*{_QfKNB<jjB=45LSBSi>z8T0-$Ql&05$qu
z)b5wX$Cx|VIgXu^$iv7ZsAH(NG4tq51Rzhx%j>hnqo^zOJW+$$I@k!?Fl*9_MQl5o
zU1)@!Bic~+VfY?q?<05WIn;|jfxaL85O%&t{t<bWQAkBbSS&OcEixXYm=UH{%-W11
zu?I6UGU;6-OLQ1a?1xVH2=h-2U3`js6dZ%aL=T2v8-9^M9l!<7-~ve;UPS+c5fE3A
ze}UiOCfosL;w?b|9nv5d3ZMucfD)Jo3!%(pwAd^bOOcl&N6Z{ija*~8nb=?ky3e*t
zSEcUpP141hnheFueqwBMcZPC>6_ziqsD8{^9$C#MKX)Hy9#-p}JpKRL>S*<n^69m;
zOku0;!&;U)y_VIjpOmhb?ah&7D{<zu<^9a~rnfJdjQ3jJd^3?eH5^aIPnCODnxiAh
z{&Q2!@N{zllO^7Uz-VtW9zQ*~cWJtrI?{uV#Ji+!iSxg+%bBRh+iixe@CxjJ7`z5;
zum}HwZ5E0S<o(E<W+5Fmi$oXtpV418JAMoC(fR*Am$sDs_gq@VbTfH#Z5d1S55@ae
TX)D-BJXx(pY>7LE^Lgq&<$&6X

diff --git a/src/inc/dcgrutils.plh b/src/inc/dcgrutils.plh
index 78eac55..49a6ca4 100644
--- a/src/inc/dcgrutils.plh
+++ b/src/inc/dcgrutils.plh
@@ -6,7 +6,6 @@ import dcgrutils
     predef dcgrBoldStr(clr, x, y, strptr)#0
     predef dcgrFont(font)#0
     predef dcgrRect(x, y, w, h)#0
-    predef frameRead(filestr, frame)#1
     predef spriteRead(filestr)#5
     predef spriteWrite(filestr, xorg, yorg, width, height, sprptr)#1
     predef screenRead(filestr)#1
diff --git a/src/libsrc/apple/dcgrutils.pla b/src/libsrc/apple/dcgrutils.pla
index cec9f31..9e97a9b 100644
--- a/src/libsrc/apple/dcgrutils.pla
+++ b/src/libsrc/apple/dcgrutils.pla
@@ -124,34 +124,6 @@ export def dcgrRect(x, y, w, h)#0
         dcgrHLin(x, x2, v)
     next
 end
-export def frameRead(filestr, frame)#1
-    var sprptr, sprsize
-    byte refnum, numframes
-
-    sprptr = 0
-    refnum = fileio:open(filestr)
-    if refnum
-        sprsize = 40 * 40  / 2
-        sprptr = heapalloc(sprsize)
-        if sprptr and fileio:read(refnum, @numframes,  1)
-            if numframes < frame
-                heaprelease(sprptr)
-                sprptr = NULL
-            fin
-        fin
-        if sprptr
-            if fileio:setmark(refnum, (frame - 1) * sprsize + 1, 0)
-                heaprelease(sprptr)
-                sprptr = NULL
-            elsif fileio:read(refnum, sprptr,  sprsize) <> sprsize
-                heaprelease(sprptr)
-                sprptr = NULL
-            fin
-        fin
-        fileio:close(refnum)
-    fin
-    return sprptr
-end
 export def spriteRead(filestr)#5
     var sprptr, sprsize, xorg, yorg
     byte refnum, width, height
diff --git a/src/utilsrc/apple/dcgrspred.pla b/src/utilsrc/apple/dcgrspred.pla
index 8b0a9a8..9f25746 100644
--- a/src/utilsrc/apple/dcgrspred.pla
+++ b/src/utilsrc/apple/dcgrspred.pla
@@ -98,6 +98,35 @@ def greasy2gr(pGreasy)#0
     next
 end
 
+def frameRead(filestr, frame)#1
+    var sprptr, sprsize
+    byte refnum, numframes
+
+    sprptr = 0
+    refnum = fileio:open(filestr)
+    if refnum
+        sprsize = 40 * 40  / 2
+        sprptr = heapalloc(sprsize)
+        if sprptr and fileio:read(refnum, @numframes,  1)
+            if numframes < frame
+                heaprelease(sprptr)
+                sprptr = NULL
+            fin
+        fin
+        if sprptr
+            if fileio:setmark(refnum, (frame - 1) * sprsize + 1, 0)
+                heaprelease(sprptr)
+                sprptr = NULL
+            elsif fileio:read(refnum, sprptr,  sprsize) <> sprsize
+                heaprelease(sprptr)
+                sprptr = NULL
+            fin
+        fin
+        fileio:close(refnum)
+    fin
+    return sprptr
+end
+
 def importGreasy(frame)
     var sprptr