From c32b714a81e2195b5ad04e017ed63d3908e75192 Mon Sep 17 00:00:00 2001 From: Rohmer Maxime Date: Thu, 13 Jun 2024 17:54:29 +0200 Subject: [PATCH] fix on the movement model and the text is still fucked --- Debug/MyProject.axf | Bin 302008 -> 301996 bytes Debug/MyProject.map | 116 +++++++++++++++---------------- Debug/MyProject_Debug.ld | 2 +- Debug/MyProject_Debug_library.ld | 2 +- Debug/MyProject_Debug_memory.ld | 2 +- Debug/src/main.o | Bin 47124 -> 47116 bytes Debug/src/main.su | 2 +- src/SPI.h | 1 + src/main.c | 27 ++++--- 9 files changed, 76 insertions(+), 76 deletions(-) diff --git a/Debug/MyProject.axf b/Debug/MyProject.axf index 2d42a78aeb5fd4245cf15d2c397605c61b3c7eb9..24e4de8a2ee26ce879abb081a7f5038e25dda7a7 100755 GIT binary patch delta 2575 zcmYjTe^AuN72o~t-Vc5qcitC}`1Gy2@n3{Ub7%aH~P8&emk_rPVhi8rhv;>h; zFOCp|i1vCDSNT!3jZLR9k%ZE(lZ%z6I@6lOAVh;qlTQBVB(|}UY1(T!<@)yfJ&ZfE z-?#7cKJV?@w{LImqO|0^wB)B2TpY-@X12Xf5T7apLyr*Va)QWO+gsZ_`Xp|Jp*O>) zEqGfW!Bt~74L&U%9jh{pV7wvtb;hT7dhA1U0>%?#w=-YEcyjDeR)pAUz;$%|*r@t~ z-EsI!f>t?y?Dn~hrN|aH`|LMocCU!(38l8+S!+gIu5+vVebcllCwSFbl#=Qka!;GE zU92!R7@ZkzWD{l$!MNO2{>u^SOnyHac1O@<%i2qh(M#wuq^DnTXY|=Kqr!z~xN~74 zJQ!UFUxPUt{f%WI{7kg7LNixOeg=8)Twd5{cPw>8!?tLiqu7!BLGo3r+t#pKj=N$$ z8Xme&tiGMd>T@A$$khzK8y9{3Xd(PmlsN3%+z94Idn>u8C&)%7yPAEi(xhfSl3br*o~!y!3%k*{zkhO1tZN} zEt#f8vf^D&+=Z+atu?DJj=9A5HsH9{1*`4_(-Ae5LR-I*lIFt}-_NFMgE z!YN|a^>2lq7Y&)v_bO7x>ZeF5UdcM9h`snaH?2`YN?>{l5{uha3&@i(MC8aij(jJE zECnP%SB;QhV|S-WK7Ny>P7}YeKz)rTVBl{n;Ytiin(r?JYQ-P%beL=lX1#u8zg=TWbx+_+JTCsw8Zj!7OUvsn$ZW5t`@*YIPut%Bb z%FKmDRji0|MXXmul_Fx4Mn&^H0v4*Dn-(doNs59t+-;Syb0 zNup+@(5TawBqf0@AEsXO?Hz2;S-Q17nqKu0RUhpqFUvk>FgTsWiNKA*z)0AyOH4vs ze^<*J_Ynv(u4TK%YN_36Ob zJgNI2{gaSA3XaOaXf-UjuJ0zW8%F7%Pe|TF)Gy#N>F!}#gmDea?4j$kw?J@V8#n^m0e1HYJ#Ls7BuEbxG(gS`@Z(s<2Ks1`A@)xR{zj?LD**Sh z5Bun8e3W_nAw;iqx1T0s*yh2@)USFD4q#@7jzVY5NQMDw$M~qU=@?xbkK3f4lQa$f zOtFzu)QbPY{&0#uhJ)-57dx0?P}aT+LiO1Lf^IMuN3OGhL0}(XZ*lECcAJZP3=e_$ ViWP8C%c{6Avwd7tv$I1q?f*9?i{tSvE zFivco)DM-`7XvQN#Cc5YHgYKaJy9|xvD2A`JTTPH+HL7fCh<($K-)yFWuxv&f;2aC z|L%VK?cUzrokpjXl(S08kvv-E$=BytPBDU0MPO(Mp(rO<$g-Sic4!jN3qz9)AIsoX zO@LO9T}*aG(-UL$y5p3V4}P6>gHDcpnjJ@}ckF7;8g)V(CkA#btb#q3F6}Yk478MY8h~*j<9_qr z0M%bho=l(CX-&gKTRBWW)|I#V9Awbt=z2 z&*5u{n$Kp~anJ47OnuG(cwN?ao$W@aw$f*HIb{RAAw#oVPVIbVl60+mE`zzOz6kCE zO*=1#a4qv$qvk8wARI!_e|(|j%R0C;czkO?mVzvS*#vrfTU#5MlgX5nh9woC7aH#ny_=(=3fXBz8GCW6R_R3Y+%2$BIvTw((u(hBj9X;wr}i?kW$)-F?jj0Gg)tBX5d z5B}xi%^B9>u7eyhxabJypgAzvq3BVdNuEl1J(@?=xW44sB-^kY5%Mz6d+yY?Ab12) z%H!x5jtcXd(stNdAz=(=VV>W(Q)5#JnFAxS0C}f5^4@{Ro%u#$lShT>A}d(^4!F{)>IiL*Y|<%rA<-U%D@q=#JcH(zNJlowO=9Ck zmb)?<8}l@rEFpVBYdi?QYr3Qmnu)sPaq8|1nS~FEH!iX#a()PCLTKyRspx1>+fxYH z6^i~)WL{!*^qlCp#MTtVLSEhH&@)<<74C~uK8IygM~d7o|4p2`#PZ$y5iL`XBok5@ zO7!SbXjvq5JIOqWtQG3#fd%&i8iH3+{t8jUVn&kr6c&}Qwg9Uj#2N)w;_KCb>Lo1W z2-ry^?o7(+>Z4_-`?7fI3!ESq7IFcda#@_(&?}N24FCliN@e39wEyp}K zk-s=l#|jn)>P}_gOEz9acPbBQ_%M^!Js@VayaP^=Qk90Nq&o40%yXsmABmkZucpP~ zoXkrTVu-})b1FTGUU66Eh7BuF_oxz4_E^ck*ug7-TdN+6XY-!)pC64#- z<;sN~o+Bx9+xfH6bV@Yu=4oloiJFRp1ZY4JOifgz-{RnIo}oTME8?RD#Hrmp6Bheu zH_y#pJTL4RcCQ^KC3Pt5NB8j5HQ#~tArKs#{F~O}OI;e@ks3lIrDhNRR?0sCIe8crNU~ zgTgM(fXK(&wn(yqa^(N)4zT;gJhCT5@;+ETPggVZ7__VdjEzJkIc=m2+9o9G_^ zt5eJl@WaX8Ax1Rugd{`F7Wh$IEBX)c;^fG`A^5ALBEJB*SA1}QkJ4SD`9(<4tIWR0 zlPD}R{}Okr>R|)2c1WYL5)sm8tBrN=DA zE!14nQb)ujOxr%o7EMbtvsdl4EG1-gD1A_nh4{|QcJpsb~~4UYtytIu6eukXlSImXs8x|e>^iFx#YO>VNSqYeJywiKK9r`{iil}3-B=86HkF06L42&*j-Va+Aw zv^V#`US72&W3`x8i<7H#H_SQ_tvfNRyte98KrLHLY&k?0OFH?CB`5s@Crf&plk&jn zR6uiakv(vxh^{^{#TH~Mq~h8Vv{M6Qa&}J9c)MMM228a-Sovepy~@Xe?46q@X_0ES zV^S|#nN|7U%C>#?D(+28s*EAq$&NAhdG}=4IiKTxUj|rg^}>=~FFy%LDo(Bt+P(5w zmB!W-srwj(-J5dniKO!63QM|7PM&bL++rI|-nA2wE0pBs3C7kSU0a*C+GbVMmeWef zp^9eG%_XU|6=BixyD;imZH1*Z(px!Kbt6JoThi>ZH`B<{8pifeU2}=Cb*N4wEO2bE zA5Ged*?x}6lO|2tU=TtN@Pu9tSA_7Gn=8cC0c`nyLXoEKRv~nHwXCvQD0(%`Q;;%l zk0oW&ALvd>8baDrpdKW2o&BO{zoMvl8Bj*|!SGW(qoItZBvNX<_L-r#*QPijOp34h zEcu((Y2L$5FqRSq(eeX1;xBW;Pt;S-TCiL5VVag1v3gqz75L87{(t7POho1Nzgp_J-fWd7n?P zKTSP6ke!$A5y~`N!Pt{JNSQWjk>DE9h zU9L7DfKoTcx{zR%ukfm_?j4798!gCJ8ChN3en*E=@>@-rS$+D_!a8HyzLCC9mrN9L zy&LGDtJ~#pbT~$%pXvXHd-)z`Xl+Mym-|d@TZdZrq|wyrhU9d0xdv+z06*Z~7HW%w zV)(^V`bN4T9dRdgbp;0DKi5KDRTN1GkW;Qpq4j|E)G1jNu+c;&rLMrbUR&;IN&5EAO{gK zRk1$>GAnw8mWp=Js>|yfP9YtCW|{{Bd0r( zkWs}IPWl@{MHQR*$RDX8s`!F^8tAsFVmLins^~U?!LMND5sZRrKVH-lE2k z6ET7|P?J@0g6;~X!bueL#P}jXt%{T!$O2CBS3bBt50=|><5f{gkCrO_O%IhS{)f6t z-QoyK9>I7P`)9CyWvpK(+yO`@&d@! z9PSb~d?$z4%OUDnzBvRwd%2oQZgrdumSJ4?eU7Q;ZpHIBIvlJ1d`eGxo>egc&^ts^ zFeb$;WeCP*rpa*5J)ZO3&k3FFj8)0h>&|H0LYR5L2Y*;xLD8+)9&YHtV2c_!wMyjtrC%NaLFA71@}<$5zLA93e4v&F=o zf;|(Mo}0K6dpQ0d-QnNL#k}O`fyw#^$R~OEVl2j87~K{QUB^i@bFF_wVfA~?T~E&l zT`I1oiJ4(iVL8WD9w2m8@pdZYX$I>D=1?Jb_i!QX*%8eDMyAXH#_wBhdoNC+h3hEd zaIbO?p5?6l*>l&U2(ge;{F)D5$t-E%aRbAV!AMW$XoLg#dvcsTOwXqhnEx&8dYOT^ z773>=e3AOm*Md0AjjiNo9^--=nku8oG_=NM` zIV|G`Gynbhm|||`V6N;*n%I%D=0Q|U7EAJ4EVUf^_Fc-1cp7V0|5B8Kuq z9{<7BuV%=G6<~E3Gprr}IYb9;pg%WxHm9WN^EhZ8$E;%Pj|IU$HV$$*^B|Qw zw4CDyc{2ZRGXZyTpaxFmDAygtmBny-yK{S^81K7$^-(+sU8ae?4bi&rXl0VL6PE-pdqwnYk+2@-d_M zU%rsZOwSso*kb|M^#g-7fxBX4mfU7eM03S6nFlkNjCEXCO$P09h&PxfgZT1nW90IJ z5w4Is(Fi9opF32_Ja~aaOlGh;F%LfH&>o!bY2G!F{hwg$t&DUnR~*$H(Y|GSXYPmN zd=5+zA&?0i)R${Y;$zCVg58|l0&1N>7&$~1`=<~k4dOH2^(FZjL@%n_AbL^+gLs@G z8^kN@`7_%Ovb`Ji&ma^A;xGJjPZeXy$sn52AO~_AXYsvP=pq?J0oS*bN%{@h4WgQN zea$s(W2D#G5hsV)P|YQMZ{nCt)sYOxa9-`+6`nOjTZ6a}P5d{APdKlk^pqMzI9FLl zO*4q0W=JCu(;)ul3Z_uQ4MNhZZV)?T5J+PPiWt#TjQvt#hCz(#h}CAcoa9=&a6is6 zpv^tub2**(ZxH+FSuhAcLd78F5_=6|eK_PkX74p_{##79X?&^TD0iYQvqVSDRK<3# zFLnUIPW#n%jgch1pQprC^G`!a`n(Fi_6@!yEt34y4nElL>&S+y-&b^?+R;0Yr2h`Q z?18(mIcPdIbh6>u>|BA>E*G&HG8wlbbeu{utP8=Wc0Gjq6TS#RBc|#|M(#$kQ3vq_ z?3Ri+(WkH)`zcoA7K2Cetq$PavoV%rpJcQ$F&^yfcM4b~-Jv$ADUoPpe+$|@@K3Nj z?It*qeg`;bv`0d=D>x>z0{&UgBcbetnI!Wrpl|u!xH*NNK@Ksat3@Ngi=pT24pPJ2 zki-ZNFn;6~9QIfS`Z2l=Z{C;%86?LVAs^32SH^$sL-L6`#13`h4OBVFjQYxg@a33N z1i;EINTp&`BFW0p{{Z9PN`zK}E)d`hl%>o8Y6QeRLNf9UDv3LYI^*?VY43R4-9#_c zlN1O9`v>6(8W@yMa?lkVVLO2%vWH_ecc44T{L{d9$X`f!*!$?z$Tf&I;VbmF|B3s8eK5Mvtv=!Y}wCFlR5H!HqGYCoj7TMd>QS1Nq!0nG|59y$K@qt`nCKO zNuH6N==!K<8i@m|Y!cC0UaKNz%v zrUsLmE8oKPm?!;#_k5X;tqUCT9UQq(cE-(mL7qq@^`cye^A^eNz;Ll#fy=r?hT@hi zm6wq3GC3NRESKM-RV!o*HmsC?N>Zz22~v4k9*!clRwfK0RWCij%yn`Da#}AlaO?)6 zBo;TyaHPFSo&hIclXn1rgKWT#&C-aIw#cnOajQ&+@pW0?Lu#9BX-8_i3`TQzNJ>zs zJ7qmEenUQrJFrVGi6*sM3Y_q!tU=%2k~OGvkNnMn{d?unEK>VqdV5k%d8Iq4{c{D5gn1j$R*>#Q^7RIRVB)(hWs4%Nk_=jvNfsTci=ZJuGcd@5;H@cSL6P zA$3&V1_tlRdH&%4`!W>?ACnEZCLhaB(eBUXD(v_|u0+riGSx`xq#TWh;7eJJ2Az@< zk>P213oc*DHNfC&IToOukuxJnot0(i(>L-_9jSBj7(Bm~9*A;YUdRXkzmsp^#$1rQ zk<|C{7a;R5c?D#Qa{Se=+jSfEeLT{ z{s*o6S^k+q>KAzx>Y9x0M(VokhYWv}?}dZ^zsdC=)D1Z-o>Z$`2!MWZ zZ^`30@V4BHll~*0M{0Mdc2aYcqsVZs@*LeJb)Hg&oE9jD@gOWz^3akOl)h-?i%JtV zEK)pC?qcP2v!@|zp!?MfQ* z-k}s=wo|!|b9X7zfXHrTJP7rsatamhQSN{xdzI5^r1mQZaVZ;>_UWXWluTUlgUS-L z>yVNMmu6)cVb8C(_c5H={&yf`iReYr>M;$-3+$u{9Z*F+MM)G+L3&N zKCy39l+!(Ru~B=|w%&Wt;Hun=w4$MXgF{P8t3sXCnNuv!{6U|Lnm-$JuB# zzR$S4w2{GaGZX3WJNR*Km~v2RyAuMOBP;CEd8qOW>1>*MOYdG;GGkoTQ)QFODxEuP z^d{$?=f+EUR`YTA`WAbc(>&>OD(JF3_zBYbJ31OR$utk+tIpAm8l60?otzu12*s() z8=|AF!xqNMAm@UG-g=+Iw9UOjh>xHvg*dHkU7YDC#q4PzzJ#73#5HI#4kpsOmkBW+ zdZrM&plR1#=yGyW=s&t0dgu}Kw;br<^k)i}-3&dNe(eiAivFR2EyNk(zEJ3{&{cqT zPFWJ8bfx)hqK-m*TLew>?XLM=*Zh60WtpGDq;FgGhVDtf>vqk1xO9J)&Vr`zT#0L5 z?b7pH`X!g%?9w}-qlI|eH9zLkXI%P9n|6rX7?5K-wN1xCQ@Z%gi$c)YT=QWrJ>6wr z>`s?H3>_}SXRi5qm&P|AaqqdbLj6-hsh^%0(1I13zNBHUc`uhvg7y<4+ckg8 zrN=|l7areq?4RS(D_!~(XTpjV0n*R;;f`NSM4Y|*>}om{8>C66UB&JOt7pP4nnMnNp^VNY+Hp$Fa-icgQ=U`K zIiOdC7g}ng>0d1?hceTrmFdf&K@DHM^(}7x?fzt~z1LoQ?X}kT?S1{ht9O-^ca;@E z^6|dlp{Cx^*5M`9C0;2aO1qT(%ZAAqM`jKgH z!A89)x>YOd+LCkrGTtlGYfMXPK#7P_E}4xcQ@3Q3)#K!!5B~U5yc-mIB(?5{piifp zb=kFb%3j!?{@EFX+4M}uds(K}elUso^fSend_@kQ|!rn_d7h%%l1y|lXGoPSdxEKY2RE32;XN@@0Sc;e%g((I!=@j2%oUzBGJ zcwR)!I9r+;n3`)1h$`_-#Zg&Qw2Ze>Te7So#J|c)r8ciTEN&`)CeYfZvDipdGxXx_ zv@)~&QF-%f7b>aylaiXsn#RSIN0G;;z8$Uen`G!E&yzl%`Fo|V6<#T8#}2z8ZlS?lh;K1K*9 z#oK&={GApVZ5{oG9rh$IKc$W=jxei-D41CZFndb!x$jS_flljbK{&B%YxZ&y4zv5x zQXAzaHo{l^Zm&E5=b7q9B^hP;o%|NFB`j@+Un1CBfki37BE6(!qq*Vdabos2FnmK2y;<3 zS-iDc-e(?;nMK>#JoD^HGqcvfGuK_TL20Lbg1ybrq#Ic}XjfrD3!2U5-hF6WOYKfL z@AJInOH(&DWaqB5qfEmUj9X9#Dbv$NrL&*@f(O|bbB)N#LOW%x1Ch+~CuJm;F>p#v zibbQ+zhU0fiwh~BGvGJX9MD_6 zO@q7iV{e_#z1z_v1XuM!$tOi471`s*~|w-jUyX0I^zT2Ev5 z(^j&EGO1V4+(QICMROu{u-t09=T@&c6Vm*#82dbiJ~i_+N0>L#Yh`lR9O2-gdZri| z=Fa*sTvrD?wyJo&3uGwqMiqCc9jXYYw^bDfs8Ch>gSM-pgt)4T9rTu}Vssj09iga- z8|*nh7~@gxA;&mF_9tShVs8RuR4n9SGvqqD397K^go-L+d9%AG#_tdss`!KWql#xb zK_2S?d4vE~#c&tMgPiVALPix=IqCNa6;-^+M}9^PQN7j z;=d{e0(xB>3c{q2r3l8@m1$DMx%cIKk8?uj+hFxJv!o-Z6~f~w9NNlo91VfbzZtkB z2JtRaHHt|Z!>eC&7xS4<`V>ZGb_TXx;KqK)T(!Ew@(~kLFy7-^z;d1`=Enw99i@SSjFzo5=ng0iwGF6PTQv zPGUP(oZB3ZJ5-43hifHC!Z?4RZd(glXTg1mqX3W-52}CaD{~QhDg`DnTUX5YS zQ`gC!%TRv6;|E-Q4MSF#gVh{n*eU=-{pSYya+8a>;$__S0gT+{?%0sV2blP>WilHU zFk{NyuzH^T$1*e{`6?DN4F@pkW-v?4T+A8nUkqb^kPFt|=cdK9MWE;Ts?6a`A2KIi zf^ijJ&JFwmUeOt+ zC_;k1B)B>AIQKdxS2SDJIC6*%kndzdu4KF)@WYbBT)D#hc#(tl=9se?dxOF49D`lU zmY)ld`b-YZBzU?V0}%m?jq)f+Y;Why1OW!+3wsT=n9t=W@84Tz49W zn9J$D!-&4&f}q>jvyMI2^O4gz+80dQR$bsz$_Z^Je|rD_WY>l4^h`3ALm25grq~MR zs$k0rM)4tE$ev8ksZ6mjf9$%?V0B^&E6kE#m=h^n@f7AkKPKZWE^N#I+NFzCOp}p( zc??D_D+u8dxDy-TBo=UoN|*<^9AX@U<-|NV!J%C_-FJCcA^Ue^fIJxKnOt#1M?~Ao z_BPxP{nt#G+66<#aL`sCOT8yn&?6i zG%53D3GF68#97Vhu6$Z~~L|aYVi6Z`M;socFO;4#N!YD6I zwu*%e_f@Jx1JCX6*OY)8Xp#IUT6_wjM~*ZwFrX zfVZ$YFcBMC55Tk8rW&hluVOWL9BxI(Xq9BBKf$Jkb-|?!UyPvbt4t&#RwLOC^YINB z>4G>>pJ6rn6jozi29LVj)`4@^1JNXVwnHmp9|N)8SAkXBeQJ}M@H42`rzP5*)C86% z%fTd5%vO>ES|Xv;eK;nq1petSAfb%)NNC_i^ex-Nk>ue2gUoeB^+Q5%O5V>_om7DX zk{Eg(IS#7?ZqKBkA0t-a%^O)YfaIvJK)+`Pp(|sKd6FD^jo6_UeuXN>e}&g$f)Bnq zO3UabsAcX*rF?lT$%=x%fbqLagjNG@6W|P#SBVa4_(!)R8F3z!#MGnCE+(+Fdq<+7 z8taUD;{1VNpFli8Ns-wk`(MQosV8wnMm|=vl3Yk;pP}Q_+#is3{-?N2!&W2OxTENA z@t=q=J`lt#FXH;E6X=3zv(i!39GOd9)#gfHT%rZC0VlmA$DqBh$xEO>z5E#Jq`Znu zzm%7d7s8cg~R z=?R}X%43`~Pw`MlEl~=P=20b|*0^D91LDaLbPg;C-HjB(S_7o;Ymp?|)q)Z2E0A-< zJk;EIHNc3zh}>d2VORJ2@a(Y-4C;9*8~DdIqJ_O~AYAVh0223^3(5E&9Y`j;>Q1uH z*9e;E3)c1%xg`7dA{5n>Z@`@aYp^#p7|l*A1Q*f|Ig!jb4Tv&-LQU4gJ|wfY!!qzc zSRM3JEWZD;=ioigxk)9egHzDc+-oR%$O5F2*A4Gm{^>y^3+`b&v<63xyoJj*Y7>0M zRH3r5v(re9+l)Ac^U#T+uJ9~=2OXMt3ah0Fh+Hr1-)1V=8Et#Pv!$&-CaEtYd}-pg_uFkB*sKYc;%Wg<}gFFsSZj=uI|0cN(ybg6+c8(YiK)fbPpj zXxq=yn|#z?ev`A2+5@Vc)Li8fGMuNRqo(;v5psG-IgbZnp^}c4EK+)* zm5Y^nY3*@&FQjbe{P{~L3^-4cn z@do7$wCimp9WISZK4H(Vx5q~~v*mdpVZ{h{p*P&}oNvf?odH$Y_m#fR&mYBzE;pY z8~Hb5$=_xUm<1c{JH*Kx+qe!R+>Dv!{29+i7mVD5=Xy` zL3yK7lZWJW={b5}^01(o=VR&bHuxA9Qr8(rdqmn6rcLzn=s&13YXG_R3JNJHsSL51 zMr<{^R20t`T{(Hea}z3T$4eWe?X~iO(zr9+$9ARSj5I>}#@Onr?mO6aPcu2$_RJn9 zVB195V++~6g3!tADVly=D zx({6@#6!{w-37e5%23**(7yu08hQl%We1vqyFrtm1{Y!oaYZO}Gl=-mw$fKRD`CW{ z7l=jp%C~luM#3eYc>cG22J0e-R$%JcAW|BBg8ZI`2@SJf~H4E zx6fiVdeMRgyGHmVT55^?h z6q#V$uw~0yqsM`4nPt30anEm m@KAeo7`=NQ##Nd>XQ=hrMB@DV^}e%qQkKM?zdl4X{`?OGS51ik diff --git a/Debug/src/main.su b/Debug/src/main.su index 3e71b33..69b147a 100644 --- a/Debug/src/main.su +++ b/Debug/src/main.su @@ -8,4 +8,4 @@ ../src/main.c:93:6:scroll_array 32 static ../src/main.c:102:8:CreatePlayer 80 static ../src/main.c:111:6:RefreshPlayer 72 static -../src/main.c:136:5:main 144 dynamic +../src/main.c:136:5:main 160 dynamic diff --git a/src/SPI.h b/src/SPI.h index 75d9ce8..cb45d00 100644 --- a/src/SPI.h +++ b/src/SPI.h @@ -38,6 +38,7 @@ void ILI9341_Initial(void); void Refresh_Area(Rectangle area); void Draw_stars(); void Resize_Window(Rectangle area); +void Refresh_Area(Rectangle area); void DrawPlayer(Player player, Rectangle areaToDraw); void DrawText(Point starting_point,char text[],Size charSize); diff --git a/src/main.c b/src/main.c index 8c99352..84c7381 100644 --- a/src/main.c +++ b/src/main.c @@ -110,7 +110,7 @@ Player CreatePlayer(){ void RefreshPlayer(Point vector){ if(player.Hitbox.Position.Y + vector.Y < 0){ - player.Hitbox.Position.Y = SCREEN_SIZE.Height - (0-vector.Y); + player.Hitbox.Position.Y = SCREEN_SIZE.Height + (player.Hitbox.Position.Y - (0-vector.Y)); }else{ if(player.Hitbox.Position.Y + vector.Y >= SCREEN_SIZE.Height){ player.Hitbox.Position.Y = vector.Y - (SCREEN_SIZE.Height - player.Hitbox.Position.Y); @@ -147,8 +147,9 @@ int main(void) { Draw_stars(); - int increment = 5; + int increment = 3; Point momentum = {0,0}; + Size charSize = {7,11}; while (true) { @@ -169,6 +170,7 @@ int main(void) { } if(need_to_scroll){ + //Refresh_Area((Rectangle){text_origin,(Size){charSize.Width * 3,charSize.Height}}); scroll(scrolling); player.Hitbox.Position.Y -= 1; need_to_scroll = false; @@ -176,28 +178,25 @@ int main(void) { int digits = number_of_digits(scrolling); char newStr[digits+1]; convert_to_string(scrolling,digits,&newStr); - Size charSize = {7,11}; - Point new_origin = {text_origin.X,(text_origin.Y + scrolling)%320}; DrawText(new_origin,newStr,charSize); - Rectangle areaToRefresh = {{new_origin.X,new_origin.Y + charSize.Height},{charSize.Width* 4,charSize.Height}}; - Refresh_Area(areaToRefresh); + Refresh_Area((Rectangle){(Point){new_origin.X,new_origin.Y + charSize.Height -1},(Size){charSize.Width * 3,charSize.Height - 2}}); } momentum.X += vec.X; momentum.Y += vec.Y; - if(momentum.X > 20) - momentum.X = 20; - if(momentum.X < -25) - momentum.X = -25; + if(momentum.X > 35) + momentum.X = 35; + if(momentum.X < -40) + momentum.X = -40; - if(momentum.Y > 20) - momentum.Y = 20; - if(momentum.Y < -20) - momentum.Y = -20; + if(momentum.Y > 35) + momentum.Y = 35; + if(momentum.Y < -35) + momentum.Y = -35; RefreshPlayer(momentum);