From 85d5424f9eea9b1285f9688c06cf4d65fd288615 Mon Sep 17 00:00:00 2001
From: stevenhowes <38082088+stevenhowes@users.noreply.github.com>
Date: Sat, 27 Mar 2021 22:19:24 +0000
Subject: [PATCH] Intro screen enhancements

---
 !TheEsc/!RunImage,ff8 | Bin 14756 -> 14868 bytes
 !TheEsc/Spr,ff9       | Bin 39044 -> 41544 bytes
 !TheEsc/c/CTheEscape  |  63 +++++++++++++++++++++++++++---------------
 3 files changed, 41 insertions(+), 22 deletions(-)

diff --git a/!TheEsc/!RunImage,ff8 b/!TheEsc/!RunImage,ff8
index 0f83138f45d0dc14b6099de65ffb2b2612480f31..73db0cd6d253ca48d45cb7a1e7e215d12c3becee 100644
GIT binary patch
delta 1639
zcmZ9MeN3BG6voee`vEO=6xXrQ71~VMx-hV-WNYT!`j;_LSpy^{W3IA+WQk)&K%5iX
zsf~*t0l9!5xa=;HIMJ#2ItPVJr!F%0hgmd{WX9OO>riUqCW}FW!{<V4n)fCrJ@-7n
z_c`ajA02AzYcD1e2^lt`^vgC%7ZLsG4U80TVLVV}i_F?+oI*mQpwNsYw3}8+PrJL5
z4EX}`tH>4P{~%8wHz5BT`7g*NKa1R1fPG<iau~nl5eXC8P5Ok!>_RI;Z3^1EI!%GL
zx_~0-Ni@F<U{D7b02HEj30j{{GeXNptz@szzJdO#PM3`dwR6y7I!!i~hZzV9?QCJB
zJK3cJWaAqEMsV>{I!!j7f#yf!Vd$+oT{ccaAB5JT(`4f-(B{$j9q3`HM{;hLZ2SX&
z2VmY0;9;GCY<>y)UKp^3Sn@S6H9AHP@D-SnM}+n~^!sx3k{v>mL&Tv+pzVYf$v!VB
z$^le}+d@Li+Y?K60@{*e;P5R!(_t`IGD92$Q<=k<z{o*Qf+@ogEzrwzbopM$A>M*s
z9TE{u!AZh^Tse>*kQ}B5&|@K70HzMi${eN)j6Cg2U|!5HHDIhcjP#Mso&)oFh6#dU
z|1%MhkdO&b2cX|FPyo;z_Sw7B1V#?@IBHeU<ol7U$w8V?+lCKpG;|_0#A2zf$j_oy
z0p9NsS}_>Kbu`&wp|n8`Kt9d4^HhVS65zNrq-w34$hi^wp`!lOr2Qy9!%(7<=xr7h
znhQn)cVXC4p*6w8MKsfEs*iX_iQ1lM+~2&f@kzpJZ*2*;wG%P;S>eYregp1hKNI{E
z_!Ypf3x4loFowbIf#*Ja(myTD;?p{<wDv+KKfk!>^qp$>U3#}S6SXuRY!0JoXKR=r
zGL^G$dB5ohyTOah73><n*Svb87hTCN5*GX!yeW^{BNBKq68$m{F4xI^JoP&7GJjwQ
zu5<H>yi#-hIMJ~&UYqA<+tpa!TGNUsPUjjUTEMR(&OfqMS^GNNsrw&wr{>;Jui1JT
ztLBGSOj`ngqBx3&A1ItwnvSTo_8F#xZc}&M9%trHo^_|}htyjuZ!z|(`tPb)gR*9f
z|5dWvJON|xD6e&{SL(;rXPom2JEnG&e#{g{TwU+3F_@Ox^TX?2VRqGY$9oF9sGcq#
zWM+BeL!-QALoIt+J-OivBm0pzZrY!%f46C#P4EkqyV#Vvs;W+5SNQ=S&#KDibC%2J
z@wi|z#V>Atf$dTs^4GBk_k4x}pCOv~62jL+3K+Rx0<rgePqc^?jV{;Z6tb3Ga_@-a
zUPOu1>vs!7Z?%#4Y|Ss*{wWMch<--MB~3kuI}zS9d?c`2wFjD*?~f0Ot|M+D<`4@A
SI!$Cm<RfedJHmljgZK~4YJp?`

delta 1509
zcmZvbUu;uV9LIm>cJ10Spfht~aqAQV4s_Hybr2H!;Dfrt2s0*biQrfi1r}xHfdIC~
zEg?$WvIBEOkn_-FBNE(l8rO};-v{<!P#;j2DcauEIf@b$HCYJr`=h<4xq6dd@;krJ
z=lssO=iGZJn&_+~QfZDdqFhHA<;sa}q@En9d_qWfMOo~dGCECRWtNaKC%u%L4)kOM
z@-*@^as&BQ<X4e9kWV3>LeBoT$me;yxF^%IfO1r$(x|5=g31&=Wjav10(QX046s|6
zHxX7b^D>0EP2kBlSpeH(V?6m6uzNQs^E~*QHqLXi;HSY}w=tf}FVo+o%p`c*g4lm|
z{WXMBfUW;C`3tZR79Ip|wsBtg68HdE#Kw5xb6|5=_z3vZ7LOGjR|-NSn)g9iX9)$)
z4TiyALIcs*m3bG=V>X93FbHQ?SedR!SLQ7^D~p`Qr*I{3K7z9sY#CV0x-*6)fFA&^
zMT1f_=!E1iYETi(-|PEurV1N*4NiHH<AlST?S@mmUYT3LJw@F5Hui(p^Zgrmn^s6v
zB!vo1qL5y}X4q+h^EbxUhN}yk*^XLQ!FdkOuSJg4rwz4F3(h(?{C(v6#8jFkKDrlC
z{J9|2L;CJtNu}H2@X>8VZ6(+h8{?CE7PVDi{i~JftWxG?59Mkx-jDGKaB<(;nHJRU
z#!q+{?oZrfH3d!IP^-s>BHv3JDf0#c)O)<N^!q~o*ZjO6-mLUFpLa()UftXoC6Zq{
z8^nb4xb}+QWw&dUn2{r{dunUZi+n2W!MAgSPqi1nCC2@nhx2vv9n1E~-&`L%YHE(l
z<E2&J>2abZV??P@d7(5U!urqBrOrjZ6wyh<K}2FqRxhmc4(twOpV<<~9zCpISlA~-
zgPdJ7<C%aE$6G!qCl}8c?mhZ~@0u`fdiANh#)T`nFOW^{&>a=Gh4?}5to*}a45eh7
zzr_{7JYLej+?XEM*ZgyaSfaC4p9mu{ruzdM9L_t-%h?Cs6Qp-98#F{#S1tcgxKg7;
zKaR>XD>ezYE`R83iD;K!J-pSbuYF`rMC9XjO=6qwu4^_#R89t^MRz@V#`E%dqFyxF
zCf9`C5!>}=p=J@euJOW2qR2Ubi$n(H$9F`Ghc6S&<B7-flX(|hvmPENaE#3LmU`uo
zZ`7CcHMpxkA3;OJ4g^2E$S@*_NG0X{Yg%-?p<M*`oy25B7vccoAfgv>2r+;-icp9I
HVhHgMA!=mb

diff --git a/!TheEsc/Spr,ff9 b/!TheEsc/Spr,ff9
index 5ee9f7f547ac6f93d8d956428e038e91a64597d4..75029c524ff251ca47d449cf429f11bdc371b605 100644
GIT binary patch
delta 1634
zcmZuwt5O3&5S&UuK_Vam#Rs5}XOK7qisA!!6zCMVm^1vrMIb4348<=*p!go#G2K10
zx0lK$nVp^P>E4~HynRi6Hj~+jna%xo{rNRpzMpNTX0MC;$ESz;7q8l>{|=G(I`-fB
z#O!bX`}gW#vbXltT|S+5i|31OaXW26T4DLtaG5!0wPH}j(KFJxCzfTMD{=vlunvlu
z97@tyYq0W<0=7J|H4j7CGcA_Dk0z$2xK6XCN{D7)TgynnL21O;WmYWViErhhC%P+#
zG6W59dx|ZF!}q&N0VS$i;aY*fsT$+f%h06js1Xs(Sm{t_1l*sjftVU0wew|?+*YLq
z+eTS<mmV0T=i29A-JmjCX^uX|ij4trNM%we)C9-{h<eQ<(J$jQK=PV3jb|v1{ucZE
zTXY{cC*6E{*Y(qbw(om021Oh_15tZoaSU!nE&vkNvqd}QnZn6G3fQb~b!MyT1B00(
z34*FF#^|ITY-tfm6h+B4b%jO<wPX&Av4b4LsPaoU?T{!_%v<25l+~Vuc#~Mpk$?K2
zA)pkk9^?o?%Ep**U+*b_hdibkP%LN$IZrKnOH~%=R~BsIsH#8dyUJu0Ce_0fh&sig
f!$XzVW*P%0I2vQ6OuYb=19TA{kWi%Wj%Le$h>g!e

delta 21
bcmX?cgsEjC6PGXp1A_n%cg)zxRW$<uLGlIQ

diff --git a/!TheEsc/c/CTheEscape b/!TheEsc/c/CTheEscape
index ef60dc5..fcff78b 100644
--- a/!TheEsc/c/CTheEscape
+++ b/!TheEsc/c/CTheEscape
@@ -115,7 +115,7 @@ extern int screen;
 void intro()
 {
   int currentstart = 0;
-
+  int introframe = 0;
   sound_voices(4);
 
   sound_set_voice(1,"WaveSynth-Beep");
@@ -128,61 +128,80 @@ void intro()
   sound_composition_element_add(currentstart,1,sound_note("A4#"),200);
   sound_composition_element_add(currentstart,2,sound_note("A5#"),200);
   currentstart += 200;
-  sound_composition_element_add(currentstart,1,sound_note("F3"),200);
-  sound_composition_element_add(currentstart,2,sound_note("F4"),200);
+  sound_composition_element_add(currentstart,3,sound_note("F3"),200);
+  sound_composition_element_add(currentstart,4,sound_note("F4"),200);
   currentstart += 200;
   sound_composition_element_add(currentstart,1,sound_note("G3#"),200);
   sound_composition_element_add(currentstart,2,sound_note("G4#"),200);
   currentstart += 200;
-  sound_composition_element_add(currentstart,1,sound_note("C3"),200);
-  sound_composition_element_add(currentstart,2,sound_note("C4"),200);
+  sound_composition_element_add(currentstart,3,sound_note("C3"),200);
+  sound_composition_element_add(currentstart,4,sound_note("C4"),200);
   currentstart += 200;
 
   // DUn, dun, daan duhhn
   sound_composition_element_add(currentstart,1,sound_note("A3#"),200);
   sound_composition_element_add(currentstart,2,sound_note("A4#"),200);
   currentstart += 200;
-  sound_composition_element_add(currentstart,1,sound_note("F2"),200);
+  sound_composition_element_add(currentstart,3,sound_note("F2"),200);
   currentstart += 200;
-  sound_composition_element_add(currentstart,2,sound_note("G2#"),200);
+  sound_composition_element_add(currentstart,4,sound_note("G2#"),200);
   currentstart += 200;
   sound_composition_element_add(currentstart,1,sound_note("C2"),200);
-  currentstart += 250;
-
-  // Duh
-  sound_composition_element_add(currentstart,3,sound_note("A3#"),300);
-  sound_composition_element_add(currentstart,4,sound_note("A2#"),300);
   currentstart += 200;
 
-  //REM Dun De Da
+  // Duh
+  sound_composition_element_add(currentstart,2,sound_note("A3#"),400);
+  sound_composition_element_add(currentstart,3,sound_note("A2#"),400);
+  currentstart += 250;
+
+  // Dun De Da
   sound_composition_element_add(currentstart,1,sound_note("F1"),20);
   currentstart += 50;
-  sound_composition_element_add(currentstart,2,sound_note("A2#"),5);
+  sound_composition_element_add(currentstart,4,sound_note("A2#"),5);
   currentstart += 20;
-  sound_composition_element_add(currentstart,1,sound_note("D2#"),200);
+  sound_composition_element_add(currentstart,2,sound_note("D2#"),200);
   currentstart += 180;
 
 
-  sound_composition_element_add(currentstart,2,sound_note("D2"),50);
+  sound_composition_element_add(currentstart,3,sound_note("D2"),50);
   currentstart += 50;
   sound_composition_element_add(currentstart,1,sound_note("A2#"),30);
   currentstart += 30;
   sound_composition_element_add(currentstart,2,sound_note("G1"),50);
   currentstart += 50;
-  sound_composition_element_add(currentstart,1,sound_note("C2"),50);
+  sound_composition_element_add(currentstart,5,sound_note("C2"),50);
   currentstart += 50;
   sound_composition_element_add(currentstart,3,sound_note("A2#"),100);
-  sound_composition_element_add(currentstart,4,sound_note("F2"),100);
+  sound_composition_element_add(currentstart,1,sound_note("F2"),100);
   currentstart += 100;
-  
-  draw_sprite("tng_st",320,600);
-  draw_sprite("tng_te",425,500);
+
+  tick = clock();
+
   sound_composition_start(clock());
-  
+
+        draw_sprite("spacebar",(DISPLAY_X/2)-106,50);
+
   while(sound_composition_incomplete())
   {
     sound_composition_tick(clock());
 
+    if(introframe == 0)
+    {
+      if(clock() > (tick + 200))
+      {
+        introframe++;
+        draw_sprite("tng_st",320,600);
+      }
+    }
+    if(introframe == 1)
+    {
+      if(clock() > (tick + 600))
+      {
+        introframe++;
+        draw_sprite("tng_te",425,500);
+      }
+    }
+    
     if(input_readkey(98))
       sound_composition_stop();
   }