From e76cbbec8ab1465c9b973bb4612c67daeab20fa2 Mon Sep 17 00:00:00 2001
From: stevenhowes <38082088+stevenhowes@users.noreply.github.com>
Date: Wed, 14 Apr 2021 21:48:54 +0100
Subject: [PATCH] Better file naming, loading of smarttiles in mission2 rather
 than hard coded stuff

---
 !TheEsc/!MapEdit,ff8                 | Bin 7920 -> 7928 bytes
 !TheEsc/!RunImage,ff8                | Bin 20680 -> 20748 bytes
 !TheEsc/c/MapEdit                    |   4 +-
 !TheEsc/c/Mission2                   |  65 +++++++++++++--------------
 !TheEsc/{mission2,ffd => m2_map,ffd} | Bin
 5 files changed, 34 insertions(+), 35 deletions(-)
 rename !TheEsc/{mission2,ffd => m2_map,ffd} (100%)

diff --git a/!TheEsc/!MapEdit,ff8 b/!TheEsc/!MapEdit,ff8
index c5381e551f8f8f30c22becfd377e76378c568823..a6ee6dd81a99f30c556c51d37aa3f3806a7c8d5f 100644
GIT binary patch
delta 989
zcmYk4e@IhN6vxkb`~9}LnW@uqn^|p8lA5-{Buld*B5Tp_NNH3?riOnQS<SL2BAOg^
zWfYGfs6Zk{{Sy%(QBqO=6k-wVJs+VfTF@WvpVoP{pbOu3_?-K_=iYnXP1a1;<N`=>
zO*VjpXoN&Izz=_4ZWM3z4VPpe;f%9=K;4+NL&*miI@lM_vESxoDxIG4-vVeP#6yO9
zBTQ9ND+aKN?w}91(_1XTdGr%=ii-@8FnM{CvH{iMxGHzJB}FLgk#}+x-dO3S1;Qc}
zX^RlR`E*IB#_#k(@L?8x7kp<HvMc25l|?u&i(W~Y$NY+Uc81-|8$G?UJHv&{1@2zi
zpW!^_Q#@ah;aSXs%qugT#r%M|A;Ve=DtLY4UoKRPoQShwcg9e5c+Mp9b*E`qSCaj~
z08hetNQ|&fvz}927cBk3R}Qg1#0O40B_+Z9>OcO<Y~@yLPp1=BYS#P2F>YmR#s1dj
zb{f<#D~fX272KN$m#m0L3baeg<0eVb9laojXj0#XZM4g968-eS;L)#V7bW#BavB@4
zl$wo|4c-A&@JsPEED^RU4uJbMAQj9~yq3lPO)&zDL(_<g;Sp7YTG<98YOP+1+d1k0
zrb2L*J{b!PX0F~zDPsUrRBj4jf?7;V@eAEF1?IljY5%ZHVZZp%v01+NJDt#C6Gxgb
zh43P6Fwe>TR_9S|&VF^ZONwVfzp5Q!fKHf~ppEXCJ-C=g%|Q%Pk!2N5&^}8wdg;2Q
z4I^X`>o7^1!~?jT9*XPmD5b<Gx~R{(2<z#o)yGdpwFV7I?q7szY)i49I&2THiHhx)
zv4@83`K5ZZM{R_NN;8M$X5QU130DBRculbVICOJtXgk&kJi@V`_El(@dD*cl$7UUN
z(fL_**iEDS4U;|R3I2+W=0pWd#+vhV87sBqKeMFXZ~?Bhjmll;@LlYYD~N0N4gt))
z0Wk5JC*J`G95mL98m}J*Nb?AX|K_xvwcNj<@pNocVNB;<c@1DJ3h<ew4XuoqHJ|0b
OLB;NuR?gzg9Kau65m<)+

