From 5bd81b2cb296b458f20bd73cf4c6ec19844b24ea Mon Sep 17 00:00:00 2001
From: stevenhowes <38082088+stevenhowes@users.noreply.github.com>
Date: Wed, 14 Apr 2021 20:37:41 +0100
Subject: [PATCH] Read and highlight smart tiles in mapedit

---
 !TheEsc/!MapEdit,ff8 | Bin 7496 -> 7920 bytes
 !TheEsc/Spr,ff9      | Bin 109796 -> 112952 bytes
 !TheEsc/c/MapEdit    |  62 +++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 62 insertions(+)

diff --git a/!TheEsc/!MapEdit,ff8 b/!TheEsc/!MapEdit,ff8
index 6141bb06ed341d5ae79e07ab8930e993bbdbb85c..c5381e551f8f8f30c22becfd377e76378c568823 100644
GIT binary patch
delta 1806
zcmYjS4Qx|Y6h8O$XRoE(Uc2JDwf1$D$xlGam?0=&S!5E2+Q@_`Gfq;-7J&^mlcDI^
z+36&MZC+pmuze~f8jX-F!~~2mF>(AzAQJJ1nD@iYeu_9_Vx|$E=WZS0B`3Gvx#yhk
zyXXFN=#lZ|VE{$r<^srycF4K`{s;vDF2mFpd$cdyP}s8d<sGf9jaxRgaIdeguV~{D
zJDh^3qS-((mepsNT~ahRyggDG%P?C=(M0q&U_q&QKdUKNZxjO@irXNYhjS3w&#Z+#
zdQDI<6pZ=DG{-_|fYoSg?^4kv<e_{g@<~{Vmkv+|k@KtUFgE`?0B1-s5_CI}i)soI
zx)+k{Xh>$9cCj7$+RHc9-lOnFy?j^U&6s>wVJN3?_QmzO1a%LHsM3Fr%0g7R9aRdY
zNqrs0Vylb}o|BUl<C3h{xG`EuDxCpkO4kuL-9hF#zAc*)l%*e&*@DYXFOdh^XJL9=
zO6gAM)cG2?gdxP<91b9^kyCmwhkb}kf+>AY4to*5f%6qPEFnICcv%j+5FbNaox^-r
zD=<Gch5d#V9U2C_kPC=3_(x3}jE$%1ULjoagAGo-X@%?{+Ag%yXcdxT9Hi%jnnk~3
zbK;m7N987ZM-dO*gBju(*tB(~nRVglqRTCEU>|PqW!&7YjV&#WP1`E?DcV}`(&VwC
zTP*V(`;c@g_H+;Zz*0mS=m|>`*+R>$ub1(25r?EMz*!cxDw+jHCv@naLyGOhj8$~d
z`U;sx7ucw1L#b_XnZ0KZ(=nTe{7rA$mXHzpuzfN4l{VU!%>3TM_b_7oSon<R(>tcW
z7Ap+V6ZZAxUs~amc=;)PSC!1_U>~c;`WLWX9UNtKn3X}hK^Nr}k$$==Z(+N2rpzFj
zP`jFwsuivcw-sd=NPR3hm{f_UTb)%dGve-0yCj@Pi^Cv`!xh#Z0zGEQu&Z*9eiZAc
z%2KK|+@T6(iYC<KeZqSb!TBZuva@gm=w*q)gbG5p+QvCaQtg5S{VT7;b{ZSJg1W_G
za-Gf<{p37dCCbD{H;HnvO_<8%tF_~u<8{-8Jwm3i$5SfM55;hMKc-(>s2Kmsicx@c
zU9ZZ_1^p~4Dw-tqvz5MtT9Cuj5;(nQa!%2vmr4lAiz$W|-eDuFW!4FuDv*>4p<b2;
zisr?50u@?5K&eOSWyGgwD}BmFEm?-W%B@|(bpjG|@`M`;dT`FIXxmZbFo7(I;h}@)
zjA7F}8R?RlH`LDr_-UBnAw08~s3I&Fg@~dZ>B}$&l5WQS&ZSEoew!1Q)<mDjUoT><
zb9ATUvCR(byfvg~{MEuIL%W6y{MDLBWcU-JRbw__OfZzv9l4kr7$cP+Gqwca%CHS0
zcp9N}y3QP|{t?E+qmS!c?XnUYbQU*86@%2I^jp{<p{`T+*<}_F9cQcgn~6+rWWq9&
z>{evrzGFEx92a2KcM+e(jk<+vwFHv7AAMh;kH1FapKTZ&!8_8GrfKIq=j4^b+tr<>
z=bc{&wNKF3X6&wh>$aIq-!UhT{(q+FBzPz$aGc1KSqvLbC$EKKz$Y6<C%OTevEbU~
z9ngwnb<?(1eqY<t15dhE5c||aJ+L?bX^YUDroTy5LTj3a-Bm(cnr?QV6mF&m!kz<y
zFp?fP=@q6E=r=RJcK&%0VB&p%HGAmp`#OXxKMxcXKTFos9s=+l2Dp9!r!N5rNXIb`
z<v98afQersG3DbDxNrL7cpQz-4;=R?7J9~KrLlk*tUQQ+W&HqG(fG%!`p^Psp~Ey8
NI8A#4GidaF@qZ1hv<(0N

delta 1415
zcmYk6e{54#6vxkd?dy-xt=&4M+n{fonM}ivZ5W6@fKHc%1cU}jRE7zVYM4P*VZ;$J
zc37AJl8u}>oN4JZ!NdfZKn+o57760Yk3VLJ{4g=L@9|_^;~e~90tV{$vM%u^C-;5M
zJ@@>2_ui>xsTXRAw2TlJQSPWhxl*FPyXFv$(e%)k9IoBUXQaxy=WH}g0WG7DW^`^!
zm^P1=DW(16+ky#Gsn#+M=!x%2-Ua_!DQAa<8a^{i-M#wze$9|8yY(eD$|07q1+xdU
z*!>1K%Bp)@p^2^-)*!EL4s(gL5D8J|QKF)1%~;L5B$ZFeE@x-8YKlOY_@X>do=|vF
ze)?k>{z9IpUPSwJVg3kpq`>6`egIyjMs<II{{dI{qk4UT?}0zUdQ*WX!2{rz3OoV+
z2HaZUKfz7dADreYLx&;*gAE0PhOJfE-%--aI1gEBD^4pkyb(P~KsG?)kS332^l{d*
z>X|Fp9KyyBGS5Rh3QqlxFMyrs;(C7Ds(J?U`HA{C(R=MXceZzIZ(_|lf9?ke@I1N_
z7LNPy8^W4#c9UjUw(Zw9a@N`*t>rhB59O{HUswFrdYJK))yE!NP%7rlHde+hNP_R%
zmP)s{(Y{o=!tM6O(g?@xOP@G}HKGRNntN^8(4&0SdPF+TS^MkK7u@Xd)(yekMmlD$
zfZblm%~w>@<>@z@eOji3`ptkt%fxuMV^PgixoT2(B>ic)J8h*KcU<0tNuI-I_xbL$
zRCXxs;Y*Gx=WRJ*ey{fGJ^YtrcEwMibu#6?!%Wm?M$SjlBp*tLc&_uQxyR6$8mxvI
zG($8{97-I}jGGo@$M`L0m2{GKJ5|ZWgHF}&D)<o9*l<7<SbyT~m80(7vWF61ch=VJ
zfx{b%G~<D)8FwYh?b(H5=*Z(DJf0(Fvm=r&;l?8GvNAy^aVB}GCXz0%?lHgZQB9d{
z-jVPxe_Sl39Y}>5v`qiugy}?TA(S?cZxvN34kUhn@8hctQAfFA){1xRXr>jZi9&GD
zGruASal57>332c<E!h1CP4-tub!WjwhfSYPHOrAF(JyxtYRFiKDrfxE!~2)82?bho
zDY#Gn!N()BX1515Lu%WnPX=&1S4Z^|ifV?cPnj#l-A1HRMEV1fgcs2$p*smLGh70%
zJ>U!I)+B1R%<0xEpgRYhxaCvF+p+<i)O3uOyPlPA$9RWpNKUtMZSeu+tB3jAFrO~=
zE{xh$Gl>7n2qm`B*KOJ0L826%g4e=3=ql#cj_sY|IU0*4?-ehXY|~Fga*2D5MNY+d
zf7#3O)fivKG#29$?>V_8p1kZGkmW!;x#dZDW&^)Fd!%UaXQCi{9y`cQzP<8`za`K5
z)=8}=J}25XNEE$@BvM2&!U-0pg2%5B<uM|WX`M(x=w^oCmGR`7$}<-Kp#h?L$b5(x
W!cQ2|3F#W-8vp1lXr;$%ME?QDwInS7

diff --git a/!TheEsc/Spr,ff9 b/!TheEsc/Spr,ff9
index fc4972cf27a3369a3a0c37d7c4b008549be82420..3b368b6b8985dd0e5b718da6e47fa9f57bac9757 100644
GIT binary patch
delta 1372
zcmaEIlWoT*HZEBP1_l8jw%OUpwUvwU)*8+b9tMWu+{B`i?K2lJDl^q5kPH|YNY;{o
zQx87-acaV2KdE}a_LHg!WIvVk;PXGkn^dw0N0=emPg{!+_M_N?WIsX$78Z&oEb`cd
zh|z;#KQWrnEu%mWhW+Sfqwp!P2*n%(2Z#OCw+LY+GK-;}0hvo2o0^W3L$&fh3YURl
adf^I2-RTJ{7+JT^TfykYGJU}c#yJ3tG49|1

delta 24
ecmdn-iS5ZvHZB<k1_l8jezB&JYbzJytu+8<a|jOr

diff --git a/!TheEsc/c/MapEdit b/!TheEsc/c/MapEdit
index 0ab1bae..78ad2ec 100644
--- a/!TheEsc/c/MapEdit
+++ b/!TheEsc/c/MapEdit
@@ -15,6 +15,7 @@ extern int screen;
 
 #define TILESX 10
 #define TILESY 10
+#define SMARTTILES 100
 
 // SWI Registers
 _kernel_swi_regs inreg;
@@ -59,6 +60,58 @@ struct TilePlayer_s {
 
 struct TilePlayer_s TilePlayer;
 
+struct SmartTile_s {
+  int Tile;
+  int ActionTarget;
+  unsigned char Action;
+  unsigned char ActionValue;
+};
+
+struct SmartTile_s SmartTiles[SMARTTILES];
+
+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_savesmarttiles(char* filename)
+{
+  // Attempt to get file info
+  inreg.r[0] = 10;
+  inreg.r[1] = (int) filename;
+  inreg.r[2] = 0xffd;
+  inreg.r[4] = (int) SmartTiles;
+  inreg.r[5] = (int) SmartTiles + (sizeof(SmartTiles));
+
+  _kernel_swi(OS_File,&inreg,&outreg);
+ 
+}
+
 void game2_loadmap(char* filename)
 {
   int length;
@@ -132,6 +185,7 @@ void game2_setup()
   memset(map[2],0xFF,100);
 
   game2_loadmap("mission2");
+  game2_loadsmarttiles("m2_smart");
   game2_fillmap(TilePlayer.mapoffset.X,TilePlayer.mapoffset.Y);
 }
 
@@ -322,6 +376,14 @@ int game2_tick()
 
     TilePlayer.rawtile = (TilePlayer.mapoffset.Y) + TilePlayer.localtile.Y + (TilePlayer.mapoffset.X * 100) + (TilePlayer.localtile.X * 100);
 
+    for(i = 0; i < SMARTTILES; i++)
+    {
+      if(SmartTiles[i].Tile == TilePlayer.rawtile)
+      {
+        draw_sprite("smart",TilePlayer.localtile.X*100,TilePlayer.localtile.Y*100);
+      }
+    }
+
     sprintf(textbuffer,"Tile:%i\nSprite:%i\nSolid: %i",
         TilePlayer.rawtile,
         fullmap[TilePlayer.rawtile],