From 5f6bfb3439c7774945b9093f28366f48b236e33d Mon Sep 17 00:00:00 2001 From: Rohmer Maxime Date: Thu, 13 Jun 2024 17:28:59 +0200 Subject: [PATCH] now the character has some momentum but the text is fucked again --- Debug/MyProject.axf | Bin 301944 -> 302008 bytes Debug/MyProject.map | 112 +++++++++++++++---------------- Debug/MyProject_Debug.ld | 2 +- Debug/MyProject_Debug_library.ld | 2 +- Debug/MyProject_Debug_memory.ld | 2 +- Debug/src/main.o | Bin 46992 -> 47124 bytes Debug/src/main.su | 2 +- src/SPI.h | 1 + src/main.c | 31 ++++++--- 9 files changed, 84 insertions(+), 68 deletions(-) diff --git a/Debug/MyProject.axf b/Debug/MyProject.axf index 96077b23080714a2360c6d32618c505738582fbb..2d42a78aeb5fd4245cf15d2c397605c61b3c7eb9 100755 GIT binary patch delta 3129 zcmZ8j4Nz3q6~6b~`*s(W{bL^syF!4j_y+-Pj6a|z8bU!xipDxRYFu@}g{njfO0Vxp~frZt&qtF+Uu5ySSJ_ZG$6naern zJLi1&+;i`J?A>>gPe+pXWzo`bwmZXff)SiDfngd=<#}_3-)cfH3~M_4@w8pF z4$`vjOSYha9_^mzI!tL{+wD=;>G|%D(~XpNbzjZ+6{Wr1n==O)Ep6N6z7p!_lHQ0# zTZV?BM`A7i>|>{ zh!`000aO?W*4vAIKBL_p0k9NL7_bjG zEz;)=chXqU+Y`roK(h}hDsE>zUj0BZYlAb0MGp^6yj2ND4##bs268gUi7*#|zPh@) zn%t32$D;p!e@ot&?RjG;OevB#hIJg=-@^ImaV5U-hwKN;iu93(RdfumtX(V#|O#D6?rNgy#ZFp|iyL3#=$~ z4Skbks04jbPeRjDK%R^v3L>S5Oo=0DfEdm536Un~a&fUvNKI0;e$a@CPXbh;h6cF$ z=Fv$1I!F4s09%NeO@T5E))xR-Dv=OC)|cl&!dP9c8elvEE@_;u1-WhbY>Zz(U0i3{ zg9zpkYqSCohpt1-u>KP*MR#1Y7DH#bRd-sojL`+aHb!?2b2YZJxY~H#O+?B7(xOx9**hG$mx(VJaY~r;tK-?;lsUpdh$eN?GA6^KaR<&1^ z&^!g$Xb0z@`LT<84A?FyT&#Q_&HW)AvP$8lN)>iWsBRWM6G}M_*&R@w@-{l!^;+B_ z$NH*Oz?gtEEd1M0N@5Bjcfc6g>bKOIlxHxr%b;a0Q2vMJn+aG93s>kAKlCz0yA$x( zSormj@(l*Olc-U@8dBz>ecFs|W8t5LAS@NnHWdicW~oV)I^xX5s0Q7S?1c0ININRP z@A^nZUD|Fdl}EzQCdmp>UcW>N<9Yn^jMn|_9_?A ztcf>osj>*o+BjW>atjWb`V-33LQjWCx&fQJ3?2j_FRL{@0hiHbQBf!AQaIomtC~4a z$l|q2Ebm#zMnYdq)SA@@O(mofreg!4%Z(bk25b|b4(TTKMyIDB!+f1DnUEIn(T?AV z)XOZ}nX#^MEjXs*tAMjjX@r19NG9f8W+@@%Lo9zm{7Bb0)>f?}bYa{KK-^=~F`!hv zMdKj%X_Y(?_T%~#Dx;;Nw1NT}Q(3%gjmlp!Z*JUNLo)k+0QM~14I3e)Do6VECGh6x zR9y!^#VR!C0qxW{Z6k5MibNB1TOles@+G3V!>bYJV%&eW&I3`S)u>L08u>W( zfo&mKBOZ{25K()DWjby{Zqi=(^J|z^XcUfXqVo#NqOGF$3Y$$&2&tcqOX^+*tJw9& z!0#1P`q|UeCz|?M?vpCTAHa(gS#gRcs8>>7;b;?k7gHzdd=7ZbkPa^~5V_LNoO+RQ zgBhxmWKss#)?^_@BP!;6`jnHI3ynp_=>W`dQUER30P9GPhTHPV!{D(_3@0S{Q4k@! zcS;>;kS+cP}QzpuCmTW1I%>}A5Q#Q|Xd>dl3WQkRZ-6?!8^@?-{ub{q2jf1aS zVyJ7VtEzAOVV(HmCB84QzN%??!`hnFHT9x)Egv5_vX*B^ku#0F!!R8WV~#m%t6`gd zyRKE@Qwga$1`;S-xcWCuo&c_De<2)h>SX7L_I z_loP=cmb^urdN23dW2~^5cY~X6dv*Mb{?Wt;<;9^>cq)bzBjq+5F=J-kqwISz<)gW zW%K+Fo^Ol)u!djVGWj{+P2wjzcqeTUkM9JIrpU>i+(KcU_jd6uk|IUs?B?evZHbun z@TrN^6M6OkPo=a^EIY{E^dDmLK|Yoq6Td;RPJE_WUxSeU^$jB*h@3;*Ex+O5@bP*M rRJu#NbO=KG#6cAI#Rn+vimy=kgsq*AmB#HAh3$L{eNn7v=c)e(ni#E& delta 3006 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 delta 7995 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 diff --git a/Debug/src/main.su b/Debug/src/main.su index cf5e6c4..3e71b33 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 136 dynamic +../src/main.c:136:5:main 144 dynamic diff --git a/src/SPI.h b/src/SPI.h index 9c50916..75d9ce8 100644 --- a/src/SPI.h +++ b/src/SPI.h @@ -39,5 +39,6 @@ void Refresh_Area(Rectangle area); void Draw_stars(); void Resize_Window(Rectangle area); void DrawPlayer(Player player, Rectangle areaToDraw); +void DrawText(Point starting_point,char text[],Size charSize); #endif /* SPI_H_ */ diff --git a/src/main.c b/src/main.c index 2331df5..8c99352 100644 --- a/src/main.c +++ b/src/main.c @@ -146,12 +146,14 @@ int main(void) { Resize_Window(SCREEN); Draw_stars(); - Point vec = {0,0}; + int increment = 5; + Point momentum = {0,0}; while (true) { int JoystickState = JoystickGetState(); + Point vec = {0,0}; if(JoystickState & (1 << 4)){ vec.X -= increment; @@ -168,23 +170,36 @@ int main(void) { if(need_to_scroll){ scroll(scrolling); - vec.Y -= 1; + player.Hitbox.Position.Y -= 1; need_to_scroll = false; 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}; - Rectangle areaToRefresh = {{new_origin.X,new_origin.Y},{charSize.Width* 4,charSize.Height+5}}; - - Refresh_Area(areaToRefresh); DrawText(new_origin,newStr,charSize); + Rectangle areaToRefresh = {{new_origin.X,new_origin.Y + charSize.Height},{charSize.Width* 4,charSize.Height}}; + Refresh_Area(areaToRefresh); } - if(vec.X != 0 || vec.Y != 0){ - RefreshPlayer(vec); - } + + momentum.X += vec.X; + momentum.Y += vec.Y; + + if(momentum.X > 20) + momentum.X = 20; + if(momentum.X < -25) + momentum.X = -25; + + if(momentum.Y > 20) + momentum.Y = 20; + if(momentum.Y < -20) + momentum.Y = -20; + + RefreshPlayer(momentum); }