delta 1015
zcmYk4UuY9~5XWaWyUk{^ZPKPaV_K4URpR-F%e7(=E!LKLf`Zlf2NXfMNL&1qc=n;k
z`KQ$iii*~0japCE2SJZ3<;atW6e)t>9}J2Q>PvQAXd8>|i$w5TXX^?#@ZI4vzuB4D
z*<Z17y0HpC%iB@`3UUb)$^kw^`>Qf|y??m2yn`eD^q{%EY`ZZB;99ajA1Kv0_{p*+
zqc;H75n{X4Tmq9z=m0igJ>9|>ZlR}Gi&2`vz`SY+3hpR3i4U4S-v#|pSTlrBufC0|
zaAV^HEf5x?Oq+xTtf4c)N-WSrA%-eV39;kzIV<V!(-k<SD^bmeGCyLjbhw6jeWXth
zI~-)58}8E=I$X(ol+WuN_A_5*UgfaLJi@%zVS5F2{C?Xv4jCc`@|>{4Nr-n;PgoL6
zPSdcfw)}+z_l}8Bc)&Ws8l}7|v2=<*Im!7+9@z40#su@D|FOyJ<yCC6tb$5=#8}yL
zUgd$#!-qRl2kQXnlDOP6z@=C4e$G=)3}6SDVhZ=uR_RaPYfg$_E6qsza1re)S=J7N
zCdgX8iKRfB;RE<vjgl!W)bh<NfXzk;z-!n&W@68nsX()?!kF14YWY(3E`Z4-^yuKk
zki7!E`ajTTw(|%Qe_3}jVp81wBZb@*_>q>n8*rTVy6f=`U3EA3pStY788=?}HdfsE
zVpY?7cM^}#Cb_!mT}#AN{R8Hjpq4L#0n?r`L%s6PDAK=j1m{yuPGC1J@T|tSwAZr|
zgLKoA!qZf)v~ZKH%5NB_yUMSaBJ^g^PglK*aTPuE#yE4zn~=tNd#9;Yt;ciphdRR7
z@2AqUttbDp3OBx3vtxa>ECqSIBKx8{Vz$9WlV(TO47j~>qIeD<%~cZV-=T~B+SI`=
zVC&9)DqW4z>`l)$`Zl^SP3J3Gu#0m1?53)~J$#?d1u_DTXFGpzIjMAL&ZuYR2|)2L
zfDN=FcoK8j`@sZm*m4b^atPq<V?KNaAaE0#?L?cKUISQcJw4xIc4s^G-E5v_+2`5a
pA<aeUka#I9hnHOec%A`x$+FEZ8f4Y5qC@mcc$AvLUYZWeUjZG~Y`_2j

diff --git a/!TheEsc/!RunImage,ff8 b/!TheEsc/!RunImage,ff8
index 75af5846fc79b5c4f8a330a9c191fa2159c59428..012733f428cc2a3f1863ccfd16d5402ce00ea20a 100644
GIT binary patch
delta 2862
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

delta 2819
zcmYjT3s98T6~5<Zf7o4E_*YmF5dOtQ5P7ZO14j_>0ixky&}yTts8F>Q#n;qlWfjmw
zjWWkqY#diJZG2XlH9m%Es;y3`uV_b2Oj8TH`5R@YjhZ-`nr8d`u$^&d?%s30^SbBU
zbMO7PAEC~}WD~;Ot&a#H`~&(4zg38@Yujws=}=p@8h0PaG_hN|i+QFvt0@Z;9^dIF
zdTKe2RMXr2M8|4zNV~=*R8~Pz!e1c?e;a1MBK$%)ecuNHX2Sde^M0Xf)nb=+9KI0I
zCyvf~e7i}AGq;4OX<RPOVlG{}WTn9G0^g$?`Vq@g8YOd<q?+CeTD9_Y$ziJsa_cY~
zM5|Zqa(A!f9a4g6d{DBK+oe&`Gb{H<sisF(EE(>%a$Lx#^f!JQ;;?;a75-2=k}q!2
zWTm$Vz9XD&Q0V}d8xn}Q-k{pHK}%1h@#rkmG7^4@+Ufl>zh|hTgZ$W#K?~R>t2Bp4
z$PRMxkL3(`3M^!flM`q>|3*%uI=(6IlcTYMGrTCYNR~jI<x`-ZDx&8CKMhSIE60U7
zsE`Z8mP$8n@$bU+O0N_yHBP3j+-7vpasJ3yL`(U(F^A^!U{eNd=BcJMs^m2$l}h<N
zQx4VhU+|yJ-<dK@4wOF{B@X3wb9CrH#Ob`nrRG#B;0CjUjNE39C5exj6XIV*iJl0k
zUW!#UAza#(G<|mao=5RRbE(M(abM-K!t<m+6weDEMAx|`Ts0Yb_t@=o@~Q9)I>!&f
zGo;Sj92zl{+&nBIR<C139_`=_5!<BOx7cjiMCH80l4DvJB|73!$n|{HGKChgH8R04
z4}o}CWFl8YE~a$87`cVQxFpI!d0Zc*lFBVnIno!m_*_&a-Dg?J(1R$ka^K=Az+dDw
zN)Bz}V@eu*z;~1>mSd5^-&}nN`Lt-i<#cPB^?e{UfdIC2xNm?E@%wqMb&7NeCATKg
z2G31v5m5|VqSw(_emgp&BoF#R?9e2U;uXq4O;VD*B$~Qb={TCkgp;FLK%@T*;JrFs
z+=uJ>5BYiYb+hrl5TAV_1mawa8A=B{&tn{NWCW0bw}r^Z=)B9R@u@VyQxU(9=pkzf
zzozr-8aM+D@L=FqXtT?SHHq(r3x5eljBt4k;)?bTXnhrOgxgoe!;(fxS8nmolZKY$
zhKmj?!*^qusx5|6QqZV*>Xt6K7E2XZwffhLhxXD}wGxB7n;`os-%Fa4ZtnBa-DFlZ
zI}Yxu>($;%V)h3(3lEB3vo`Qg)C3yAYt*!?4B!vVSXQmuN7Zg$h?we&scpU&Q{8+u
zv$|Px1nuh3VvqQynn%%0b_bd9AIk;ym6oq`Ya|s4jg$O)`%Y@+isU);3qF<nC(z3V
z<<M$AJjhRlo*j-TqBEX@DPtrw^@G$ree=>@SXC3Q1^CdnPKKZRY#TC5`s@>4KIC(K
zw=2_AX{~2fdYB}=4C7yA?4`f5EwhUL$n}|JbdpbH#?l}7YUT?G8}o72ARO@StTM~b
z!i4|P1pRz8Yx8+T_89XtAmJ|q{x`$8vamnz%3erup6{|9r0+zMb0}Tqa;JkXaf5S|
zr6;s6vk<K4G`BlfP`+pIupFXsJUuthQVH>-@;>iVJbQ9qg`oG_M&?<HWVCTbpP;~V
zXXHPKPH=nv4BH-q=;*A1K-sMclRh_T$2f8HVx;PMXLKYfp@zQWTPsLx#RbUQ$E0jb
zftlW<dSxcms#+*2WfiTDCRMANY<G7Xfj<cmex-4bmUd%?R}r%vMj;N|{U+cKgIqZG
zXeBtl%aYtaDc<E>U_f55c@wkJ==K?kTQ$+xs>RSDP4B{9pS7)CJ%+KiG}fyJ)PsDA
zAiXbvz023B@YsU*jpqPUc#~JZiVPUW;>((;@v?T_4m@KM*5cA4>@F<^xD9ws5FZG9
z0B}2SE3jnyW$l6!He)t>hd`F%bZME8WdTnBE*EU}4hQZ8o)3I9@Q<AC<X(ef2nryW
z0Kr5EqLAzpynJneKo8F@7@k=DK!}FiIV&3GF7JJ=7R+s^&z)0OKX>Iq5y2(7(HqZ)
zhz<jCd5D^2t2=RNxPAWwodH?`?E^gowB8F{pa+B2_5Tjq@GW?RJPi6{lxTl3>WG%>
z06h;f2V}W+x39l~`VVw@E1m`X$-p+`xP8-Ax3BzJAl{z|;}cNUA1?)u*GU-92Y;L^
z3S%v&gOaLm0|^ItSz(TTDvlJ6j9Y?rm%_9^{GCILkjzcqT*R5mPYa{7Vi4&C##%UA
zU5tjqs(uMtZ@@amg)FPP{}Tv&J`b6!_Y4~wPO=RSuW(6`V`CN+>y&1%S+sb~aGegm
z6MRgN9}Iqq+U!jV^2y-ilA5u7efo*uH$a{n<m15a1z!;45y^iVd})xkg3pD0bsrz^
zvjFIZ!dpQFC$`iWB6?EzzeSF?FC@{?h}=9FOEB6o>X7+v9$j3O{v01Rb+D_$!UI5`
zg718d{}*@@YW6N)ELN30Xq2P4)*BYBSg~m7l3adLoFDhbE)=ZT?Q3zhbjh2xb{Snb
zg4EJgz$GP%=?b4JSwQ)08&_sqg$+2@gyL`C>aA<Umr||U*U8Jqtuyt*+m$Z#+y42u
zedeAY0)APD9^5s1$G1xIH=HzKt?5IcanSja4^Lof;t>;<CVpRr*w`eyq|Z&-ZhXq<
zn-}>s;Qx{@PmHFSd~af!^wP#ZOw6Wg&MF;4dw5Z49`3G#r8U+S{|@+-+dFVBoxU(3
z%qdJ|Ih4u6%Bt`^<tj_i^~%P}hC)@F$y!;Bb=%i^^Wi2rG3#+BuAVwBpEO?{97-ae
z+b3<I%bwBYHT1^rYeG!BE`%bJ$TX6W@b#zj`7qJ>mC+;u_%-26QOET6UdR6b)A>%6
pT9<peCchuTPbM3AeWfvRWhcC1#9-(@-Rn$@*%-B+!<CDr{{bYLO2+^I

diff --git a/!TheEsc/c/MapEdit b/!TheEsc/c/MapEdit
index 141b61f..c6a5d85 100644
--- a/!TheEsc/c/MapEdit
+++ b/!TheEsc/c/MapEdit
@@ -184,7 +184,7 @@ void game2_setup()
   memset(map[1],0xFF,100);
   memset(map[2],0xFF,100);
 
-  game2_loadmap("mission2");
+  game2_loadmap("m2_map");
   game2_loadsmarttiles("m2_smart");
   game2_fillmap(TilePlayer.mapoffset.X,TilePlayer.mapoffset.Y);
 }
@@ -305,7 +305,7 @@ void game2_tick_input()
   // S
   if(input_readkey(81))
   {
-    game2_savemap("mission2");
+    game2_savemap("m2_map");
     game2_savesmarttiles("m2_smart");
   }
 
diff --git a/!TheEsc/c/Mission2 b/!TheEsc/c/Mission2
index dd54b92..d7dfa14 100644
--- a/!TheEsc/c/Mission2
+++ b/!TheEsc/c/Mission2
@@ -63,6 +63,36 @@ void game2_savesmarttiles(char* filename)
  
 }
 
+void game2_loadsmarttiles(char* filename)
+{
+  int length;
+
+  // Attempt to get file info
+  inreg.r[0] = 5;
+  inreg.r[1] = (int) filename;
+  _kernel_swi(OS_File,&inreg,&outreg);
+
+  // Length will be in R4 if it exists
+  length = outreg.r[4];
+
+  if(length > sizeof(SmartTiles))
+  {
+    screen_nobuffer();
+    while (1)
+    printf("Smarttiles exceeds %d bytes (%d bytes) object type is %d\n",sizeof(SmartTiles),length,outreg.r[0]);
+    //exit(0);
+  }
+
+  // Attempt to get file info
+  inreg.r[0] = 16;
+  inreg.r[1] = (int) filename;
+  inreg.r[2] = (int) SmartTiles;
+  inreg.r[3] = 0;
+
+  _kernel_swi(OS_File,&inreg,&outreg);
+ 
+}
+
 void game2_loadmap(char* filename)
 {
   int length,i;
@@ -92,38 +122,6 @@ void game2_loadmap(char* filename)
 
   for(i = 0; i < SMARTTILES; i++)
     SmartTiles[i].Tile = -1;
-
-  SmartTiles[0].Tile = 1206;
-  SmartTiles[0].ActionTarget = 1206;
-  SmartTiles[0].Action = 0;
-  SmartTiles[0].ActionValue = 16;
-  
-  SmartTiles[1].Tile = 1207;
-  SmartTiles[1].ActionTarget = 1206;
-  SmartTiles[1].Action = 0;
-  SmartTiles[1].ActionValue = 16;
-  
-  SmartTiles[2].Tile = 1107;
-  SmartTiles[2].ActionTarget = 1206;
-  SmartTiles[2].Action = 0;
-  SmartTiles[2].ActionValue = 17;
-
-  SmartTiles[3].Tile = 1208;
-  SmartTiles[3].ActionTarget = 1206;
-  SmartTiles[3].Action = 0;
-  SmartTiles[3].ActionValue = 17;
-
-  SmartTiles[4].Tile = 1307;
-  SmartTiles[4].ActionTarget = 1206;
-  SmartTiles[4].Action = 0;
-  SmartTiles[4].ActionValue = 17;
-
-
-  SmartTiles[5].Tile = 1205;
-  SmartTiles[5].ActionTarget = 1206;
-  SmartTiles[5].Action = 0;
-  SmartTiles[5].ActionValue = 17;
-  game2_savesmarttiles("m2_smart");
 }
 
 void game2_death()
@@ -214,7 +212,8 @@ void game2_setup()
   memset(map[1],0xFF,100);
   memset(map[2],0xFF,100);
 
-  game2_loadmap("mission2");
+  game2_loadmap("m2_map");
+  game2_loadsmarttiles("m2_smart");
   game2_fillmap(TilePlayer.mapoffset.X,TilePlayer.mapoffset.Y);
 }
 
diff --git a/!TheEsc/mission2,ffd b/!TheEsc/m2_map,ffd
similarity index 100%
rename from !TheEsc/mission2,ffd
rename to !TheEsc/m2_map,ffd