From 3946f245c7eba26bece3de9d0b6496ac84af5619 Mon Sep 17 00:00:00 2001
From: stevenhowes <38082088+stevenhowes@users.noreply.github.com>
Date: Fri, 19 Mar 2021 20:21:39 +0000
Subject: [PATCH] Tidy-up and memory savings

---
 !RunImage,ff8 | Bin 4444 -> 4520 bytes
 Makefile,fe1  |  25 ++++++++++---------------
 c/CTheEscape  |   6 ++++--
 c/Graphics    |   1 -
 h/Sound       |  11 ++++++-----
 5 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/!RunImage,ff8 b/!RunImage,ff8
index 765442827b3e45d07784048fcc85996d1ae3c38d..8e3a50b457d2d4ad7ba27e6a5e9f7433fbfb6971 100644
GIT binary patch
delta 1626
zcmZ9Me{54#6vxl)&(}KK>sncHY<+Ap_=B=Sh77ZW0z)!3bYtqGGcz-rGM%Vwh98Mp
zryCPxqs;|26y+)YQD;o1!yjRi%m@Y-OqhSDL5O{QUc;!75fdUNTEDk++2TvSedm16
zIrrXk@9n!>94{#*(haE`qSQAQN_mK``|%T{+fQp=tax8_vz5jvteZB{%?}x+5`jZW
z273(l71$Qoqp&Z*w!;1h_K&b-{s`;~($77Vtl>+T*L4xz6uc_Vn0LXq@Xm*Ia}uO7
z6aNb2EW9<D_-S~H9?;D*Ai+%h6Ohm0m1g2{Jx3qJ{2)b{_(_lvc=?(5ad@jye-b1&
z6F&@c7@m@e55W5y^+!NR#uxN~)SzMz<S%}Mc|9+KG$V)A^d|R%UgsW*x4R2;7gp}5
z?M?0j{S7{8x`D2Zn)SMARdw@Ou-%CL^1ql3u~xAAQ13+j^T_#OUXCw>*^tu&_H%aT
zHspLam$T5YBgulK?SMtwbn^)$oRdrQYy~OD&=xGX5%f#G#OhtM0raUXtpSzCH@o1X
z?1U9yz1f`mku#F1ECc;4ODjO%omaU!TUiQrHJcMc&M^Pj>TM|mErl1GSJ8?Jxd98o
zmLaxirEb~_b@LQ1VU$h?Qlp{-T+wv%O<c<3(8I`mPmVz$Q;j#dhQJ<!|2Fs7o(^=x
zh?cf%Z5?gTwe9Tc)LObUxKHlwYU_04BJ<t0!h0JmG=2;-EGFIT!rOrv<h7svH=R;3
zYaK<!0gQ^jgGuqG>4q0}kw3;KZKbS|->{V|RWiXL!Kltu>xP7lXasE-t1!^UY~fD6
z&R%fWx~$iRw~hLe6xEGp-fk~&1+$Sy`G9>byUfqom$|=Zbj^<j!ZCi+zMbvh)s8Lf
z10Hj%XUF)IV~e|gE}_`DlI`X7&V1I%+nr_I)}MmYw$a+8N=+iF1_V)$@KJ#X=g525
zBl5r%yj3twk^l1^aY_qd?bzlW1=Ecf`T#>GvS~G8`n3}xvg(xtsb32wMUi9#{oYEa
zFWosaYQ(WlH5{DA*TC>mV56u=V4#V2#6cEGP<TRARp|!9+oDZ~n>ar!-ZphYI6@Pm
z#HSlh*o+P)i3Wul`R8f}uU5*sA7M0pH@5K^dBS1c9Igw9UQb_wC?*KY4lASb6SdV5
ziV16lZj?YaZA#=&aM~K064pxH*aTU?2uG5OvCvvdxj2wy;a;@xka-O)Fz^uCu0z|w
zxrhI*xcQ9Y;D0KG>{sq_t+nIcj%$3ID}VEAFJdjMA6pU?%&!|8AUo9?PNGSodecsH
zTF!}&COVCYm(uAJqh5Uc_KVrM|KOjx-der~o7Z6p2rUl>fXp7bXQ-O(kdfYigV@CP
zxF2_&IZ8Bx&+r%giu+aO9c#Ixfo-lGAj%meiXS05J4|H3!AV~xN<Zg)qBNdJ<TjJn
zO0wBU`th+_Ib+tM6>kuof1T(8Bp*493i%-aAfHkjc|vuT%h8m6gdr93L4Ig4q(S#U
M%b^ue2r7sE1C_*E82|tP

delta 1620
zcmZuxZD?C%6h3cq(|j~Fw<d$uc1_Z;&CYg9+PR4g7GXF_TTPoWWUaG8nN=vdsVFjS
zLeq{)KT_UVk=pJ;H|=mjw}Qxu+UW*W@?-c#as6?V>xIN9>yIf;=Hl~aH?+tu9L_n<
zdCqyyc|Y#lmetx?A|)lnNt9bKQLdcmW>O|f(7msxVxsn~<`y$8Qb^GxQnVRHxf|Z`
zG=u#S>=oE1*t4*If^CMa!2TY#;7`N;Quwa%^kdx5-1e{GCE*1*WA3s=c*`M0y9T7L
z5MKcD6};L)`~tknrxfjTAP*JdXMtRT=PtxW{mG{l?GqrSh4_0w&cTyJylxC$Bl2f}
z+<{F#C566H%K=4WvZ4(E8%OL<9yGZd`r-Y9Y6&2J+=u-JuohGsMqC#e{VxMKiVW5g
zPsf0+-Y4rAuoIZEq&1#?9h@IFa9Z{&ni+jOD>#TH{}+=GI}Ge`<Xe&d5;)(ibB?Aw
z#vp9~Zy1eqgLHYFl(K+hLZJh|YT6X-2;!GE#EYA;57=%jWWq2V;GE}vv-{B|pvMgK
zNuc6*i`!UZtiA(S+~7O`&ijQ-KhVz%v<av<jACY^ky!yOV{je;XOLesyW3nq{qWw|
zkkNw-u^l#GwTM;jR5Z(GMf(_+cMO+TOm|xFDWJ)7o%Ug1&G5(hR_O(PL8{)<W}?Lp
zz^*1mdkwk-Rm9c*>ux?L(-}QX34H)rcoG`Tb!H>4oS<Za-<7tpJ$$QW3p4R%OO<_}
zLFwgvma0unhW8w_M1yHcD5+=oG<e&MNQ7Up>}5am+m`JPobPW*Jg-{`zN4grRr9w?
z4zgK(tz<vr++scGh^-S2TX$Bz3O5w+>Sh|q9PmNQ;>DiP`}nkVSHFuIvb55W^~|@X
zWt!4Y%U+!*raNIv&^Blrv<KP=J&y_!vZ=Q!+kwi%Ou|FQus&6*kbwuIsyP@_8Aa1k
z3IiX|Z|C#BJg_#O>YBjDhOk~pNd;7JX{J%9_NeMx^6Hi=BdX*Z(d{TClATK<X$OsD
zBwxL53)O=>rU#<`W_*0qwyXOPqs2|w`(ANcIQx+>+G25)$_G`V39!SOmFTiF5X1TK
zj1yxz>0*{JybF0pkY~F-nr5Lm+B~G)M2ie~0Aock77yAt^EP`GyUt&<@9pzpIp_0U
z-6l`!EF4m$(4;QX*5*3D?LBTR%}%K#Cv*$7r%H*wBWl;|Xu*SFY~euG7RKbz1nr_P
zGAHx-oFrPHIR0}(da;!pXO5|d>#<iJli2HoPAsbSJcx5)F$@PE!{P5ai+x|<R~=pU
z;~x^8#g&Njy3zr*ZQ;|>2y3NLq9sVz6w#YAL?)b*@C8x$OXrF5_@dE!n7C5{D}KTk
zCnn+x;WEX{yUQfLCfjP%cZp6yq7d<ks#hV)kmM-$mq&P@ymYrH{^JnQ3S<?cLVks0
SAiqP_Ah#fYL+(K66w!Z6{b{QJ

diff --git a/Makefile,fe1 b/Makefile,fe1
index 4e001e7..78a5da3 100644
--- a/Makefile,fe1
+++ b/Makefile,fe1
@@ -24,16 +24,6 @@ Linkflags = -aif -o $@
 
 
 # Dynamic dependencies:
-o.CTheEscape:	c.CTheEscape
-o.CTheEscape:	C:h.swis
-o.CTheEscape:	C:h.kernel
-o.CTheEscape:	C:h.kernel
-o.CTheEscape:	h.Sound
-o.CTheEscape:	c.CTheEscape
-o.CTheEscape:	C:h.swis
-o.CTheEscape:	C:h.kernel
-o.CTheEscape:	C:h.kernel
-o.CTheEscape:	h.Sound
 o.Graphics:	c.Graphics
 o.Graphics:	C:h.swis
 o.Graphics:	C:h.kernel
@@ -43,8 +33,13 @@ o.Sound:	C:h.swis
 o.Sound:	C:h.kernel
 o.Sound:	C:h.kernel
 o.Sound:	h.Sound
-o.Sound:	c.Sound
-o.Sound:	C:h.swis
-o.Sound:	C:h.kernel
-o.Sound:	C:h.kernel
-o.Sound:	h.Sound
+o.CTheEscape:	c.CTheEscape
+o.CTheEscape:	C:h.swis
+o.CTheEscape:	C:h.kernel
+o.CTheEscape:	C:h.kernel
+o.CTheEscape:	h.Sound
+o.CTheEscape:	c.CTheEscape
+o.CTheEscape:	C:h.swis
+o.CTheEscape:	C:h.kernel
+o.CTheEscape:	C:h.kernel
+o.CTheEscape:	h.Sound
diff --git a/c/CTheEscape b/c/CTheEscape
index 46497aa..4a749c6 100644
--- a/c/CTheEscape
+++ b/c/CTheEscape
@@ -12,6 +12,7 @@ _kernel_swi_regs outreg;
 unsigned char *buffer;
 
 extern struct CompositionElement composition[128];
+extern int current_element;
 
 void intro()
 {
@@ -77,7 +78,7 @@ void intro()
   currentstart += 100;
   
   draw_sprite("tng",320,400);
-  
+  printf("%i elements at %i bytes\n",current_element,sizeof(composition[0]));
   sound_composition_start(clock());
   
   while(sound_composition_incomplete())
@@ -87,7 +88,8 @@ void intro()
 int main(int argc, char *argv[])
 {
   sound_on();
-
+  
+  // mode 28 80x60 640x480 16 colours
   display_mode(28);
   load_sprites("Spr");
 
diff --git a/c/Graphics b/c/Graphics
index b4071dc..9ae2c18 100644
--- a/c/Graphics
+++ b/c/Graphics
@@ -61,7 +61,6 @@ void load_sprites(char* filename)
 
 void display_mode(int mode)
 {
-  // mode 28 80x60 640x480 16 colours
   inreg.r[0] = 0;
   inreg.r[1] = mode;
   _kernel_swi(OS_ScreenMode,&inreg,&outreg);
diff --git a/h/Sound b/h/Sound
index 805ffe5..b20cdac 100644
--- a/h/Sound
+++ b/h/Sound
@@ -1,8 +1,9 @@
 #define COMPOSITION_MAX 128
+
 struct CompositionElement {
-int Start;
-int Note;
-int Volume;
-int Channel;
-int Length;
+  signed short int Start;
+  unsigned char Note;
+  signed char Volume;
+  unsigned char Channel;
+  unsigned short int Length;
 };