From 0e6769be19e6326b3fb8af2654f5bc18e6116375 Mon Sep 17 00:00:00 2001 From: stevenhowes <38082088+stevenhowes@users.noreply.github.com> Date: Sat, 15 May 2021 22:43:41 +0100 Subject: [PATCH] Remove/tweak more sprites --- !TheEsc/!MapEdit,ff8 | Bin 10424 -> 10396 bytes !TheEsc/!RunImage,ff8 | Bin 22632 -> 22632 bytes !TheEsc/Spr,ff9 | Bin 104204 -> 61480 bytes !TheEsc/c/MapEdit | 2 -- !TheEsc/c/Mission1 | 7 +++---- 5 files changed, 3 insertions(+), 6 deletions(-) diff --git a/!TheEsc/!MapEdit,ff8 b/!TheEsc/!MapEdit,ff8 index 75b1d3f6be3ac5ef73e3cb9a4c68c90cbfd791c4..b33f28adc6e9236c0d72d428acb65485fbbbb1e0 100644 GIT binary patch delta 1397 zcmYk64Qv!u5XWcsZttV*U2l6=X$!r*>!m5!Dy206MQy7BCV*`%f(T6@DUk|=wl)S( z;vKeDVoTG`aYZa)k(!eDNvs;HCJFIb@hulj|3Yn8juZ3-MoRlFndn(#1X#A$2`OiYSE}4^3b_NiSgaVQ zNn_=6tXxDZg@w3|dW8A7i%tlShSwhhK#1y-&|sWTr$2pw^>)_n*b0$sE%#7UZGUyKHAvX`Nq`t4;e&*7{V zU$>qGJ$hD1F$$O`nFAIFn3v1ldeCAYb78PspKEar^KOn;S?pp?Fh6Lqo%sXir4|Eo z73&*rbCEH_?Q5LyjFnKidG^#5CrppfN--jR=Y-E*a6sx4wl21hDJC|BP1dwn@0@gDk#ui4b>s>dtz9$yW*;i|zO z=^^)g{D#`x%TS>c?iVpZ3$li>oxaW5j;rYY>|wl@&SckMkffX%^ipF^jd0UWLpekE zE0ua=JVQ%7HGC3!JX`P`y6BnZ`9g%$dKfk9?T{LxeD69Orw(uVyguQuc~lMf7>oylTWOHliL-RGS zY&HxYHW8|fod87*#|}*!*!~Q;|YFsmssn9pUt@Mun8qG zHKU90zPM@1H{0`<6$Pj?3Q3au#n*Ws3qz0V&WxUGo#Kqy0Ml{)ZUR&%%_=V7yXV_B zc6I?kbEveH9qhJz7sVt$@8N!_91qciG=>$_nzsxu(eb=$x6&w^BG+xD^LdMfzk_tQ zzesv1w_YDXK5w;;>A2xly?~zbmr3KTve^dFb!>?dRvazHImz+Hc5Fh2hZ|wg75O}3q%!wI3HwBR95sls!XI9V5 q{Xa51lAMYpZNc#)01a%b*fJwi<^bCWn=(ohWn1WnGAC8c?fVZ}pb51A delta 1413 zcmYk6drTZv6voe;-Ps51YxW@p3bV@wX+u&d&@{CwMWv-_2~f06ZB42|Yz4|vny6`O zcPrRGtnxSuNTp$j7-&*0x~(Bf)FwqSzNm?*ujo8FM%WtLM2$7l^-Q}ay~&xG-#y=V z@40v8&Pc;_LjXWhjBo%X+ij2(0Dhn83k-24d*53H!dKMgi45q2t{qwyz{$`06ra;- zhvbb^YH?-);0iMK6o1+Vi+^AnD`s;z%)*87w2gP}(EMcUwL;Pwq?t+wbk5zQ@_CZ> zIV$ArAm_ta%dKTkU^iF7VtAf=F!bys0E4JH2ld)-snmN_=Jjk5o6SWm6JItL9SxJJ z$7cF7az0Lv77iNT^Di5 zR>{7{`|Ks`OKh`mVl#N&eu$mI)fq$V8T>S(o$bPPnL}(1UdpUwg(x^GSpXXxl^oAw zzoVbYSm+elw^;40q%Wb{*}~qz>&`6aEDy=uFs^SmLvk1cu3hXRcDRaHj&P&;gxI5= zqI_4VOEwoAlev(ja1lwdcqHX8<(o{9jNq)RobRXidKQ;lQdDg9NKsPFC@)ftp&hXHc-;F7y2Z$4ktp(7@nsX_=2>3$jopiJ3G zigB#+RPL;xdNxxXtiD@~z_f0GQpFyX6g!C+rhg(ML=DB9ss5=^}l5Lb9 zq*wVDd2Mi6mpr376vSl1cQ@^m1Hbd+Iv3JefKqKaGQpR(MEjZ@tWm9opT_!x6!`#) zQ*@3>akY@;e6qc*tuylY{^nMI3fwH@26`!1*lC=zQq4}4+iAXfd`>84C-Dtog4JNH zcN4pc1Kx7`nFdkkY3x?KJpCmerDG&=6{KI{F_P^qY&_|if4*?J@o3iv>fA@ z!{n}ogK+={mD(6N03Nz;Y~OznsQD)o+XDA9{?<<@F>qI%iE~UQe#zd(ah^%MXZZu1 ze-fWx{xLh3sLp$hV^ax5G^ORZ5d6@7`bU5`{lVt&?a&MC>BO3XMpk|8b%3dHO8h|g zp8zH059JUMF0Q* diff --git a/!TheEsc/!RunImage,ff8 b/!TheEsc/!RunImage,ff8 index 5c20c49d3401d3257a45b4f1e58dd3650658b3bf..e1c2145d71746e7179f15a254a0dcf88b8dc60a0 100644 GIT binary patch delta 17 YcmaE{f$_x##tkgiOoj}b*{qXf0YHxh$N&HU delta 17 YcmaE{f$_x##tkgiOsP4W*{qXf0YrlaXaE2J diff --git a/!TheEsc/Spr,ff9 b/!TheEsc/Spr,ff9 index 2d76e4f1e329555fc9d8dd1988615d446731da5e..389b2d3e7ec714628386d7277eb243a3d233a469 100644 GIT binary patch delta 1165 zcmd5)O-vI(7~PR=cgsqV$+q8xLD3p^4UOi~Uo5VlD!I%i@x7%V6|E^B*&G)`H@0&N7nUROq znbi_ypCAY-Mbo-4r(7H^zv>o*p6)JU3Zt2`%gm+U8FnyelOoP%RRl9Ka&uPn>(|k_ zUo-isYz;m>vLbY=?zcKEE#X>T#y4HXK(dUq$4uSmq8%OjhJmLeG1FuEe%#1byvpo_ zBN>8!S%oiY#mkI}P+T$lpJyrvyRa2i5Kp*a&ntMAEa*}RufCNKnckQZ8SUUi$Cwjs zDGjypGTfWjF_gDsY~d3kNeQ8pf?Rrou#EnEDLH8rcDzq3@MlxM@DXxp&&6;z?#A)B zipiL_cq1|<$t(Bd93C$zc$zzbp;$paF6jrC)2#l1O%N{hhr^c!y84dL3rQ4#;!`;&H&MJ3@%4)zhqg2d ziN9vdyJuno<(nQ0t(vIHLRk>_Dr0rrA~KISO9L%u{d`SkRXk#0GOs8l!~(3r;IzU* zu#^^NJhY$%2;DB*fi%8sC*Af`l(agDqmF8$L;4x*lGGRytFeL4m}eQpVk?D#E5>FrNblu#JMM`8Sy7os2- zKS$8ZHywH{*5bVAi3sW#bT_+kVC~fu(G4%g#s)2dI?##lcl^I3Z8p$#Q~co1_a2}3 zectc?)4#cJW5b!5Y)_44S%vHxcFcQDgoL!a=&(rosVld=);Bsg=!}V?X z^t4K{C2ql<@J=9JgIRYi$>WEbY#2mVejA(pcWn^kqbvlg(2(1Xq_@>Z2G zLsDN-;X%~GKLm49*O-`J;&I&YR}=9>*l zAM?xE?ER0ElJil-)wqXC$#$1}(WI0h?etz(_OwB(E6Q&2r|-Mq&v+z6NAc+~Z#ic@=9D1%~C(VOJF3Uy&p;c|>DkMh;? z@h|B#^E*+d_oY_RYHMgT?lq~C{Vv=USOThJV- z9y(os*TVT&9Pna!$WMDV3Zj<~JF}hoaN);64}OULjNpKWYE` z$ybr$tHMIO4$at)L&JW!`n;G$BL@2F=(TL4#J+FnZUl()^3cjEw!PR9zo_jC5g+ah zHsXUY#fRNEG*reh526hXLz~iSi8=kQ^VuB3F%K%KUf%Fe+CDI{h4cUlN6K+9T7p9( z@igDuh&!?G?4<|25vQK;!|LDXHL=B?657$}3=~OKKU2b9wOhqmB-kl-w2-)ykXo81 zA0hVnd|pkL%+Pq{4x?QnWhaVkPKS}DrsqQ!9vSdSS&mmST9UJ5UZWu)@?nbJ(leM{ zEeRr2vkE{8PK_KxUW7b_V%K1f8S414WAF5KzkT?q zWwD>7o@U%>1?Z}$>$7_JN9z)ex1A2$xVZ_fqcuv&&9dUO61BHCGhfLDQk7E16fE5= zb6A+~+=f8MHZ+VDQP@Vjey5V&YJyU)rii7R<+-dVp|QY~unjHzX~ zKkCM{j;APcYlg_~wi4dPoVy+~ouyKKndC;)jn(42j#@(SBiL1e-Zq!vFDBVbaXDzC zxKG{f@V-<@x5WEc8uOvcS(?q}5VznSug2%0d%WfLu^N0C`jzAoOp*LW=r?+oDsobo zYuqoxN^r#p%NnoY_Mp>;wPZ8?BZ_CRbM9iSC9f5~I(`w=t$=^rCHr`gzILA`{#w16 z_QN!Xi=kim=%yxYURNe|qNC|UoNM*b{vKAYVs6RoO^INS&mol@QaZ(3=l-i+#M-mTP;7et PSJrPJK1X75@?Ohdk2|`r diff --git a/!TheEsc/c/MapEdit b/!TheEsc/c/MapEdit index c4f8850..b757fb4 100644 --- a/!TheEsc/c/MapEdit +++ b/!TheEsc/c/MapEdit @@ -584,8 +584,6 @@ int game2_tick() } } - draw_sprite("commspanel",1000,DISPLAY_Y-164); - TilePlayer.rawtile = (TilePlayer.mapoffset.Y) + TilePlayer.localtile.Y + (TilePlayer.mapoffset.X * 100) + (TilePlayer.localtile.X * 100); if(editsmart == 1) diff --git a/!TheEsc/c/Mission1 b/!TheEsc/c/Mission1 index e142f1c..f66f591 100644 --- a/!TheEsc/c/Mission1 +++ b/!TheEsc/c/Mission1 @@ -997,10 +997,9 @@ void game1_victory() void game_draw_comms(char* msg) { - draw_sprite("commspanel",4,DISPLAY_Y-164); - draw_spritetext( -msg -, 80, DISPLAY_Y-80); + // TODO: Need to scale this properly once font/text is final + draw_sprite("commspan1",4,DISPLAY_Y-164); + draw_spritetext(msg, 80, DISPLAY_Y-80); } int game1_tick()