From c467ff19b0c2810dc5dd07a1a6cc15dc7d26b95b Mon Sep 17 00:00:00 2001 From: milangames-art Date: Sun, 8 Dec 2019 16:34:32 +0100 Subject: [PATCH] correct koopa bug, add blocs --- SuperCbr.g1a | Bin 45000 -> 47844 bytes assets-fx/img/1up.png | Bin 618 -> 1536 bytes assets-fx/img/bloc.png | Bin 547 -> 1388 bytes assets-fx/img/buisson.png | Bin 618 -> 3553 bytes assets-fx/img/bullet.png | Bin 577 -> 3319 bytes assets-fx/img/carapace_verte.png | Bin 550 -> 5099 bytes assets-fx/img/colline.png | Bin 632 -> 4314 bytes assets-fx/img/error.png | Bin 1546 -> 11453 bytes assets-fx/img/fleur.png | Bin 588 -> 1558 bytes assets-fx/img/goomba.png | Bin 671 -> 5966 bytes assets-fx/img/koopa_verte.png | Bin 636 -> 7160 bytes build-fx/SuperCbr.bin | Bin 44488 -> 47332 bytes build-fx/SuperCbr.elf | Bin 59512 -> 62384 bytes build-fx/assets/img/1up.png.o | Bin 440 -> 472 bytes build-fx/assets/img/bloc.png.o | Bin 444 -> 444 bytes build-fx/assets/img/buisson.png.o | Bin 452 -> 484 bytes build-fx/assets/img/bullet.png.o | Bin 436 -> 452 bytes build-fx/assets/img/carapace_verte.png.o | Bin 480 -> 516 bytes build-fx/assets/img/colline.png.o | Bin 484 -> 548 bytes build-fx/assets/img/error.png.o | Bin 1440 -> 2464 bytes build-fx/assets/img/fleur.png.o | Bin 448 -> 480 bytes build-fx/assets/img/goomba.png.o | Bin 492 -> 492 bytes build-fx/assets/img/koopa_verte.png.o | Bin 528 -> 624 bytes build-fx/map | 778 ++++++++++++----------- build-fx/src/bonus.c.o | Bin 2820 -> 2924 bytes build-fx/src/box.c.o | Bin 1768 -> 1772 bytes build-fx/src/ennemi.c.o | Bin 3392 -> 3468 bytes build-fx/src/keyboard.c.o | Bin 2000 -> 1996 bytes build-fx/src/level.c.o | Bin 8560 -> 9800 bytes build-fx/src/main.c.o | Bin 2496 -> 2496 bytes build-fx/src/mario.c.o | Bin 3944 -> 4000 bytes build-fx/src/world.c.o | Bin 3136 -> 3368 bytes src/bonus.c | 21 +- src/bonus.h | 4 +- src/box.c | 6 +- src/box.h | 4 +- src/ennemi.c | 61 +- src/keyboard.c | 1 - src/level.c | 47 +- src/main.c | 7 +- src/mario.c | 131 ++-- src/mario.h | 2 +- src/tile.c | 1 + src/tile.h | 1 + src/world.c | 16 +- src/world.h | 7 +- 46 files changed, 580 insertions(+), 507 deletions(-) diff --git a/SuperCbr.g1a b/SuperCbr.g1a index db763e58e575383f799b8a2fc36839109e1d566b..58dfe61fa09a65562c1dd784a3b0d289e9e9ab86 100644 GIT binary patch delta 8506 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 delta 6144 zcmaJl3sh5Aw&&hNxFJzOLPEkf2?#-`xqOt5s5fW@1o;^hD{4R#tj?=dTJcj8f~~=n zMm*Tsmd?VlVyERb?WAvpzUg#m^>uJ9-YjlZs;!+G6meQ#Wo9hndfLg`Cjo(3v);|x zIcM*4&ffd%z0cm~-djJ?1K-k$cYA;5I&OcXUE;e3zlneNeC1h|4uv5oYhhYW`r;2) zzeCZk0r!2Xj5BdL%-u3Fuim zh{xxxqLFxD1(jFU4tHNp&pu48zqD*`w3GLu1C;BFB`?=`((_z* zp3wdDEn-8n5v#0mH%ZS^3MNK-Lg@P8F1kj!{<`)G8CKTd64@522KUOWmZ8=%9VfOt z(l8q*oOGk$^d2PIN}JvMVLR1MYjaM=B9Z4%n#L*dhBjmrhzdkWYJR^t<6`LW{%zPm z8^!f!%r<_n=XtFtP2&(Z2>3k(qS4R-(Z$fD4a0k;=6Ig2wP}+*&j6=jFEYr+5Z|~B z56|C47}VN4TQ5DWQ>U|zjhA+4v)dA1{dI%9AUSErKFYlJ%k8)~Tx~IPT233U-c9Re z85$>@Bhl{H%V6b3{F;9y?RiR@te0)InX?B%ovG%Gf$^_bw=>@Rd{tdWyvj-I)ZGWi zDDQnPX1L;FsDU0s+i)>Rud{XR(8>kdRHzT4c{~)6V%>O5}0z( zicm0O<&Y#739%vaPcC?Djb$36*M{-Whq58cD#_s(4F+pg|CsmUk0{ zJr}k(Oi%a{&Ou#-I{;&N$?&S7$M9>z7gq}n!#m&{?JxXlmF1Dy1}8_dv$Z)P`?%u) z+0)M^c1;AlL-sYa?4YpT&51{aLrd%3UoV9oDi+tY_@MY~{( z(yFo!H0&du+DGx31=`_E@YMN=7quz}(#tAr#;|tE3q8W1qLo$U1-A>9@Jih@EJMRG`%|RH0q&m0JBjQ8KlkmdGI5DK;fKh^O;p#|EGm2_$BlNSr zw8XYBzp6nMcCE_!Ol_2xQYlm_+!uMxqH=Yp6oNY-?p8pA`ViI z7(63%gbk_4%tk%}rbf(~s(`7=$5UyTI@iy1F3g-uW>yE7w(=n`Qxcd-9832xpo*s!&$#?MpwhKi}kZ;D6guZph~JD1hBrX@KwMg<2;Yd*_n z)@uifd8J4cRidfx8h+PA@@jQ%| zz{N(_3pj+fL=S9P#Fh>M4tt4({*tQ!mB@WXc?06IkBBB0EfSXyqX~h#LMx~%fpz4b zLGByP(I_;Zo6Z!5VMEsK>!vc@sh^jKEf4Ah8oM)F*T$FMxc~E$-=RiX2j1CQJXfzS z)HXU&)U~b8YKpaSVLN}z7vb*tF@pSI4)@PjSe6!voAUXkMsPQucXGQ?d`sZEi9{uU zyFRNET+1#J-%@B8XR-NAXLS)!HB1}&4gvK!e~*G*lZJ8RbgmAJI=P<-I-i`J`6=OZ zVtK7V`)5)qYA<=_8=0*Vvz%I(A$7W5pq2!dJKr^5vWGbC@Nrk8{Hnx`P{XmKke^4= z`53K^mxE%6{3Fqo$U;!^imDK|B`(Zhmx6(go&qCQ2MlM2#7vA!jK2I37%p$>;3L+a zNsNr|CXVQqlJo;h5_+Kpzbrpwc&Ty4R30wVm9NI*Nrt&pc*(e*9SbSB%FoYw{LGCkxHT##+m?*;6uq9gC%^hhpC9b ze@c$gN?<0a6!1Us{cIhs9mKH@Z5 zwrb!fxI>0JpP^FM5$m zQQtbWX_Vq%uTP&apBbRqkm^4wUaW=+5lqr<8+AGv60eUW-syTVR6$Y+#Der%xz|^D zGF|SVPOFee70IvZv>U~$cf3NiqQdqpqYeWlXonFLr+}9n$EGMP0eR*Verad@Ieto* z@Lvc^pA@FN#!df`1$voRqzZ>!s8kAmLFWn*DU*Uj{DK9Jg+#D3WfTp?)whye zf;5ZDA*is|Mv-M3Y(SDIkp>QqUPoV*FUs85{fDi&#?Myd?d zCLlJETSMFJ?Xtwiwwt&zwZJlOezoaHR!RNdCSPV=dO^GNdsGpgaVR}HBfdRkesxjvRQeHN*nHP$SO*WK6-K>Kn80S5C@>gF$)Ub+VmL4wso}|~h)v4Gx1P|(r7~~< z$&BWOMsYLcx>tLGltjOQ;j|^2-3bfRsi3E7;B@YC*BD|cS*{1MPoy$Z>Ii@xu?y?* z%j|d4WIGumWVb!-4NB>sK0di*dMrDml#YD@=#SYw9z*Qes{nW1Z!dafYJEUdK&)S6 zVbt+lb2`#Aaog$ThwybSmozHl zZJN`Z$j_y@RCiwfE7Ss#VCO(_oAUv{N1*!vz@X2Ee26XoWQZC?T*|FD#2Q!P`zx}@ zZ7_Ji&92O))-3@WlCsw`5Ky>?fj+ps2Qqn2IY2!Cq1^$v51#{IQ|BZAnn337i3U38 z-t#g*Ge9@M4c!0apXQKH4x90rRhEUD%p|ekN4UHoGKh4a%y#cCaL`mgepIxM&UxTAt$vqIUJr}zX9BZsXxYFQkIiQ2gKgIz z0+Ae)0${e;owO!{3aaEtOk#8CZFUnU9@LwQGO~mpzy1bMw%f!3N zmyxEo+yjlz6?|N!@p= zH`5{Sfh9J94mH1Wn>H?(iDUbwA#C2LGdSx}M~6CtJqNol zG9z~NDL)xL?AX!Y!O}%w<<;SVsXdcz9&9i#p`$|)$G%q+7%EGcTm}d4?{6cv47OO- z?3S2QBk-+*aX9!;D$W9E0C)}H4*-7$NO~a^uLn2^@Ed@!7uM^byg)9U1gNlG{@e<< z1c2Zx-R8sDw4xQzj{(k3!duXO=Kgo9FLFMjtPI@#5Zw9@vcVf&vKcWek0bK^hU6NC z@W+37Q*DnpL-dA|8%)+|0$q5rsH$r=Zt9$YZ~Eq&>z&gJXb$XnWd>dY{pcBZl|3P> zf106%HXX^=7F|YD4{frw7^_L334A`^KM=j?Gt^Q@Bnkm2M00eD@nV-1A_N@qz)BY$ z$=5`;04_bI@3wOE1|q-?xQ2{tXm}r>HeCgrvlY^e)Q_7)uxG2y@acnOhThbVD3d)L zc#}s+b7Ti^T}CuP5e?(icyx;iFF$f18d(_g74|@3kWcQ>cIO%`w zZtrau2310ut=!|*e7Gmb(!~OuI4aB^>EX>4U6ba`-PAZ2)IW&i+q+RavNlIti8 z{I65&5s(B3j)QHe+8gZgUxSG!$z+mDl6ti!0U~65b;}Ob|Nd?C4=!<8$OlU?$LMhR z?6VYXlH0E`W_Ete`*k|wOF10}0+C|XsUN4jLN3skDPO0Z0)KfpGnDH*SS}CBG$d&{ zI7KuaDen&4HVu_&NM(BV`|o9Xjyc(R3iH06A|I)ynVMIV7$Td;?8TYIjC~U44Rzak zplZYa;pqA|om2%eNmW)iX1_LVj#q(34~Zd6@Tp%XpLqpJpAV2Z{-Bf8$(qX z#yW={4thrE-e|4&5;M)7;T>QZJmp?S?K9MX2)9|(FbaGcmxP?aDj*D_%n1n=x9ldC zz+c?b0klFdVBLF+ZQJkfhCF-+1j7mlTtq8zWM?AAj6x;=RM;g^FAEUh5M)D;;#DKC zK@-3=;eQ_Ep({alIi8Y0B4|_tHfULZ<$VBu%qMWD1Pwlf5QBvjawt)wCv;eh7W?D2 zn3}g>(ae%%D@l`2A;n}VrJPEZtauuSjCRZ^=UfVW7FaHk3iJyki!8eMB`k5VB`tX= zE9kTOHLP*9HLZCqn{2wFkGHtlmbSc=$`w?qzJCU)v06p|VzZW7ZskC2 zqWW$80yUnf$v~>>*?}6QX8THmFEG+E17hMCh+9VhgqDt(OYFUL zk$;2_-lmf1w7IuxeXK&YwFf%St@K_TUt!Rzaa_Bhw{yB-NFUeh=XB{a@pMBs;&`IW z-&T4am-}w$6KVZy=!JCYIWv#ZqtBT6UhJ2-M4vHpzeRpk@((im1JFOi?5ExQeP;h( zA8bFzMQ@VvxQkxT=+Z2GBAPCukI))6=^Pab-dgFsI3Bmiuc-jkwBgT7raxNKiY`*(|B^zB7!Qv7@$TN^?j0c1%S^L6#sE#X%~T>T zX0oed*DJyZp%=i6%q(M0l9KQpU-t;`^)AM<{D05=IeOHb#ejfFJj)EzCf*>P+O!SM z`@|7elvUz$;!%?>Nc_lk#p5^51(yY$88OqTdEyAMSZHIVjakvuh$o4os-{!EknvdM zyv127S6TC({DtA1zOu}9nnOrn5lfIDLO~TJlwl)At4@lA6z#`-{DZDvB9}t05*Rra zP=A32+4Y0}!S8OZ{KUAI6pjO(FOKsu40P=Rjhf?pA3ILt1PDF@S9;4|sRPrWq}N(n z^a$wN1}?5!nz9F6?f?T%hHT2N6r?HS^T7KVeNz_bzXiJ2yxyAoIDG)p)K&5ZI5-4G z3Y5L>^X^c4Z~vZY_V)u%$#R+E?jOzo05|{!VoOIv0RI600RN!9r;`8x010qNS#tmY z3ljhU3ljkVnw%H_000McNliru;|vH60W0Hq<7t!Y0Vq~MNklW$lq2><{907*qoM6N<$g8zrN+W-In delta 531 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 delta 499 zcmV$x#+UMGoxlEJx?4Z7KZ=T$6botEPx$zUT)#vvg)BVfh)c3uQq_0PtxmcEp`O-Z37qAZB5w&E_Z;z zCqp)6R|?V;3I*W(jJ_!c4BP@eYhG`yeVjf38R{x^0~;J10;5IBUiW!-cV}<^o@w>> z1Dd~bx4PIGcavTWAO{5z9W(QC8k2<#DL^YpL_t&t*JX?`5&$p=!odIkIUQ7n$`s&0 pfL0%mP1=wGsJoM7d*D8&10Fd7Bjz-r2fqLS002ovPDHLkV1h!Y(ntUR diff --git a/assets-fx/img/carapace_verte.png b/assets-fx/img/carapace_verte.png index adff6263de0fdb6d448880e425365995d36dabf5..b370e5a6d6b7b7d265a3cc20f39d75b63cab1d0c 100644 GIT binary patch delta 5075 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 diff --git a/assets-fx/img/colline.png b/assets-fx/img/colline.png index b08ad14039608bb58d7efd8314c76a9bbb09b29c..81ae669e30a234d2e03175f9465633b629e73f3c 100644 GIT binary patch delta 4267 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 N07*qoM6N;tV1l)GSL6Ty delta 555 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 GLSTZKiAoCq delta 1407 zcmV-_1%Ud!S&9shBRBzsX+uL$Nkc;*aB^>EX>4Tx04R}tkv&MmKpe$iQ?;U12Q!EW zW~fdUL`5963Pq?8YK2xE%tw<3CoX@$)k=zHwT%OsZkx$?Oh{)|h0rUy!J`))7?u>v zm=nbWe8<;40&KmDvMm2|e~unCYbiiLAf8nW(QbK)_RE=c^y zblKxK#(9@HmdTr`4U+2z`-9)zTDi#y zFDV=Y+Fu;!V+0880`;ond>=bb{R9X;16O*}U#Fj&&F$NRwMAF$oJ44j&XLvBkWTl_)5G;z>k7RCwC$UE6ZyAPhU%$^ZW{`@~F^ z0b4favLL^-O=*&1S(dq-C#95rv}^6n-#pL5-nhte+`rlRB!asv`}_~P;%*}Vr~!1U z(DDfFPylGcP|^+*mHP`o5daYmBtsmK0xT(_=I|0oDW$G!2>Z}F0Z@zn+}YobN1gD0 zZSTECTTlgP`8`KzRKBm>D_^6gSeycKw3nc;vVjF~CFN6JEC4_)7x(A{i^!DPPyz3(vM z{aeu+(GT8K-8~o3qYEM;#S_s{nx@5W5)+PO43BSKgf=v4j4sKLJQq3mWPMgm6KQ?m zd0&Jv(2>|C5K~I2B}62;_xufQAItvfS`RP+^|bLOP6vAQv|9?CVz-YdI8~~R2 zdIIA>0F+`*8sW2+U9`Q7tAYuDpGx23rjgBm0H8T5IxTP~@TTJcv&_05kTxj=w7zO-!rGpd#%3Z= zO99b8e*rUc?LQ3!fTrqaqyVXMpiR&KnyN?kv7vk2O3|0+7NjX>io}T`uqD!Jjx48( zwKhmuSkn{~i33xBg}T36ttFr!`{r5xLBl(CCXLr&=>Sa`9+Tz5KRL`oKFC!0Id#3P-;CguBG-%Mpz}h5UnF! zmrfAT*bQYpF9_b>W+t6~W>JDb0!WlDh&lmPI&nn;w*~Yb5WG?j)`n_VM;|&)G1B?y zyJ?GOJ^4QZ1nw$eMm^oqBqJk!=kjv|2*kO7-VW9lh*;+WMn}9>`K&1SyoX$(Ab7Q# zTRK=$vD#Px0x|@U5eHk3JQz}|l+gPleT#tL?d>d7^`cQ#6H91*>4%=hhd5vRAd8-| z&YBKA2WNgu>#mbRrHAw&Pg3<(r%4V+8O&0u^^|p}p!817Yx6SDNT4N;qt3OKfEGIK zeXdpT^^|q9#2xy#)q^5$vfKXma(?E?pB~Od7I)b{A09oc=BMpve*ryStF)KgRl@)P N002ovPDHLkV1iiri%|do diff --git a/assets-fx/img/fleur.png b/assets-fx/img/fleur.png index f273bb5a50fbf6d7c83d444c5f44e166ce8145f5..b3b8332c018d475c01a54b7dba69404f33f4182e 100644 GIT binary patch delta 1471 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 V38M}UBHI7}002ovPDHLkV1jVBVub(z delta 553 zcmV+^0@nS`E}sREBa_h-6Mra?eUUv#!$2IxUsI(b6%jj#IAo|!7W_gSwF*V35Nd^1 z9ZW9$f+h_~ii@M*T5#}VvFhOBtgC~oAP9bdxVSngx=4xtOA0MwJUH&hyL*qjcYshY zGtKH412o+>Q;E2k$*zi_SA-EnAI1@tnPtpLQWC!7>mC8V-o<#9|9`nZM~|Ab7!VMN zXPIHz#2duZo3_DupE$ybvPyhTJZjPfi66PHc>Kn>;IhCoBW5}^PaGi@3vH~lF)NxH z@f2}X)pW`iG9Ig(w>WF%Dr?@8zc8HBSC+X>a|j76VhIvND5#=@GHk?X)k(3CqW!p! zf6(4lwX!$foQ{L7GB754@kzH)VnTTcCT*>#ezu z(+40;T_taTgF|4XK-ud)@9t{v?cX!a{(b<9(Q>h^*X5@G0Fz-BFbD$?G&ypLGuxAy z7ASvrNklGh?$4aTPuCF0&VRo_ZqbZcuIU#&EvL&oQ1Rc;W+%OdhCWf@j^$ rX537y`i)KFdHi}Kw6>iOF~;rxC6bK(7&{eSuU<{9q~9N+SM_V=H; zy{~V4KmPcI&wJSZ^Y=}8f8xsfp!Wx#2YS7;sS5B>@9w>S1*D{?>o zU^`p?u$}kM-m~nz?(SMhL^QpKddw#}=OKG`LhjG6B|b8LB46k8QTZrOdj`pw;IH#B zY_*Q8Y-59+w%Kjh`8@1kiNP(G`Rv?q{(P_a?5Z0lbALe}cDqatr!VAixMj#$@a}6Z z_PlRB?>B7Wou}oc&hjv&{VzYv?|%4iKFr=KHft5k7*DKNmlJYXhBBwWc@+t<`^{TC z0sefv>3_Zf3#gL8c*0!RV0-#~M343dw*1Mn=XH_Kw<@g3^L+pz;=Ln_v7QV(3G~}! zpX^+=mVY=F64Y3^^TBm8U}JQXMY=#~IFlVE!+Y~P*`C+B=#ta7;U*Fhee#*yP-P@5 zgb03eC}5~XA47~W#T<)?HMZnaNHL|9lSr;*pF@s0<(x~dxfNeRi6xa>N~xt)S3MjU zYpS`HT5D_0G~TH3tj6mb-|4RV9(wGl=U#g4ZGQlt5k?$oU>2>)lYkb$_{CR{G zokZn~jJaURcvc1gv{TNWVncAsoO1S5M^Qw_BBOF+rd7sBVOZA1ZNGB&BXj>KZzh(1 zlz%t(cbPLv-G7leL+bvRw?E0+RG%9sW48(w)5lYNJNLS>DT!yU$QzfMd`VBKPaoBV zGN=J4Okba#F^FJ;YAmv;bnV~5*G zGCYKEKRu5WLH3w-N zWs8ITSv}Z=G()6a^L18FTG_`H^R}5l=@*H~vT1d1fS_IOnXaw1TG$R~^80IK=R4>Y zXq-^ZbLt+hjnwcj^FO}oPYiYM20gdkD1ql`C(`d{^XoTQ_ex~9 z`F^uo^_Wd^NhDv9-X52dTKpSt?}@h|r_}hq@t$rqPo3rA{UqMDx0Ny-e}90Hin^dv z6KpLvmGy2cOIwJu-;KG+o}0^W@JiVs7fdcsA`pXz+gawtwIA$Uv3BO{ntzQj#d&glGR*5uq*mZ>2qS*`Y)|T@oqH>BC$C$H%leAc z#m3He34nR*XD%30^&8-Tepm*X93jtWp);*@QN?A>3Xf7* z)~d-V`tl&|bPo9;3 zvQkh!V&++H0DOz0&Afu*_YV3yFi=MdXg0b4socT1T^dz0$>T1$hcQv#8EmZ~@~dA$ z_wcTM0w0*YYM_N}M}NzTjc15DN@itjuWk=(`kZYXq`&vHKrwKm;gIz@l7}jkc*H0{ zz4i3eLOx+vK*$#v_+%nVZ`vp6JOo9xCR^QWZF-Kcv$Myk3O2ux@5{WWIDh5dKV{yj zI!$|+aQ0hb_B`^uvvp;!3I6h~fQx3iA`JzWV_Rt~kOT4*(SHD8^py`Q&>)Gl&{{8Q zU5jd~ycKZ=PwsrT1X{JT$)DF^B;IXPIoYnX>HR$?HFNszbM{QewP)Xc&=Wvbcht_n z7;ISJgsjffrl?T6=tl9W52zqM>nyTG73OFNA$WbO-#QC>Mev!&qU2y-LcxZY60b%- zyQw%0*tb9{Q-ADRW?!D)A1+ZR;%t<{0?4~twk#CS7dvC{SEA>_Qwx1W_!7Un<*R?C z^ncFi<{PCS{GtrD^=w!e6nf5gM}SFt@M~^DyQya3)2DP_V`-3;AI+(tPW4~d&kx+&E~8D}SXqJLH$)|L1HRhS$bd`QGw- zz4^*|>N56OdgxAv*!0vSHc?E^Q{&Qtp&Xt{S|A{vnm$k6w^^|P^RMxfM+BP5CA^ULh2y7P|GYD!4%1iqZ%QhK1WXz{HH@`NWcy$ zeG*tmKfPJFM&>HEt4mN4)h_JiINRjOv>pJ60)Iez0qdDyw&X40WX04lRHt?%$oZhM z4mY$F`O6w3ssq4{qs)lO;P;Vwpb^GNDj+`&tzaT}P$q-(hFC)$l-6#O)>J>O_SRI` zAC;6(NySe|DQ2iRlVNG%byO^sQctu09SAH<=cW0AMIWa@5AOkY66?knB6#^-ge{R-lp382&z}NLl{d5DbXb6pCm1rF zw+rxslgwhybIy_(SI%A?=6Pl>w}s{VA!=I@nUO7RMN9kA{A3< zrG_dXO&xZexMLh$_C3x(%<;qf(R6Tiy591FMRn3%MznUQAT;OItSWDf829{UAG|5d z+!~VUi9DB85g|Z%>WKys&~&)inM}mbVaPUb0je<~01i`yH&R^+?T{54>vZr*4}Zlq zbzvSUoU{P%Gm2|PBM=tV7)hfQDgCp;Oz>pA1s&8dRlQR+Plk56903;Dwa`qTpw?#0 z?wE>zETRRu)GZFvl1bdL?UkN}IO!{}Axtl5!&f&)mmK&LBr*oko5xafgSX3Sn|8+m zD_mnJ`{Pk|KYZb|w50Xr3kMu20e>i8h=q`WI>r#N4~WM)ioMYPl*@%c-x?Mn2eHP) z$7x!D%dBx~hUvma2hU}C6NLi-yf)dyQVp1ocitJTIb2nvLiiXydW zd8{Mi(CAyJ3m(j-0)id4;c~`LAm575AaEny{1~``rj0GMJyosXHLyD}dw;UkXlX}1 zc8_FiX?V0h0tyZ5sDp+FaU_&x${RPYc}~o@w;;VO;kPKOS-n|~8nM#El6#5^Qk!k$ z-Wui)fJG718@nMNPd%j8aQsI7d%d4U9+zVeFT^ zN56HX^61bUg?ie(G#4ruoqLq8g>U%Q5u@YO%}A}+M{UOWg*bVtkAH}a@zA+|b)lhE zQO(?rZQ-yoOBqxMwZ9x`XeI*-Tb|)?5=3p1rLr4}jMtagm+|ufOsROrbwGTl$&rxjiYNR;n3h17+gU`raWD9hTMto9B{8K&IS*ECHJII#o2X7 za9EESd1n=x;?%c+KY!_tDyn>wck1GwQ3d3QKSCs&QHAkR7bSisDL7#)5k01$GT33j zXx_?A*}W8u=o%tn1TR=<1G5p9c|IJ>uJA=**;UOpXcQD))7&dfPpwy)x@C1m9eos( z<2hnk9;!hin*xB@2Sfz(btoFYOM}U>_4F+^6i_;KI{K||aDUq(5H)6497JNGiQ%&d zwscg0u*d#5ctV6|AVl8`e3O9-Ypov!o-SDXGsx93@P^kym+74ic+I;Hz}}gJW^x%! zeVa+3GJ^e@NqDb$PK)LYCA6J-XA)P_{}q0}!FQupWlNC@@@IyX9eo%i+-WqM=D{0n z_-oMgDexp+=zjr(N9)(YawcRqAJo--(<$p~bl}yc8Lmc}I?xhd+D3mNg&RB8J(#Ku zDoGVHj$1~@HINR`HDO5uP2VdFoZX^cTgNDNs-iFj+p+Vl$K)A)S+f67UGU#A%Ce6vxQ=tkH!Oo!ngdB#k)p7 z2v$uB$pU3c_T)H77HvUh@=Teh8u)@lSBiA1VDP1s0agUfOGkGs80j!HOU+HIUJelU zG6fAJvpNzaO6#Ft<6zmj9KO{Uy35shdEsF(vr|ji5>2;Nes2l9!m)rRw?;)p)Zbb) zf?g9ImVXnHNE_A)smMEEG-1@qsnMh#uHsLmhhSsr8{{&t7;u zo*~m7phxsOvQ;*$sQ1&nm#jJtxodjRHTHjr7z8D03(a-RtO_y=4qV#+FonEOo;Vj6 z93ViysBL@!E=G&YTQfzZYv`?NK^iPHXJYlPpnvK@!V4gjP}DlkUUEmDI+33Hs*`aF zqrLv|Eg8SfDU@3$Usa-W*#^BNiu??O8gYd3+7GY<8Ve?Sq@Di;w1P^Ou#JC zw`)Y@cc5lGzl;g~yBUt%tu9ky^YRW+Yt*1tZy%Os8W8@jJkW&*c!Xl5v&8GmLgw-IJ z@w%9=aVm!PYn%!|Ju*+u8{{k1=X|Z73FRI8GzSwR!5~*;I!$_u=J*=bbWU>c{(qHT z{hU)X9o=<%&deU;(H(?!pII-}>d&NCS0gmy#Wsh2)^-s2r{mr`?KSa($e-|dCbQc8 zKSre4{{WF9uJHJ>23~MNdBoDDR9#v&z*PTNOFTa2Q|59n*JGhwrR1(0dqL5=|V4srnGnd5|c$ok2*8nmuc3{D15>q?rU zHEPYer_yt1+wVCRaiKxy_Z*Ar3F*m4tLkJ$=UAsZ{u~kWYoSW@kJMkHL4SYCnbSE- zRz}sPJvyR99km2?>BQsN={fR=I&+HoOr|MAFud)Z7Hd9oJ>0=IzRyWh5CpOw^BJ<< z69Ys9U_;H*ahBIq*WoKYZd46BV+s-QnS#%yVQI1kOK2ceP!2so55Z?IV}V^SsFflu zq3bL|r;iy&dW>7vSVY%VP=8&lsH4~$vh3L;Y-!5uG+9=xbZrQl7&?xpYt}PBN`65l z<(%7U#HADW;R7y~M@39L{V|;5_daUP=Loo(p<{EJHnHn-N@V3bq{5D^d3``=jy~#s zd+2I(>Z)jle%Yv8T2r*)A{WnPJ)Prx4SsWd2fs0%!EZ}#6=z<-bbmYhpJDvW0_^)v zZELEq)6J^R&|wg~{(elrLhmy;$<^vqHO{fmDI_ugpBMlN8I{GeC7)wZuszc_$jHkd z&@_wAzQ+~=|1U|d3vm}YnucFZO6$^ump>Lpo0k+*A$ObHpK;VSD7uUk)|s1bo$NC< zLp|zd!18xotTF7q$A4cUe9^TYCr*fyECCIu_C!6BTXf>+6o#IOS`O#76FtIp&03ZY z@6Kq2GQ|7`og{$fGaj6D+Mz;9nxQXUh#@d633JKH`Mv!7Q%D+(Z2t>Lny3CZkTmxq zz~4jibJqP=63~1!;6IaqL$6vo+|*?ade}LQVn^H1$68N5fqy?j*Ka2qF2t^;N!%e$ z1<;>6MVltRWTMW%-dgd@u?WT3Gfme-fOpX`LZHdc2`hrOS&}Buorj#G?)*_hXIy(o z_Su(X&4svV_Qm}Dcf&&j*%w=0uOI0wyoWnV;;`^U9rQ<32X`7xRYGtnf)ln9f?E^&BFpJkoFl;}Ye5bY(%; z(ek+pK|DgmtLPwoBI^4&+#!yJ=ALkgJTK{1PPM!PZm!f|)qD7xfWk-lXMB8!MEDRo zbRG8ZWELJG6Zf=RO2`KunZ<57Y1)mhk|lN7BrvVZLVvWt42Gl$jypo~Emw0n@j!vS z)0(O)1!t_iE6r!bbDe;KrybGVwi_tRMe`cB*l5V}+{3~BWdf^itTo1ffjj zyB(lO&%Gg_n}Lt;tq~Z2oc;XL^7Wn@Gz=oR9p}`*X<~ZrrSc+0UVD>4H zBKosTI*z>bqhNJSmC-NQh74#c5AcYEBiBkj_qEr#Qf5Hylb23Z!0j2fYr3NoN_ez? zjd!42s1?qygTzG%5Bx|t10EUQ#)HIHlr_)NnIJ+DCaOuId?{F4z*$gYj?^OF#z9j~ zx__CqB^_vh$T@YZ{)pH2${PiJk1ao>qjC799Whbzmw&`MAGM3eLhYL4v5wqzm3+8! zGe(L0I~a_hGtYdHpL8Wg_Z=4PP0+tmV)vl)Y2aLfMzWc9M9-_oKA;$cz+bU%{vP~4 zuzyGmGNO*-dX~<^Prnh^&AluT&sv=5;(v+)iZ9RGyBFQ+OsU77m$v_`ahbzR>N0;f zU{Sv+lz1q})h1a`3SI~sSmj+z)Bv81kj&_Y^6bt9{bLT$xrp-^<$xMh0*itAEvJh> zp1M|r;za_qfbk3QIb)S$a{almu{0&83t2c&^Z!zI3!1pIJ^<1px{T*(U=H%tMSp48 z-X=CnAE1Mkr+Jpu9^y?oq2T(t)~8dZ%No)FVvWldmo^}c?aZZ*_;pp1tmOBWm`ucb z3IZf3+IuOLRKNlw*CZ20L|4EMo1p8l!%dy4;g+o~^I!c!nFaBt4sPc$l6(Ysnw2W- zSZ{@*!Sz8ZYu$O)S6I<^V61|@8~n`yDwN==A^ml(JyQZzFfc50%& zzg2VAoXdho(cL?b{#4r-_i{{9VfWbXwXf&Bb@7fhE?3=~7t@^EH@dkPerU4a>W=%u zKe#3HlU*W_@0~MQkKYbe{D1z)T-^?Mub(w3fggLu%e)J$VxW`qbN>_fqn&+d`irGC z2{SKIp9@pEfc5LW>+jdDd9$voGnDn6ddp(t4zvmL_@RqC{rmNnKiqD4xBIxiwu$ET ziFYd_kiFku^nS1H)&0u_WAnQk#&1BW@w48~r11No@Qev{FVLLW5DXdf{{V1j0uNjL zk0_BL6@Pe~eUUv#!$2IxUsJ^*RR=qWIAo|!7DPn^7p+1ODui00RR@zxzo1D&lH%eh zxE37zSgbm@IP2=*DhPrfATF*>iY`*(|B^zB7!Qv7@$TN^?j0c1%S^L6#sE#X%~T>T zX0oed*DJyZp%=i6%q(M0l9KQpU-t;`^)AM<{D05=IeOHb#ejfFJj)EzCf*>P+O!SM z`@|7elvUz$;!%?>Nc_lk#p5^51(yY$88OqTdEyAMSZHIVjakvuh$o4os-{!EknvdM zyv127S6TC({DtA1zOu}9nnOrn5lfIDLO~TJlwl)At4@lA6z#`-{DZDvB9}t05*Rra zP=A32+4Y0}!S8OZ{KUAI6pjO(FOKsu40P=Rjhf?pA3ILt1PDF@S9;4|sRPrWq}N(n z^a$wN1}?5!nz9F6?f?T%hHT2N6r?HS^T7KVeNz_bzXiJ2yxyAoIDG)p)K&5ZI5-4G z3Y5L>^X^c4Z~vZY_V)u%$#R+E?jOzo01yBMVoOIv0RI600RN!9r<0Sh0U&<}4h1D( ztqW=Z005*(L_t(I%gvNa4!|G?L nZ(7E)=E}AyNgF5I#9wUOoix!4qfD@=00000NkvXXu0mjfqwVmJ delta 595 zcmV-Z0<8V`H~a*U8Gix*004!Zh?D>T0fcEoLr_UWLm+T+Z)Rz1WdHyuk$sUpNW(xJ z#a~mUMJgTaAmWgr3W5bu5l5{;5h{dQp;ZTyOTVCrAxUv@6kH1qek@iUT%2`va1{i> z4-gkuCq)-2@qbC7MT`f>{djlparX`o8dauQU1NZz+h!(}6n}I16*2UR2ttTr1Ywz3 z#;hcz;XA(W5#Z}xf@k@k`*ZZF1&aXzk$8p~rcJy~Jhf>XocD=itSqa<=ftBXU6A;Z z>x##3oJ%eXJTqoyGjqf-VzJc0N(ZyDsS!^S$5lof<_Qpd2CnqBf1?3Rf0ABrYw;r>x(!@hw>4!CxZDBy zpA6ZQT`5RYC>DYDGy0}H(02>;ta`n*_Hp_EWT~t44I6N92n?4fd(G$F;m+RvJ=5y% z2RAozj|1oj{*x3NAb$rC6%NP1~z#s@jfq4HbPZuP_@(bFe ztk8#m3=DvXm|2}@4VuL4Nc7xfp_xsR$j3jK0jTO368h0zV`OI6U4z_Ze3&Df6#(^j zCq*vIB6}oJ6&rDbQaPK&)*Cre_W0*k6TKx_ecoC0dL9J305Suiu znh@>w8UA6Im$IDTb5=DRroIyl16v?0 zp6^>(d$0H2Yn`?C$>5jt#edL;R#KJ^UXv+<1`wjPh<&g7D=iWq_Jh~HLT!^{YI2NF z(11)ySV!JQ=$(UzMaYh>pF?cf3y3X$2C?@HAa>E4h+S_*tXYZJ5RV8+FN?UWu8Q#m zTgGx?dhi*li1N6jXqPm|BU1*S#&6C@nX$SYu}4bXr)NA!t18D3TPQ=U^(bNsE+Tf} z6Qt1(+k41C7M_e6|>8)n|AtbP-)xk8@{sLWKW0bCzXJ6|+Q9TdI}y%x#sN zOG3elxceo`Ps?(G3>Hn_{%@cznZZsZ@(|tpvkLWyep6GNi2_cNt(UO zz1fBB{t89*F+1goZo-Y;o&J!gC2^UBcQGR`t6%m37O zCNsB#T6IcWwAJPDp`BF!?+c!3^kx?JU%rd^;R2E)Har)xG2QOAu;Wy8aDuK^+W+^f z=nJabHhb$Ygkv1us514KI4(}5>d4|@hXp!*S z%j92$m&s3rr>-8_9+25=`%4@DXxd*3l+K8AZGS^U#qF1o(YpaxfPn^^?ynh#oIyhm zO{IC8PiUQW=4L0vuykF3yy=!y^y{gG(&K(SQrJJ(`$G)uSk@>FiD;u+t)GnIQ^mSaOeAl>y zq2(vSjr3)-0WX1w8f|-b>I~*cJA}(GV$?lh=A^w3aR#l%CuL)Lf_)%2R5lmFRc(_I z1#p^us#I`Vaw;FfO?bX;O1L>fxEZ$(x3{n*Qm1#try9KJO_5(F>hwK#B^iv5Tt-9b z6X6)f!;$l|A)FZy&g?)qPO5J&k`E=4pb|Bg(KZ>xS-_r`#QvtS`Kom35}9jF{tpmO?8nr%N`3sSUR$86L>iv*G}!$)al z$k0Yrr62{8w<%79_kYL6h|A)`npAvPqbe)aC22|0Wj3l>k{&yowY7(O#IIw#@&=We zdHAd;qHTiHKOm0NwVlAEt0s5!ci2lE#mG7193?Ln(?w2RB)8>DdY3TH;nI+*Z6F# z@zUn5D(3O(b1{~i=VLb6%-Bvjqbn5mb*{55RpiTRp4u>Kitdrjm+91b`#1f9WVi+M zp^s5Rp=COflnf~8DPA!4Gsp)L%U?W{0 z`cVIe-ym_HP&?Fh1vEuSNX#)vA{+}dTfK5Vq*{-E8Jnmu1X4WXDjtmGv`F4y8=)We zXQVhHgy?3}ICN^)Lk+Whlsa0i!Fu%<7ES+Nb+qIPxVS3rNSvOyfjOLT;c&W;Q)p%@ z%X#M4NjV*)#bD!joynJUtURBAjgPP2l%7_c~$9Vi1*hy2Para`4s z_rQVTt&@=t57oewy~aXDJnTe(4DP=cQj% z;*Pl3g^NcdEvkaYGU9ZGj9n(3N%yCFbUUC#BqO&T_UqCfrdobIf{aYguAKNGZo~1u z;`uUXIC;71KgpFXRWu*xbMe_YLve;H%@jS2ZfKOi>mJF$_2q;lBUG?GN3=akY!?vQ z8;&;}$=Nl;U~X0#6^XaZN-db#|C~`pb^>MhE>6bcPQ}BmNPHn+9wojMs217)1@k&_ zcY@3DXR|g_-EKDi9g0SB_i(}*DsPN1p+A&P8X{#H(+%`;Fd!iYVNA|)c;iS-p;Dnm zw5Cjh6^!NpB$;8F#6?@=f<-V$|q%0j<;0EVGY*I5~D`f~BuSV?B?J%#0 zIh1Fp9?Y_ct%A3MT+Y;?cMu}JsT2lw)aI!}r_SsO(C66#gB;BAg zryelmhif-J)w(dy>#LaRCAf5sab_G}(fqG76(&WywAzWSbE+sO_RJ}O-_Vo-%7M#M z)*GOBR#$_gLNTkcQm`o9xN&0(sZvt0z=Oi;sK=g^HDzi(*ek11H!`|3XnH}TlsAaU z^addXqvC^1X%n3w8>|R5LF!>@Y{sD~=8F#8mO9H4cOSIz#ftp+{9v)Q*X-7*9T2JA z?~;?gUX?O=F(F+DZh&gXwJ-1g8f|hn9LbM#P<`io?75b2P(yD4%wDbe8j-`rRcxoL zoqVI6YEkvjn<8JWu5p;R4#HJ+&67T)j&APq)N=}^U3!17`M@CMK3VvRn<|i!RXYzFOWRj)_bs6(ThR?qYd{@B5?FS_HN%Sh8Tpa~Q zHR@lgvn;bcZ}TI(l#40cgpC z??Wsb0{U8|xpcV#8@$mi5Kf*Wn4KRogSlj{f~d#H}tNxgHX;mD&uq~y9} zBmNr4xowpvR&KvqK)^w{i@BA0+aVpv2cP^Q2OFCcMr5uuF%QE!+ zBXd;Cx-yr>XC%4K&tdwnFI$$A)Dt{{)N^)(s0}01h&lay#9m%582O{P*Ra3s;vSP5 zgX&nge++41-w|s#i`dj*e047QEDlSHr{{*c)6+7k8Eb0ct!{QVr_ZKT1%E*7ykwb@ z>IQ&5Y^=xo?)rL?Y$q&2cJGH!J!+NV`K4e z=IPzvWL5?2h%QC4nYxO@&oq#*Lh zPuR-be}+{bKSx&gN~TE5|UGzbF-kb)PKQP0>Z4;kpG3LAw@g41xCis4vvGaTwu43!-|9X470d z))rl&O=>JF&ZkYu?$Y9Cskx-B2f=X~bO_)mtoSUzIlmwI5nFTA14jy%b}# z2i^d{3jk0Jhha^J;lf+;mmu=5&U*azLQCa3GyL}hLhG#Hxw+NL7%FTPtd|^v?}C%%FT2Z^t0;Pf z64%$R1mr$iTLhIUb6;Drjt+SjwrA}PfVbTBb#tfA@t*rUaETHhY+myQ2}f4HlCIi^ z&Gk&kyKMrCt+|GEYc*Ny5m?o|b%DMK{n1=n^9f9U2k@J5AY%f4Y83a+KMFp0YpnUuse*T z3aw~2L@C;n$xyNXCep$wZ1LYh9HNom?|0|y(@;43sboC1T}l<>nojuY2l`D5{BXnt zJb=Kd$^)g>v|BkwgqBn2IM-QuWc;RC+*ef`5B`%jA~cUSN`6>ev3PgEDyC zelEa;@LK+aZ-Ffh6jj;fpEpo;{Qt%;DdBz+0QjE_pt7XxCjwLX!QZ_ z5;F7Of;|*^@!C&NCn1!>5($PjFWRTZdo?ZUpLp3S@GVI8{kI@@>*E_%!9aO;iIynF zcZvc?xm!>8eO6B3uMVuhKF-$$^tGZsoIyl??b&fYXDcWAv`jgTUn@UH0!)G#2w<8-vZ=NM5R?5hYL7JvvJ5b{UCz$y|*k%bh) zTsVHIo0xks2D59!GALw~sewtLV;qR~_W%UHIF2s>7WjB?Zxr6~;(Hbf^+_KCDuM5; z2pt6=_&I>laRBS`sn(}lC;}G?0bfRf?8KwmY*4a2zaHuI~G&itGJ;S>0HePY#-)sc()U`(Jm z@pp+C>H`s07!x3KL)7ak7@H;tsgWPV6DENlD-8`I_s+5Ndw2oS(aQyq|iNEZzR1oNKc>GRh;xcu!jjNew{r{7ir)??Nx#UH*6 z9|cw^)Ta25_g8$_m)l`LEGhxO;{G?s=Y$rJhou{jAvVJfwCN9_vGZS>PJ|ho1)oDX kLj}&YMn$R;Pn&@n&(OQmuAsP{e6{mCiWU^|X(-PXYq7X3be^ z=bXLIIeYK3_da`{+*?1;1J~#e*HM-aY>aG9KSHz&ai?2G)yUVl4{W2TX?jdej}e;F z&&bHssZ$6Ye;08G+0cXQh+EZ*xV#?3tr$Su$`28@sU3080N;QiA87CT`c>uhzVE!^Y~rAc)!Y0#GNv@F8Tc%Eno8xaoNCR4+zKt2D#(dBw0@d z;?t4{I!lHJBpNCie=Er$h%P`U9@!x%u_++OpbDgJh3k+6aedYh>CQKP8*^4j6vOR0u7YW>BfJEI(e z2koJpUu3^h>rTya-g!#<(>I6j-X@bK;}SWg?Jb;r$CVW;~=jU+{Fmo|um9eI+`;5^BN;DimsJEqpSpRKWK z65Y=MCw~vp%g2z=xCIZ--%c3RSlyd1KC4xwa`ufEw`vSs@von0P~;^hY~4kfcYaxq zPs>#nGq2$_v8pCoCr?v5=*&RPZk-%Tiwlg z?h6&QX|b$>)~b5JK(K(_L z65R_nE3VDc=(-ogChB*Lq2UEj)QO)|Msn33Cvh9af6VM zkU5;N1^e9Sj=vbMl?d^vTz7&-;+_u|P2aFy&x7LjH(TL?JFR9dXH!ci0t(iz*f5o8_^F?l~iI1PkNKk#{noNH+5UU8j^myU{umejefErAg#lvZ`*FhkkA zwAxzs@|KH>7_%{~TQo*#*o-|5yNIWDQ9^p2W;h)@b*}6s4Qod_d70H1(oK0_L>QEH za%_%&x0vA9lX{nZ2W*j~tfQ%oQ#k(aLC*U~Qu|A3I2DnST&}{ehi^0n8KpYyUaIEv zl#jc=@FY9;wm=dkM?}pKE%}g2&V%v121MN4hmbS}VGfdNP@`KS1e7M=g=~xzQnJq| zez$NX%d1CGjdg^6ej+8lE5xg+UzttAI-aYE^iXUV%i^=_RSWBUjSUms0dco{B2-6+ zNWkw9v4kNJ13qFvWD$rS@L61lFVS9!H$u)bTOlznC5h7}9)c{kp+nGSGDBKZ2rqrw zN{qJUxDW$3D`pV`X2akau{~snB`X_+a9A2XYiSrPRX$lt!_pux(;!$GL{?V%n05*Q zurkoMk~o-LJa5Qys)4Bk`3|5Q#7z;283`juppjIgow5`va{GH2xx$0w;ch>zT=1)v zL-IOf&JGn)5nmUM&|ei^Ep#lc z>r6>-sEuJfY_0mtz^s8F5mt?e8syo#QX({oDXm70QS;?;TpXziU$W&~@3KXVJ$TmY z#kegpF=3%2=^wZx)QaG)DR`*#7epz6UOut-Pm$r28sCmgqC&7dDj`McJgk@djvNW~ z-4`-|LtQ0dgG_M$D8RwL#FzdC+#I!ys&d_k`hcQGDc8a1ja23eG70zi?ldD3gUTwP z=K})~VF+VV-XJDPkRZ6kkk#VU9%?`K(=3?-0#!$Fz9#p{JL8Sgsdt9!sHT{*w7}LC zR}iQD2yts5H=cv}B6!$nPXi929jF7g9O8-x0f)0h!#MkjPbKnRQQm;KJWE8AhZc!T zh|xITTcH!w4TOE?dzrz?U7#;Ni7d+MQWSFpzRV$Z`}XI z;cro+{58C-voJ`f%GWg7lTy7-8*r4u9LyKy7hB_#d8mblZR)bLK9z?{w56-@_+9(a1Y zppR|B!H^VP5q$aSC`TaCD;5 z;*)1Sk4DlYT{0?1DE!&r^==x=a)ztCA#E_nczXLUNtwQ^& z)P8%wP_l-BN9Y8&CaFfwvcdwmRdvqMz0`|8#p@uJCdzEJk*uy(k;|m$EY2^1X@sEe z$?z_YF-pHf&Od=?*$-ewh$1Hb;Cr)m^Uj@;G=+oC2#5b6orHZ|r=Xk;O7f6|J&$2e zFxlf&nXRd5-TotpoxeMP)s2Wl<~v72UK60S!mI}h6WB~02?ir6Ie2267!Hg^YItHY z;u6yFtt3rMG6N5g^e91Wl(taLdo_nhN%R^RZd;<+6_=b!`8{0)w{yFz>Zxc-p5;c| zQ^|~s+6Q1m+`>Bi%EE7_$u=@Y$S#}yElTNKK0di+dd`qiOh-Qj^e60|%pvaN6@a_0 z6KStb?e~fDiS>%iU-Y?>{NwC{)1ACKQyZ6h@hXbWa^uE~&y^WEkO0dTLRz7`5+J=) zV&1TdHZ)m#w7C4B-s!%S*rv30&VC%$gIf6 zRay0Or_gm^ARrB8)zfPpVng<(xw(&hWh{r3wI}ZNMhPuw@9H8hWgSd35mUPWa z>*-~!`1;Z;(y_~K)4ci+pGEV@t{nbVY5_^GbD+4*`4HeE(0u@4aAE>YAg=V2A!-!y zNw;DUXIz2r8#Bmj(0{|wsDyefhiamm(dsk!Umn56c+--x*K6E5B)r)U$4O%>~) zbDgeO3gIMk-Cehd4tO6dQ4Km&{n};PuwW*RZ5xNMxvGz7!BnrKi;rS+wKm}WI-)Z; z>oNXplPZln1;;NiBX0E(FCD(@*wBw)>H;wH>QLX>zR5lZPM8yiYc_?&aPL?7=1Srw z_rcZs@dV;Z;E*LPuE0&n;rQ0>80^0%8D{`A0K5V4M}Qvz680wJ^#J<;J_Z=uyIu&8~n40uX$K%iL<9!#V-|4Zz7scnA8=T>suS5iuW8?F_vC5WM>kvciA5 zL^EPm97N;`4#_qQ;g5fKlZ_{`>H#`{HQkPA5s$=DHDUr}NX9To4U2h1yPkVXMd6Ry z9_9Uf{L#Hn?e|2f`~CA85-oZB=5MRb0y zY!+T}ZhRKb6Ab@Po79s3&V}nUrsxfaH<;R|33UG9f{LTFaZ}F>y!z{}ulG!Epn0(4 zoVVuFjLeIhByi?- ztNzo6i40xck0_HZ6nK*+rg?ILcP=5CpooTfYCNjLgqKe!;FL)8Uy$pz%@e0Kb$D6K{OwzmQko3C}xgo z?}xs(l;V45^mktj`r-!QzuurIAoLXWct|_+iJ>Ruq)$-%#%t>-`qG$~U_xJ<@;2L# z|D!GZ(DoMBD}AqsDv;&({fO`7y?yzw_%^`Xiu(A8Wijn1(^TzkF)@h1m_p?RU^3a- znH(790+7>_p5SDB&DH&0x7e>75^ebom)g0*&vKLlI&qxOdEBu&7*AboNI!3zX5&4l zXXAU$&c+Wv{0E!_&J2D>x6i_tb3Nu61jrqSX9@uPm~Hm_{-W9V+bvlAaTwluMv31) z6N;ZZBZEE;Uj%q`Mj?NloSn#*0RX$6Ay}@gUw9sI+(97CZiL3A6AflJE)_EB;?gHX gPEX<;%mehPHfwwevg;`mKKk)udO3V9|5!%-KjP866aWAK diff --git a/build-fx/SuperCbr.elf b/build-fx/SuperCbr.elf index 83decdd5461741b973c18a91b478bbee8f171f10..15f7e3c3a667cf41c0cdd3c4707ac1ba1be86b88 100755 GIT binary patch delta 14056 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 diff --git a/build-fx/assets/img/1up.png.o b/build-fx/assets/img/1up.png.o index 4164daa6792d250f4e91761bc4f15a9b4a0b5771..d4fc04155120d9f18befc9453f3b1b43a0f9717f 100644 GIT binary patch delta 150 zcmdnNe1my{l0TyW0|=OaNeu>81{Ow!1`Y`z7liAe_&<>T4a6XNCX~Jpq+#+lK(-1H zOH2&36LbMG7=Xqy0x5AIcA2=KpV4Kq0i!Zw#pDo1b;c8uYZ%o<-vXtSffxor${7Gx C_!S}m delta 118 zcmcb?yn}gyl0L%+1`sd-lNt=H3@i)`4IC0cZXFQ+2I84Od>_hJnOJBir~>3L2rw`( r0x5AIR+)I9pHXFU0HZQv#N-l2b;cEw=P;^^o&`!N12GJMlrsPTRQVBG diff --git a/build-fx/assets/img/bloc.png.o b/build-fx/assets/img/bloc.png.o index 25ead2d214d21f2253e3c049e771227fe4d91c98..906e58eca2f22c445390adfe91378692c2d67747 100644 GIT binary patch delta 32 ecmdnPyoY&$jp#uJ28R7Wyc~)_?EM=9vl#)4s0bPW delta 32 fcmdnPyoY&$jc79i1H(=rUJAu?f%L(Rf!T}zgSZE> diff --git a/build-fx/assets/img/buisson.png.o b/build-fx/assets/img/buisson.png.o index 5b93a751175e9529b548fd6ffb6e359d887f056c..d59e02caf8b926bf7eea7b02acd4c13ae3253294 100644 GIT binary patch delta 144 zcmX@Y{DgUeQYfPg0|=OaNeu>81{Oxf1`Y-bARmNlfY=3y{{e9m0|Wd21O|4^1P1>9 z9~d}XCNRkV|G^-@zyYVh;tT?l85w0KmPiYNbOPlW7=e^L5W7rVFq_e3vJIm$W5whI RMs>y$lRJRq&&eAYMF2lQ9Yp{D delta 112 zcmaFDe1v&|k}1O<1`sd-lNt=H3@i+c4IB&>K)wqQH!(1n8;uL8?6_73g1_nkTB@e_Z6A#R0RGA#ZsLU8Kxq(rgamC~nK=S6~3ydNFiCq%c diff --git a/build-fx/assets/img/bullet.png.o b/build-fx/assets/img/bullet.png.o index 58cf7e9421b015c1638f2ffa82a0821f4ced65fb..aceede1e7ec951c18046fbc09c97da0de39ef0db 100644 GIT binary patch delta 101 zcmdnOe1v&|vfdvC5HJCg8VsxqEQ|~bSjvH15dPl4z_0~~LG)B0emv39PEdsb2m}}y l7=e^55UWg_Fq=_jvJRs%W5nbDMs>y&lPiGawaE(@MF8_K6(|4z delta 85 zcmX@YyoGs!vfLX65HJCg8VsxqEDQ__SjvIiEe#9|Qzr)635tN^1Q-|?fs`x|i%eWF cn^9!44Wlxn$K(V?b;cQ!JAmY|$r~6&0C&U?KL7v# diff --git a/build-fx/assets/img/carapace_verte.png.o b/build-fx/assets/img/carapace_verte.png.o index 0e0417c235052a896144d9f2bb017db5ac833655..5cc8bb6e4df530273df35d372e81bdc8030f3aad 100644 GIT binary patch delta 177 zcmaFB+`=+JIm(6s1WdrB1_LVt3nN1Vrv#7-!gWBL2E_k?xDkzh4(0EK(zk&$Og&it zWJN~#i51e4K0pZu0R{#}Af*e$Q2zgq6Ay??JTRTnXL1CiGGoK!8b)=-3zL^Hs);d* O0hK8OF${pTG5`RfmmClP delta 114 zcmZo+dB8kD*-U}~1WdrB1_LVt3j;#~CrB_2h#R5!Igs89#J7PMBrY-8kx_o)9BDxf uAcsMKfq@Z7=>oCF#1oqtH73_EDl^7RUcji%xMuPRMl~jePm@0|iU0t#s1%L> diff --git a/build-fx/assets/img/colline.png.o b/build-fx/assets/img/colline.png.o index 2b95054c8a418b0ec40c87e9d50a3e11a196eb7b..4686941b1536c08d12a34eb5b7e1474d9e07e65d 100644 GIT binary patch delta 176 zcmXYpF$%&!5Jms&uDEF73JQWqB7xumY^=;Rgw!4*uCNC%tevfeN3hHhJc5M>u(S}z zi8%1)!N9zSKAS@}F44~Nw-@NZ5P28plyBrT`BRCv0tb7=DT$#7$dES|AwwzJ&fq9?jeLwH_d7t;4*>{bb zw-O;K#A+5|S0MHb$m_&9sg1EyEF6-VO1*%ln{$rOA$9;`2L?2l1UaVhcpJKs0Rw9N zxI6Fo9A1x4FmfIG(B7j)c5e6UnpMMsavO3Uvfp7MgBoLoF_gn6Zg|6 zwiV)wQ6K#Sh1P%Xvwq^-a$x<*)4@D$zT3z8JEpf@qTj7nis0;5m4@pE1S*#la6Fc4 zN~4chu|;rpAvUEM5U85e298&9Tf}##gueR2BpxqYLLa_IoLRaB)9r#R^qQs-@0k7~ z^!u^8^?NlXaDTmJS{_UATJ8PnP1_1O=jJVBl)`Q#tK2j`ywlaBDJ- z{C=~;#dT>z2D+a!pV%aF9X5!bg`NB%=l+(2er4ViT&`ANnqAy8Nw4R$DC$}#9Udvf zkT04l@qV}dyu+ieJ}UI4IG@bA!&OU1y(CBKc&c$jtZ!N!$cuY2@k~kRQ~74%_@{@Q zu`qGfJ^zJO;&6>STypfGU6>E`r-+BUocgL?iKo>|DsppSfViv_B~xGayJOq$oK4wq=v@MB7cg4{ha*sTdGsN}+9Vd}g(UxT**} zSxHokvE0M_kX4v#_>7C=>Hk!{I@m0xq%oTvWSS!GA6?p!kE*)_@~c*vcZwj z$AiP!>{!+l4h}zkpt%bVY?sDyZ?HAi=!}6wlk?DArBF2Pximo+wT{UjA!u`Z;A!4( D6u{p+Ct4$DEj=YMjvj`Bgz(TwzcbqI2+)L1&lEJqcX`1rLhb64Y(Clj4fg`_AmT-|=8R_`df(-}htQ_se(Q-nko- zP=aHT;5zxjhP>s+`h2ayIglX&%qKw&cp*7Fk%0f@BcT}p>RyZ3@LmL2@vDKFqrF>7aLh_f54{$-k?# z++rT8TDr}Sy4p%sn=_b!-IesNU7f4sYkwR=FS@EGKeWL$-E3seAW?hgf7sOn&95Ia z)X?{airt~}n#E`+ZhB$9zgj&telmZ^Q$qQ1uN2}zuMpz+?^2kHr?X)&5CrcTF9ZZM zjT7@1!}Eu#>Hf{-^=+X6jx3H?PICjz#bJ9X%vMg|#Lmuku33PL-t?xxqvUrAY-f7f z3eARSrH!uP4QL2jZc2aDPRO6-5n$pQq)h%nnU(~|Fr}|AIRFuQAo~uQX+!Bu5l6Gy zio68(;9sQ6;^Rv;>ptZh7hKrmbb;EZ9)#%qo$ZP8&e81{Ow!1`Zn_7liA8*a?XL1My5GK1?1Y2EwcC diff --git a/build-fx/assets/img/goomba.png.o b/build-fx/assets/img/goomba.png.o index 04977925a49d2fd543777f8d71d7ed7bfc60a542..a5039d1071e4d7a0b0c4525f5bc5137496b71e74 100644 GIT binary patch delta 40 ucmaFE{DygghpbKg{sT4+3moczbY0L&hyOtOzt1v<|Mv0?|2L+#GXemTfD}gn delta 40 rcmaFE{Dygghb%+={sRmS3mm|7&`O6oAivIMnZtj3`G%z%Q`;E-YJ93hiHJv+sVuGgD_0q%y6~@2p<6IJuo?tQGVhUX~82v4ub##10#@92jU|W lA1r4)GP#3MneoTuHH>OZj2@G(Fsh5T0_Bu}7zRM<832XpJxu@r delta 205 zcmeysGJ$1+a=ixw2$+CL4F*;Q76v8<9t8nLh6bQef&pX00U*5~fYD(A68)x(_t*m< ze^aEeCrI2-VzFQYkk%AgDg>g{g?Gw;XqdR2ygWaMZ)P}K;sB6FfXVw9g(izIN(-id x!~_@^7=e^J5T{IbU|i0aGWi9gGUJTNJWOg#3@;{|FsX~G0wtA!7zRKZ7y$STA}0U< diff --git a/build-fx/map b/build-fx/map index 2ed5bfa..c849d0f 100644 --- a/build-fx/map +++ b/build-fx/map @@ -201,7 +201,7 @@ LOAD /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a LOAD /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a LOAD /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a 0x0000000000300000 _brom = 0x300000 - 0x000000000000a3a8 _srom = ((((0x200 + SIZEOF (.text)) + SIZEOF (.rodata)) + SIZEOF (.gint.drivers)) + SIZEOF (.gint.blocks)) + 0x000000000000aeac _srom = ((((0x200 + SIZEOF (.text)) + SIZEOF (.rodata)) + SIZEOF (.gint.drivers)) + SIZEOF (.gint.blocks)) .pretext 0x0000000000300200 0x8d0 *(.pretext.entry) @@ -241,7 +241,7 @@ LOAD /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a *(.dtors .dtors.*) 0x0000000000300ad0 _etors = . -.text 0x0000000000300ad0 0x5290 +.text 0x0000000000300ad0 0x5388 0x0000000000300ad0 _gint_exch_tlbh_start = . *(.gint.exch_tlbh) .gint.exch_tlbh @@ -263,361 +263,363 @@ LOAD /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a 0x0000000000300db8 _score_display .text 0x0000000000300ef8 0x40 build-fx/src/tile.c.o 0x0000000000300ef8 _draw_tile - .text 0x0000000000300f38 0x370 build-fx/src/box.c.o + .text 0x0000000000300f38 0x374 build-fx/src/box.c.o 0x0000000000300f38 _sgn 0x0000000000300f4a _check_collision 0x0000000000300fc4 _box_move - 0x0000000000301248 _box_jump - .text 0x00000000003012a8 0x544 build-fx/src/world.c.o - 0x00000000003012a8 _world_get_width - 0x00000000003012b8 _world_get - 0x000000000030131c _display_cell - 0x000000000030165c _world_get_ctg - 0x0000000000301694 _world_get_real_x0 - 0x00000000003016cc _world_get_real_y0 - 0x00000000003016e0 _world_draw - .text 0x00000000003017ec 0x40c build-fx/src/bonus.c.o - 0x00000000003017ec _lance_bullet - 0x0000000000301844 _bullet_display - 0x0000000000301998 _bonus_set - 0x00000000003019c8 _bonus_move - 0x0000000000301b34 _bonus_draw - .text 0x0000000000301bf8 0x6b4 build-fx/src/mario.c.o - 0x0000000000301c08 _mario_bigger - 0x0000000000301c24 _mario_smaller - 0x0000000000301c50 _mario_draw - 0x0000000000301dc4 _test_sol_le_plus_proche - 0x0000000000301e30 _mario_move - .text 0x00000000003022ac 0x40 build-fx/src/main.c.o - 0x00000000003022ac _callback - 0x00000000003022b4 _system_error - .text.startup 0x00000000003022ec 0x1c0 build-fx/src/main.c.o - 0x00000000003022ec _main - .text 0x00000000003024ac 0x288 build-fx/src/keyboard.c.o - 0x00000000003024ac _menu_pause - 0x0000000000302644 _update_keyboard - .text 0x0000000000302734 0x5f8 build-fx/src/ennemi.c.o - 0x0000000000302734 _display_ennemi - 0x00000000003028d0 _ennemi_check_collision - 0x000000000030292c _hurt_mario - 0x0000000000302960 _move_ennemi - 0x0000000000302cec _display_ennemi_table - .text 0x0000000000302d2c 0xce4 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(stdio.c.o) - 0x0000000000303728 _kprint_opt - 0x0000000000303870 _kprint - 0x0000000000303948 _kvsprint - 0x0000000000303990 _sprintf - 0x00000000003039b8 _vsprintf - 0x00000000003039d8 _snprintf - 0x00000000003039f8 _vsnprintf - .text 0x0000000000303a10 0xdc /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(memory.c.o) - 0x0000000000303a10 _memcpy - 0x0000000000303aca __memmove - 0x0000000000303ace __memcmp - 0x0000000000303ad2 _memset - .text 0x0000000000303aec 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dtext.c.o) - .text 0x0000000000303aec 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(topti.c.o) - .text 0x0000000000303aec 0x24 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dupdate.c.o) - 0x0000000000303aec _dupdate - 0x0000000000303b04 _dupdate_noint - .text 0x0000000000303b10 0xc8 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dimage.c.o) - 0x0000000000303b10 _dimage - 0x0000000000303b64 _dsubimage - .text 0x0000000000303bd8 0x4c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dclear.c.o) - 0x0000000000303bd8 _dclear - .text 0x0000000000303c24 0x3fc /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(keysc.c.o) - 0x0000000000303dcc _pollevent - 0x0000000000303f10 _waitevent - 0x0000000000303f5c _clearevents - 0x0000000000303f7c _keydown - 0x0000000000303fa8 _keydown_all - 0x0000000000303fe4 _keydown_any - .text 0x0000000000304020 0x124 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(iokbd.c.o) - 0x000000000030402c _iokbd_row - 0x0000000000304114 _iokbd_scan - .text 0x0000000000304144 0x1f4 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(getkey.c.o) - 0x0000000000304144 _getkey_opt - 0x00000000003042f0 _getkey - 0x00000000003042fc _getkey_repeat - .text 0x0000000000304338 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(start.c.o) - .text 0x0000000000304338 0x1c4 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(exch.c.o) - 0x00000000003044c8 _gint_panic - 0x00000000003044d8 _gint_panic_set - 0x00000000003044e4 _gint_exc_catch - 0x00000000003044f0 _gint_exc_skip - .text 0x00000000003044fc 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(syscalls.S.o) - .text 0x00000000003044fc 0x17c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(setup.c.o) - 0x00000000003045b0 _gint_install - 0x0000000000304660 _gint_unload - .text 0x0000000000304678 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(hardware.c.o) - .text 0x0000000000304678 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(exch.s.o) - .text 0x0000000000304678 0x1f4 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(mmu.c.o) - 0x0000000000304678 _tlb_addr - 0x000000000030468c _tlb_data - 0x00000000003046a0 _tlb_mapped_memory - 0x0000000000304774 _utlb_addr - 0x0000000000304784 _utlb_data - 0x0000000000304794 _utlb_mapped_memory - .text 0x000000000030486c 0x9c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(topti.c.o) - 0x000000000030486c _dsize - .text 0x0000000000304908 0x58 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dprint.c.o) - 0x0000000000304908 _dprint - .text 0x0000000000304960 0x56c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(tmu.c.o) - 0x0000000000304c80 _timer_setup - 0x0000000000304d10 _timer_delay - 0x0000000000304d70 _timer_start - 0x0000000000304da4 _timer_reload - 0x0000000000304dc4 _timer_pause - 0x0000000000304df8 _timer_stop - 0x0000000000304e54 _timer_timeout - 0x0000000000304e60 _timer_address - 0x0000000000304e9c _timer_clear - .text 0x0000000000304ecc 0x58 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(sleep.c.o) - 0x0000000000304ecc _sleep_us - .text 0x0000000000304f24 0x1d8 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(t6k11.c.o) - 0x0000000000304fbc _t6k11_display - 0x0000000000305090 _t6k11_contrast - 0x00000000003050bc _t6k11_backlight - .text 0x00000000003050fc 0x150 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(cpg.c.o) - 0x0000000000305240 _clock_freq - .text 0x000000000030524c 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(topti-asm.s.o) - .text 0x000000000030524c 0x58 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(bopti-asm.s.o) - 0x000000000030524c _bopti_asm_mono - 0x0000000000305272 _bopti_asm_mono_alpha - .text 0x00000000003052a4 0x410 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(bopti.c.o) - 0x00000000003052a4 _bopti_grid - 0x0000000000305418 _bopti_render - 0x0000000000305548 _bopti_render_clip - 0x000000000030565c _bopti_render_noclip - .text 0x00000000003056b4 0x9c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(masks.c.o) - 0x00000000003056b4 _masks - .text 0x0000000000305750 0x2c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(vbr.s.o) - 0x0000000000305750 _gint_setvbr - .text 0x000000000030577c 0x78 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(gint.c.o) - 0x000000000030577c _gint_intlevel - 0x00000000003057d0 _gint_inthandler - .text 0x00000000003057f4 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(inth.S.o) - .text 0x00000000003057f4 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(inth.s.o) - .text 0x00000000003057f4 0x78 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_movmem.o) - 0x00000000003057f4 ___movstr - 0x00000000003057f4 ___movmem - 0x0000000000305828 ___movmemSI64 - 0x0000000000305828 ___movstrSI64 - 0x000000000030582c ___movstrSI60 - 0x000000000030582c ___movmemSI60 - 0x0000000000305830 ___movmemSI56 - 0x0000000000305830 ___movstrSI56 - 0x0000000000305834 ___movstrSI52 - 0x0000000000305834 ___movmemSI52 - 0x0000000000305838 ___movstrSI48 - 0x0000000000305838 ___movmemSI48 - 0x000000000030583c ___movstrSI44 - 0x000000000030583c ___movmemSI44 - 0x0000000000305840 ___movstrSI40 - 0x0000000000305840 ___movmemSI40 - 0x0000000000305844 ___movstrSI36 - 0x0000000000305844 ___movmemSI36 - 0x0000000000305848 ___movmemSI32 - 0x0000000000305848 ___movstrSI32 - 0x000000000030584c ___movmemSI28 - 0x000000000030584c ___movstrSI28 - 0x0000000000305850 ___movstrSI24 - 0x0000000000305850 ___movmemSI24 - 0x0000000000305854 ___movmemSI20 - 0x0000000000305854 ___movstrSI20 - 0x0000000000305858 ___movstrSI16 - 0x0000000000305858 ___movmemSI16 - 0x000000000030585c ___movmemSI12 - 0x000000000030585c ___movstrSI12 - 0x0000000000305860 ___movmemSI8 - 0x0000000000305860 ___movstrSI8 - 0x0000000000305864 ___movmemSI4 - 0x0000000000305864 ___movstrSI4 - .text 0x000000000030586c 0x1f0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_udivdi3.o) - 0x000000000030586c ___udivdi3 - .text 0x0000000000305a5c 0x234 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_umoddi3.o) - 0x0000000000305a5c ___umoddi3 - .text 0x0000000000305c90 0x6c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_udivsi3.o) - 0x0000000000305cb2 ___udivsi3 - *fill* 0x0000000000305cfc 0x4 - .text 0x0000000000305d00 0x60 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_udiv_qrnnd_16.o) - 0x0000000000305d00 ___udiv_qrnnd_16 - .text 0x0000000000305d60 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_clz.o) + 0x000000000030124c _box_jump + .text 0x00000000003012ac 0x598 build-fx/src/world.c.o + 0x00000000003012ac _world_get_width + 0x00000000003012bc _world_get + 0x0000000000301320 _display_cell + 0x0000000000301684 _world_get_ctg + 0x00000000003016bc _world_get_real_x0 + 0x0000000000301704 _world_get_real_y0 + 0x0000000000301718 _world_draw + 0x0000000000301824 _world_move + .text 0x0000000000301844 0x43c build-fx/src/bonus.c.o + 0x0000000000301844 _lance_bullet + 0x000000000030189c _bullet_display + 0x000000000030191c _bullet_move + 0x0000000000301a28 _bonus_set + 0x0000000000301a58 _bonus_move + 0x0000000000301bc4 _bonus_draw + .text 0x0000000000301c80 0x6dc build-fx/src/mario.c.o + 0x0000000000301c90 _mario_bigger + 0x0000000000301cac _mario_smaller + 0x0000000000301cd8 _mario_draw + 0x0000000000301e74 _test_sol_le_plus_proche + 0x0000000000301ee0 _mario_move + .text 0x000000000030235c 0x40 build-fx/src/main.c.o + 0x000000000030235c _callback + 0x0000000000302364 _system_error + .text.startup 0x000000000030239c 0x1c0 build-fx/src/main.c.o + 0x000000000030239c _main + .text 0x000000000030255c 0x284 build-fx/src/keyboard.c.o + 0x000000000030255c _menu_pause + 0x00000000003026f0 _update_keyboard + .text 0x00000000003027e0 0x644 build-fx/src/ennemi.c.o + 0x00000000003027e0 _display_ennemi + 0x000000000030297c _ennemi_check_collision + 0x00000000003029d8 _hurt_mario + 0x0000000000302a0c _move_ennemi + 0x0000000000302de4 _display_ennemi_table + .text 0x0000000000302e24 0xce4 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(stdio.c.o) + 0x0000000000303820 _kprint_opt + 0x0000000000303968 _kprint + 0x0000000000303a40 _kvsprint + 0x0000000000303a88 _sprintf + 0x0000000000303ab0 _vsprintf + 0x0000000000303ad0 _snprintf + 0x0000000000303af0 _vsnprintf + .text 0x0000000000303b08 0xdc /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(memory.c.o) + 0x0000000000303b08 _memcpy + 0x0000000000303bc2 __memmove + 0x0000000000303bc6 __memcmp + 0x0000000000303bca _memset + .text 0x0000000000303be4 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dtext.c.o) + .text 0x0000000000303be4 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(topti.c.o) + .text 0x0000000000303be4 0x24 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dupdate.c.o) + 0x0000000000303be4 _dupdate + 0x0000000000303bfc _dupdate_noint + .text 0x0000000000303c08 0xc8 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dimage.c.o) + 0x0000000000303c08 _dimage + 0x0000000000303c5c _dsubimage + .text 0x0000000000303cd0 0x4c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dclear.c.o) + 0x0000000000303cd0 _dclear + .text 0x0000000000303d1c 0x3fc /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(keysc.c.o) + 0x0000000000303ec4 _pollevent + 0x0000000000304008 _waitevent + 0x0000000000304054 _clearevents + 0x0000000000304074 _keydown + 0x00000000003040a0 _keydown_all + 0x00000000003040dc _keydown_any + .text 0x0000000000304118 0x124 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(iokbd.c.o) + 0x0000000000304124 _iokbd_row + 0x000000000030420c _iokbd_scan + .text 0x000000000030423c 0x1f4 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(getkey.c.o) + 0x000000000030423c _getkey_opt + 0x00000000003043e8 _getkey + 0x00000000003043f4 _getkey_repeat + .text 0x0000000000304430 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(start.c.o) + .text 0x0000000000304430 0x1c4 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(exch.c.o) + 0x00000000003045c0 _gint_panic + 0x00000000003045d0 _gint_panic_set + 0x00000000003045dc _gint_exc_catch + 0x00000000003045e8 _gint_exc_skip + .text 0x00000000003045f4 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(syscalls.S.o) + .text 0x00000000003045f4 0x17c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(setup.c.o) + 0x00000000003046a8 _gint_install + 0x0000000000304758 _gint_unload + .text 0x0000000000304770 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(hardware.c.o) + .text 0x0000000000304770 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(exch.s.o) + .text 0x0000000000304770 0x1f4 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(mmu.c.o) + 0x0000000000304770 _tlb_addr + 0x0000000000304784 _tlb_data + 0x0000000000304798 _tlb_mapped_memory + 0x000000000030486c _utlb_addr + 0x000000000030487c _utlb_data + 0x000000000030488c _utlb_mapped_memory + .text 0x0000000000304964 0x9c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(topti.c.o) + 0x0000000000304964 _dsize + .text 0x0000000000304a00 0x58 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dprint.c.o) + 0x0000000000304a00 _dprint + .text 0x0000000000304a58 0x56c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(tmu.c.o) + 0x0000000000304d78 _timer_setup + 0x0000000000304e08 _timer_delay + 0x0000000000304e68 _timer_start + 0x0000000000304e9c _timer_reload + 0x0000000000304ebc _timer_pause + 0x0000000000304ef0 _timer_stop + 0x0000000000304f4c _timer_timeout + 0x0000000000304f58 _timer_address + 0x0000000000304f94 _timer_clear + .text 0x0000000000304fc4 0x58 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(sleep.c.o) + 0x0000000000304fc4 _sleep_us + .text 0x000000000030501c 0x1d8 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(t6k11.c.o) + 0x00000000003050b4 _t6k11_display + 0x0000000000305188 _t6k11_contrast + 0x00000000003051b4 _t6k11_backlight + .text 0x00000000003051f4 0x150 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(cpg.c.o) + 0x0000000000305338 _clock_freq + .text 0x0000000000305344 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(topti-asm.s.o) + .text 0x0000000000305344 0x58 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(bopti-asm.s.o) + 0x0000000000305344 _bopti_asm_mono + 0x000000000030536a _bopti_asm_mono_alpha + .text 0x000000000030539c 0x410 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(bopti.c.o) + 0x000000000030539c _bopti_grid + 0x0000000000305510 _bopti_render + 0x0000000000305640 _bopti_render_clip + 0x0000000000305754 _bopti_render_noclip + .text 0x00000000003057ac 0x9c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(masks.c.o) + 0x00000000003057ac _masks + .text 0x0000000000305848 0x2c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(vbr.s.o) + 0x0000000000305848 _gint_setvbr + .text 0x0000000000305874 0x78 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(gint.c.o) + 0x0000000000305874 _gint_intlevel + 0x00000000003058c8 _gint_inthandler + .text 0x00000000003058ec 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(inth.S.o) + .text 0x00000000003058ec 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(inth.s.o) + .text 0x00000000003058ec 0x78 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_movmem.o) + 0x00000000003058ec ___movstr + 0x00000000003058ec ___movmem + 0x0000000000305920 ___movmemSI64 + 0x0000000000305920 ___movstrSI64 + 0x0000000000305924 ___movstrSI60 + 0x0000000000305924 ___movmemSI60 + 0x0000000000305928 ___movmemSI56 + 0x0000000000305928 ___movstrSI56 + 0x000000000030592c ___movstrSI52 + 0x000000000030592c ___movmemSI52 + 0x0000000000305930 ___movstrSI48 + 0x0000000000305930 ___movmemSI48 + 0x0000000000305934 ___movstrSI44 + 0x0000000000305934 ___movmemSI44 + 0x0000000000305938 ___movstrSI40 + 0x0000000000305938 ___movmemSI40 + 0x000000000030593c ___movstrSI36 + 0x000000000030593c ___movmemSI36 + 0x0000000000305940 ___movmemSI32 + 0x0000000000305940 ___movstrSI32 + 0x0000000000305944 ___movmemSI28 + 0x0000000000305944 ___movstrSI28 + 0x0000000000305948 ___movstrSI24 + 0x0000000000305948 ___movmemSI24 + 0x000000000030594c ___movmemSI20 + 0x000000000030594c ___movstrSI20 + 0x0000000000305950 ___movstrSI16 + 0x0000000000305950 ___movmemSI16 + 0x0000000000305954 ___movmemSI12 + 0x0000000000305954 ___movstrSI12 + 0x0000000000305958 ___movmemSI8 + 0x0000000000305958 ___movstrSI8 + 0x000000000030595c ___movmemSI4 + 0x000000000030595c ___movstrSI4 + .text 0x0000000000305964 0x1f0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_udivdi3.o) + 0x0000000000305964 ___udivdi3 + .text 0x0000000000305b54 0x234 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_umoddi3.o) + 0x0000000000305b54 ___umoddi3 + .text 0x0000000000305d88 0x6c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_udivsi3.o) + 0x0000000000305daa ___udivsi3 + *fill* 0x0000000000305df4 0x4 + .text 0x0000000000305df8 0x60 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_udiv_qrnnd_16.o) + 0x0000000000305df8 ___udiv_qrnnd_16 + .text 0x0000000000305e58 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_clz.o) *(C P) -.gint.blocks 0x0000000000305d60 0x120 +.gint.blocks 0x0000000000305e60 0x120 *(.gint.blocks) - .gint.blocks 0x0000000000305d60 0x40 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(inth.S.o) - 0x0000000000305d60 _gint_inth_7305 - 0x0000000000305d80 _gint_inth_7705 - .gint.blocks 0x0000000000305da0 0xe0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(inth.s.o) - 0x0000000000305da0 _inth_tmu - 0x0000000000305e20 _inth_etmu2 - 0x0000000000305e40 _inth_etmu_help - 0x0000000000305e60 _inth_etmux + .gint.blocks 0x0000000000305e60 0x40 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(inth.S.o) + 0x0000000000305e60 _gint_inth_7305 + 0x0000000000305e80 _gint_inth_7705 + .gint.blocks 0x0000000000305ea0 0xe0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(inth.s.o) + 0x0000000000305ea0 _inth_tmu + 0x0000000000305f20 _inth_etmu2 + 0x0000000000305f40 _inth_etmu_help + 0x0000000000305f60 _inth_etmux -.gint.drivers 0x0000000000305e80 0x90 - 0x0000000000305e80 _bdrv = . +.gint.drivers 0x0000000000305f80 0x90 + 0x0000000000305f80 _bdrv = . *(.gint.drivers.0) *(.gint.drivers.1) .gint.drivers.1 - 0x0000000000305e80 0x24 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(cpg.c.o) - 0x0000000000305e80 _drv_cpg + 0x0000000000305f80 0x24 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(cpg.c.o) + 0x0000000000305f80 _drv_cpg *(.gint.drivers.2) .gint.drivers.2 - 0x0000000000305ea4 0x24 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(tmu.c.o) - 0x0000000000305ea4 _drv_tmu + 0x0000000000305fa4 0x24 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(tmu.c.o) + 0x0000000000305fa4 _drv_tmu *(.gint.drivers.3) *(.gint.drivers.4) .gint.drivers.4 - 0x0000000000305ec8 0x24 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(keysc.c.o) - 0x0000000000305ec8 _drv_keysc + 0x0000000000305fc8 0x24 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(keysc.c.o) + 0x0000000000305fc8 _drv_keysc *(.gint.drivers.5) .gint.drivers.5 - 0x0000000000305eec 0x24 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(t6k11.c.o) - 0x0000000000305eec _drv_t6k11 + 0x0000000000305fec 0x24 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(t6k11.c.o) + 0x0000000000305fec _drv_t6k11 *(.gint.drivers.6) - 0x0000000000305f10 _edrv = . + 0x0000000000306010 _edrv = . -.rodata 0x0000000000305f10 0x4d68 +.rodata 0x0000000000306010 0x5774 *(.rodata.4) *(.rodata .rodata.*) - .rodata 0x0000000000305f10 0x190c build-fx/src/level.c.o + .rodata 0x0000000000306010 0x1de4 build-fx/src/level.c.o .rodata.str1.4 - 0x000000000030781c 0x1e build-fx/src/score.c.o + 0x0000000000307df4 0x1e build-fx/src/score.c.o .rodata.str1.4 - 0x000000000030783a 0x3 build-fx/src/main.c.o - *fill* 0x000000000030783a 0x2 - .rodata 0x000000000030783c 0x28 build-fx/src/keyboard.c.o - .rodata 0x0000000000307864 0x30 build-fx/src/ennemi.c.o - .rodata 0x0000000000307894 0x204 build-fx/assets/fonts/mario.png.o - 0x0000000000307894 _font_mario - 0x0000000000307a98 _font_mario_end - .rodata 0x0000000000307a98 0x20 build-fx/assets/img/bonus.png.o - 0x0000000000307a98 _img_bonus - 0x0000000000307ab8 _img_bonus_end - .rodata 0x0000000000307ab8 0x24 build-fx/assets/img/bloc.png.o - 0x0000000000307ab8 _img_bloc - 0x0000000000307adc _img_bloc_end - .rodata 0x0000000000307adc 0x404 build-fx/assets/img/ram.png.o - 0x0000000000307adc _img_ram - 0x0000000000307ee0 _img_ram_end - .rodata 0x0000000000307ee0 0x64 build-fx/assets/img/mario.png.o - 0x0000000000307ee0 _img_mario - 0x0000000000307f44 _img_mario_end - .rodata 0x0000000000307f44 0x404 build-fx/assets/img/main.png.o - 0x0000000000307f44 _img_main - 0x0000000000308348 _img_main_end - .rodata 0x0000000000308348 0x404 build-fx/assets/img/new_level.png.o - 0x0000000000308348 _img_new_level - 0x000000000030874c _img_new_level_end - .rodata 0x000000000030874c 0x4c build-fx/assets/img/brick.png.o - 0x000000000030874c _img_brick - 0x0000000000308798 _img_brick_end - .rodata 0x0000000000308798 0x84 build-fx/assets/img/menu_pause.png.o - 0x0000000000308798 _img_menu_pause - 0x000000000030881c _img_menu_pause_end - .rodata 0x000000000030881c 0x18 build-fx/assets/img/select_arrow.png.o - 0x000000000030881c _img_select_arrow - 0x0000000000308834 _img_select_arrow_end - .rodata 0x0000000000308834 0x804 build-fx/assets/img/dev.png.o - 0x0000000000308834 _img_dev - 0x0000000000309038 _img_dev_end - .rodata 0x0000000000309038 0x24 build-fx/assets/img/death.png.o - 0x0000000000309038 _img_death - 0x000000000030905c _img_death_end - .rodata 0x000000000030905c 0x404 build-fx/assets/img/time_over.png.o - 0x000000000030905c _img_time_over - 0x0000000000309460 _img_time_over_end - .rodata 0x0000000000309460 0x4c build-fx/assets/img/coin.png.o - 0x0000000000309460 _img_coin - 0x00000000003094ac _img_coin_end - .rodata 0x00000000003094ac 0x24 build-fx/assets/img/champi.png.o - 0x00000000003094ac _img_champi - 0x00000000003094d0 _img_champi_end - .rodata 0x00000000003094d0 0xdc build-fx/assets/img/mariosmall.png.o - 0x00000000003094d0 _img_mariosmall - 0x00000000003095ac _img_mariosmall_end - .rodata 0x00000000003095ac 0x28 build-fx/assets/img/gift.png.o - 0x00000000003095ac _img_gift - 0x00000000003095d4 _img_gift_end - .rodata 0x00000000003095d4 0x24 build-fx/assets/img/buisson.png.o - 0x00000000003095d4 _img_buisson - 0x00000000003095f8 _img_buisson_end - .rodata 0x00000000003095f8 0x44 build-fx/assets/img/colline.png.o - 0x00000000003095f8 _img_colline - 0x000000000030963c _img_colline_end - .rodata 0x000000000030963c 0x114 build-fx/assets/img/mariobig.png.o - 0x000000000030963c _img_mariobig - 0x0000000000309750 _img_mariobig_end - .rodata 0x0000000000309750 0x404 build-fx/assets/img/error.png.o - 0x0000000000309750 _img_error - 0x0000000000309b54 _img_error_end - .rodata 0x0000000000309b54 0x24 build-fx/assets/img/1up.png.o - 0x0000000000309b54 _img_1up - 0x0000000000309b78 _img_1up_end - .rodata 0x0000000000309b78 0xb8 build-fx/assets/img/tuyau.png.o - 0x0000000000309b78 _img_tuyau - 0x0000000000309c30 _img_tuyau_end - .rodata 0x0000000000309c30 0x14 build-fx/assets/img/bullet.png.o - 0x0000000000309c30 _img_bullet - 0x0000000000309c44 _img_bullet_end - .rodata 0x0000000000309c44 0x28 build-fx/assets/img/carapace_verte.png.o - 0x0000000000309c44 _img_carapace_verte - 0x0000000000309c6c _img_carapace_verte_end - .rodata 0x0000000000309c6c 0x44 build-fx/assets/img/nuage.png.o - 0x0000000000309c6c _img_nuage - 0x0000000000309cb0 _img_nuage_end - .rodata 0x0000000000309cb0 0x64 build-fx/assets/img/koopa_verte.png.o - 0x0000000000309cb0 _img_koopa_verte - 0x0000000000309d14 _img_koopa_verte_end - .rodata 0x0000000000309d14 0x404 build-fx/assets/img/level.png.o - 0x0000000000309d14 _img_level - 0x000000000030a118 _img_level_end - .rodata 0x000000000030a118 0x4c build-fx/assets/img/goomba.png.o - 0x000000000030a118 _img_goomba - 0x000000000030a164 _img_goomba_end - .rodata 0x000000000030a164 0x24 build-fx/assets/img/fleur.png.o - 0x000000000030a164 _img_fleur - 0x000000000030a188 _img_fleur_end - .rodata 0x000000000030a188 0x4c build-fx/assets/img/stone.png.o - 0x000000000030a188 _img_stone - 0x000000000030a1d4 _img_stone_end - .rodata 0x000000000030a1d4 0x404 build-fx/assets/img/lvl0.png.o - 0x000000000030a1d4 _img_lvl0 - 0x000000000030a5d8 _img_lvl0_end + 0x0000000000307e12 0x3 build-fx/src/main.c.o + *fill* 0x0000000000307e12 0x2 + .rodata 0x0000000000307e14 0x28 build-fx/src/keyboard.c.o + .rodata 0x0000000000307e3c 0x30 build-fx/src/ennemi.c.o + .rodata 0x0000000000307e6c 0x204 build-fx/assets/fonts/mario.png.o + 0x0000000000307e6c _font_mario + 0x0000000000308070 _font_mario_end + .rodata 0x0000000000308070 0x20 build-fx/assets/img/bonus.png.o + 0x0000000000308070 _img_bonus + 0x0000000000308090 _img_bonus_end + .rodata 0x0000000000308090 0x24 build-fx/assets/img/bloc.png.o + 0x0000000000308090 _img_bloc + 0x00000000003080b4 _img_bloc_end + .rodata 0x00000000003080b4 0x404 build-fx/assets/img/ram.png.o + 0x00000000003080b4 _img_ram + 0x00000000003084b8 _img_ram_end + .rodata 0x00000000003084b8 0x64 build-fx/assets/img/mario.png.o + 0x00000000003084b8 _img_mario + 0x000000000030851c _img_mario_end + .rodata 0x000000000030851c 0x404 build-fx/assets/img/main.png.o + 0x000000000030851c _img_main + 0x0000000000308920 _img_main_end + .rodata 0x0000000000308920 0x404 build-fx/assets/img/new_level.png.o + 0x0000000000308920 _img_new_level + 0x0000000000308d24 _img_new_level_end + .rodata 0x0000000000308d24 0x4c build-fx/assets/img/brick.png.o + 0x0000000000308d24 _img_brick + 0x0000000000308d70 _img_brick_end + .rodata 0x0000000000308d70 0x84 build-fx/assets/img/menu_pause.png.o + 0x0000000000308d70 _img_menu_pause + 0x0000000000308df4 _img_menu_pause_end + .rodata 0x0000000000308df4 0x18 build-fx/assets/img/select_arrow.png.o + 0x0000000000308df4 _img_select_arrow + 0x0000000000308e0c _img_select_arrow_end + .rodata 0x0000000000308e0c 0x804 build-fx/assets/img/dev.png.o + 0x0000000000308e0c _img_dev + 0x0000000000309610 _img_dev_end + .rodata 0x0000000000309610 0x24 build-fx/assets/img/death.png.o + 0x0000000000309610 _img_death + 0x0000000000309634 _img_death_end + .rodata 0x0000000000309634 0x404 build-fx/assets/img/time_over.png.o + 0x0000000000309634 _img_time_over + 0x0000000000309a38 _img_time_over_end + .rodata 0x0000000000309a38 0x4c build-fx/assets/img/coin.png.o + 0x0000000000309a38 _img_coin + 0x0000000000309a84 _img_coin_end + .rodata 0x0000000000309a84 0x24 build-fx/assets/img/champi.png.o + 0x0000000000309a84 _img_champi + 0x0000000000309aa8 _img_champi_end + .rodata 0x0000000000309aa8 0xdc build-fx/assets/img/mariosmall.png.o + 0x0000000000309aa8 _img_mariosmall + 0x0000000000309b84 _img_mariosmall_end + .rodata 0x0000000000309b84 0x28 build-fx/assets/img/gift.png.o + 0x0000000000309b84 _img_gift + 0x0000000000309bac _img_gift_end + .rodata 0x0000000000309bac 0x44 build-fx/assets/img/buisson.png.o + 0x0000000000309bac _img_buisson + 0x0000000000309bf0 _img_buisson_end + .rodata 0x0000000000309bf0 0x84 build-fx/assets/img/colline.png.o + 0x0000000000309bf0 _img_colline + 0x0000000000309c74 _img_colline_end + .rodata 0x0000000000309c74 0x114 build-fx/assets/img/mariobig.png.o + 0x0000000000309c74 _img_mariobig + 0x0000000000309d88 _img_mariobig_end + .rodata 0x0000000000309d88 0x804 build-fx/assets/img/error.png.o + 0x0000000000309d88 _img_error + 0x000000000030a58c _img_error_end + .rodata 0x000000000030a58c 0x44 build-fx/assets/img/1up.png.o + 0x000000000030a58c _img_1up + 0x000000000030a5d0 _img_1up_end + .rodata 0x000000000030a5d0 0xb8 build-fx/assets/img/tuyau.png.o + 0x000000000030a5d0 _img_tuyau + 0x000000000030a688 _img_tuyau_end + .rodata 0x000000000030a688 0x24 build-fx/assets/img/bullet.png.o + 0x000000000030a688 _img_bullet + 0x000000000030a6ac _img_bullet_end + .rodata 0x000000000030a6ac 0x4c build-fx/assets/img/carapace_verte.png.o + 0x000000000030a6ac _img_carapace_verte + 0x000000000030a6f8 _img_carapace_verte_end + .rodata 0x000000000030a6f8 0x44 build-fx/assets/img/nuage.png.o + 0x000000000030a6f8 _img_nuage + 0x000000000030a73c _img_nuage_end + .rodata 0x000000000030a73c 0xc4 build-fx/assets/img/koopa_verte.png.o + 0x000000000030a73c _img_koopa_verte + 0x000000000030a800 _img_koopa_verte_end + .rodata 0x000000000030a800 0x404 build-fx/assets/img/level.png.o + 0x000000000030a800 _img_level + 0x000000000030ac04 _img_level_end + .rodata 0x000000000030ac04 0x4c build-fx/assets/img/goomba.png.o + 0x000000000030ac04 _img_goomba + 0x000000000030ac50 _img_goomba_end + .rodata 0x000000000030ac50 0x44 build-fx/assets/img/fleur.png.o + 0x000000000030ac50 _img_fleur + 0x000000000030ac94 _img_fleur_end + .rodata 0x000000000030ac94 0x4c build-fx/assets/img/stone.png.o + 0x000000000030ac94 _img_stone + 0x000000000030ace0 _img_stone_end + .rodata 0x000000000030ace0 0x404 build-fx/assets/img/lvl0.png.o + 0x000000000030ace0 _img_lvl0 + 0x000000000030b0e4 _img_lvl0_end .rodata.str1.4 - 0x000000000030a5d8 0x31 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(stdio.c.o) - *fill* 0x000000000030a609 0x3 - .rodata 0x000000000030a60c 0x8 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dimage.c.o) + 0x000000000030b0e4 0x31 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(stdio.c.o) + *fill* 0x000000000030b115 0x3 + .rodata 0x000000000030b118 0x8 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dimage.c.o) .rodata.str1.4 - 0x000000000030a614 0x6 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(keysc.c.o) - *fill* 0x000000000030a61a 0x2 + 0x000000000030b120 0x6 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(keysc.c.o) + *fill* 0x000000000030b126 0x2 .rodata.str1.4 - 0x000000000030a61c 0x11a /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(exch.c.o) + 0x000000000030b128 0x11a /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(exch.c.o) 0x11e (size before relaxing) - *fill* 0x000000000030a736 0x2 - .rodata 0x000000000030a738 0x18 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(topti.c.o) + *fill* 0x000000000030b242 0x2 + .rodata 0x000000000030b244 0x18 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(topti.c.o) .rodata.str1.4 - 0x000000000030a750 0x4 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(tmu.c.o) - .rodata 0x000000000030a754 0x408 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(font5x7.png.o) - 0x000000000030a754 _gint_font5x7 - 0x000000000030ab5c _gint_font5x7_end + 0x000000000030b25c 0x4 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(tmu.c.o) + .rodata 0x000000000030b260 0x408 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(font5x7.png.o) + 0x000000000030b260 _gint_font5x7 + 0x000000000030b668 _gint_font5x7_end .rodata.str1.4 - 0x000000000030ab5c 0x6 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(t6k11.c.o) - *fill* 0x000000000030ab62 0x2 + 0x000000000030b668 0x6 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(t6k11.c.o) + *fill* 0x000000000030b66e 0x2 .rodata.str1.4 - 0x000000000030ab64 0x4 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(cpg.c.o) - .rodata 0x000000000030ab68 0x10 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(bopti.c.o) - .rodata 0x000000000030ab78 0x100 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_clz.o) - 0x000000000030ab78 ___clz_tab + 0x000000000030b670 0x4 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(cpg.c.o) + .rodata 0x000000000030b674 0x10 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(bopti.c.o) + .rodata 0x000000000030b684 0x100 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_clz.o) + 0x000000000030b684 ___clz_tab -.rela.dyn 0x000000000030ac78 0x0 - .rela.text 0x000000000030ac78 0x0 build-fx/src/score.c.o +.rela.dyn 0x000000000030b784 0x0 + .rela.text 0x000000000030b784 0x0 build-fx/src/score.c.o .rela.text.startup - 0x000000000030ac78 0x0 build-fx/src/score.c.o + 0x000000000030b784 0x0 build-fx/src/score.c.o .rela.pretext.entry - 0x000000000030ac78 0x0 build-fx/src/score.c.o + 0x000000000030b784 0x0 build-fx/src/score.c.o 0x0000000008100000 . = ORIGIN (ram) .bss 0x0000000008100000 0x5c0 @@ -700,8 +702,8 @@ LOAD /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a *fill* 0x00000000081005bc 0x4 0x00000000000005c0 _sbss = SIZEOF (.bss) -.data 0x00000000081005c0 0x210 load address 0x000000000030ac78 - 0x000000000030ac78 _ldata = LOADADDR (.data) +.data 0x00000000081005c0 0x220 load address 0x000000000030b784 + 0x000000000030b784 _ldata = LOADADDR (.data) 0x00000000081005c0 _rdata = . *(.data .data.*) .data 0x00000000081005c0 0x0 build-fx/src/level.c.o @@ -725,80 +727,80 @@ LOAD /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a 0x000000000810068c _tuyau .data 0x000000000810069c 0x0 build-fx/src/box.c.o .data 0x000000000810069c 0x0 build-fx/src/world.c.o - .data 0x000000000810069c 0x6c build-fx/src/bonus.c.o - .data 0x0000000008100708 0x50 build-fx/src/mario.c.o - 0x0000000008100708 _last_vx_sign - 0x000000000810070c _mario - 0x0000000008100738 _mario_big - 0x0000000008100748 _mario_small - .data 0x0000000008100758 0x0 build-fx/src/main.c.o - .data 0x0000000008100758 0x0 build-fx/src/keyboard.c.o - .data 0x0000000008100758 0x0 build-fx/src/ennemi.c.o - .data 0x0000000008100758 0x68 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(stdio.c.o) - 0x0000000008100758 _kprint_formatters - .data 0x00000000081007c0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(memory.c.o) - .data 0x00000000081007c0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dtext.c.o) - .data 0x00000000081007c0 0x8 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(topti.c.o) - 0x00000000081007c0 _topti_font - 0x00000000081007c4 _gint_default_font - .data 0x00000000081007c8 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dupdate.c.o) - .data 0x00000000081007c8 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dimage.c.o) - .data 0x00000000081007c8 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dclear.c.o) - .data 0x00000000081007c8 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(keysc.c.o) - .data 0x00000000081007c8 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(iokbd.c.o) - .data 0x00000000081007c8 0x8 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(getkey.c.o) - .data 0x00000000081007d0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(start.c.o) - .data 0x00000000081007d0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(exch.c.o) - .data 0x00000000081007d0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(syscalls.S.o) - .data 0x00000000081007d0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(setup.c.o) - .data 0x00000000081007d0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(hardware.c.o) - .data 0x00000000081007d0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(exch.s.o) - .data 0x00000000081007d0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(mmu.c.o) - .data 0x00000000081007d0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(topti.c.o) - .data 0x00000000081007d0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dprint.c.o) - .data 0x00000000081007d0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(tmu.c.o) - .data 0x00000000081007d0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(sleep.c.o) - .data 0x00000000081007d0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(t6k11.c.o) - .data 0x00000000081007d0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(cpg.c.o) - .data 0x00000000081007d0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(topti-asm.s.o) - .data 0x00000000081007d0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(bopti-asm.s.o) - .data 0x00000000081007d0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(bopti.c.o) - .data 0x00000000081007d0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(masks.c.o) - .data 0x00000000081007d0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(vbr.s.o) - .data 0x00000000081007d0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(gint.c.o) - .data 0x00000000081007d0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(inth.S.o) - .data 0x00000000081007d0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(inth.s.o) - .data 0x00000000081007d0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_movmem.o) - .data 0x00000000081007d0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_udivdi3.o) - .data 0x00000000081007d0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_umoddi3.o) - .data 0x00000000081007d0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_udivsi3.o) - .data 0x00000000081007d0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_udiv_qrnnd_16.o) - .data 0x00000000081007d0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_clz.o) + .data 0x000000000810069c 0x78 build-fx/src/bonus.c.o + .data 0x0000000008100714 0x54 build-fx/src/mario.c.o + 0x0000000008100714 _last_vx_sign + 0x0000000008100718 _mario + 0x0000000008100748 _mario_big + 0x0000000008100758 _mario_small + .data 0x0000000008100768 0x0 build-fx/src/main.c.o + .data 0x0000000008100768 0x0 build-fx/src/keyboard.c.o + .data 0x0000000008100768 0x0 build-fx/src/ennemi.c.o + .data 0x0000000008100768 0x68 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(stdio.c.o) + 0x0000000008100768 _kprint_formatters + .data 0x00000000081007d0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(memory.c.o) + .data 0x00000000081007d0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dtext.c.o) + .data 0x00000000081007d0 0x8 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(topti.c.o) + 0x00000000081007d0 _topti_font + 0x00000000081007d4 _gint_default_font + .data 0x00000000081007d8 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dupdate.c.o) + .data 0x00000000081007d8 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dimage.c.o) + .data 0x00000000081007d8 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dclear.c.o) + .data 0x00000000081007d8 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(keysc.c.o) + .data 0x00000000081007d8 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(iokbd.c.o) + .data 0x00000000081007d8 0x8 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(getkey.c.o) + .data 0x00000000081007e0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(start.c.o) + .data 0x00000000081007e0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(exch.c.o) + .data 0x00000000081007e0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(syscalls.S.o) + .data 0x00000000081007e0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(setup.c.o) + .data 0x00000000081007e0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(hardware.c.o) + .data 0x00000000081007e0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(exch.s.o) + .data 0x00000000081007e0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(mmu.c.o) + .data 0x00000000081007e0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(topti.c.o) + .data 0x00000000081007e0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dprint.c.o) + .data 0x00000000081007e0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(tmu.c.o) + .data 0x00000000081007e0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(sleep.c.o) + .data 0x00000000081007e0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(t6k11.c.o) + .data 0x00000000081007e0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(cpg.c.o) + .data 0x00000000081007e0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(topti-asm.s.o) + .data 0x00000000081007e0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(bopti-asm.s.o) + .data 0x00000000081007e0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(bopti.c.o) + .data 0x00000000081007e0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(masks.c.o) + .data 0x00000000081007e0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(vbr.s.o) + .data 0x00000000081007e0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(gint.c.o) + .data 0x00000000081007e0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(inth.S.o) + .data 0x00000000081007e0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(inth.s.o) + .data 0x00000000081007e0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_movmem.o) + .data 0x00000000081007e0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_udivdi3.o) + .data 0x00000000081007e0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_umoddi3.o) + .data 0x00000000081007e0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_udivsi3.o) + .data 0x00000000081007e0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_udiv_qrnnd_16.o) + .data 0x00000000081007e0 0x0 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a(_clz.o) *(D) - 0x00000000081007d0 . = ALIGN (0x10) + 0x00000000081007e0 . = ALIGN (0x10) -.data.4 0x00000000081007d0 0x0 load address 0x000000000030ae88 +.data.4 0x00000000081007e0 0x0 load address 0x000000000030b9a4 *(.data.4) - 0x00000000081007d0 . = ALIGN (0x10) - 0x0000000000000210 _sdata = (SIZEOF (.data) + SIZEOF (.data.4)) + 0x00000000081007e0 . = ALIGN (0x10) + 0x0000000000000220 _sdata = (SIZEOF (.data) + SIZEOF (.data.4)) 0x00000000e5200000 . = ORIGIN (ilram) -.ilram 0x00000000e5200000 0x0 load address 0x000000000030ae88 - 0x000000000030ae88 _lilram = LOADADDR (.ilram) +.ilram 0x00000000e5200000 0x0 load address 0x000000000030b9a4 + 0x000000000030b9a4 _lilram = LOADADDR (.ilram) 0x00000000e5200000 _rilram = . *(.ilram) 0x00000000e5200000 . = ALIGN (0x10) 0x00000000e5007000 . = ORIGIN (xram) -.xram 0x00000000e5007000 0x0 load address 0x000000000030ae88 - 0x000000000030ae88 _lxram = LOADADDR (.xram) +.xram 0x00000000e5007000 0x0 load address 0x000000000030b9a4 + 0x000000000030b9a4 _lxram = LOADADDR (.xram) 0x00000000e5007000 _rxram = . *(.xram) 0x00000000e5007000 . = ALIGN (0x10) 0x00000000e5017000 . = ORIGIN (yram) -.yram 0x00000000e5017000 0x0 load address 0x000000000030ae88 - 0x000000000030ae88 _lyram = LOADADDR (.yram) +.yram 0x00000000e5017000 0x0 load address 0x000000000030b9a4 + 0x000000000030b9a4 _lyram = LOADADDR (.yram) 0x00000000e5017000 _ryram = . *(.yram) 0x00000000e5017000 . = ALIGN (0x10) @@ -808,8 +810,8 @@ LOAD /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a 0x000000008800df00 _gint_vbr = 0x8800df00 0x000000008800f400 . = ORIGIN (rram) -.gint.data 0x000000008800f400 0x140 load address 0x000000000030ae88 - 0x000000000030ae88 _lgdata = LOADADDR (.gint.data) +.gint.data 0x000000008800f400 0x140 load address 0x000000000030b9a4 + 0x000000000030b9a4 _lgdata = LOADADDR (.gint.data) 0x000000008800f400 _rgdata = . *(.gint.data .gint.data.*) .gint.data 0x000000008800f400 0x4 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(dupdate.c.o) @@ -830,7 +832,7 @@ LOAD /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgcc.a 0x000000008800f540 . = ALIGN (0x10) 0x0000000000000140 _sgdata = SIZEOF (.gint.data) -.gint.bss 0x000000008800f540 0x290 load address 0x000000000030afc8 +.gint.bss 0x000000008800f540 0x290 load address 0x000000000030bae4 *(.gint.bss .gint.bss.*) .gint.bss 0x000000008800f540 0x180 /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(keysc.c.o) .gint.bss 0x000000008800f6c0 0x1c /home/gmilan/opt/sh-elf-2.33-9.2.0/lib/gcc/sh3eb-elf/9.2.0/libgint-fx.a(setup.c.o) diff --git a/build-fx/src/bonus.c.o b/build-fx/src/bonus.c.o index 7eed611f84c97372394a75e53784d1b557db1da7..dbbab7a7939714eb58fa17159e8d479f66876268 100644 GIT binary patch delta 1458 zcmZ8gO>7fa5T56KPS(5I5*ypum=I#8bvDJwwgf1yBATd&R-#}VqLuLO+nwIU zJ|jClQlF^!=59}t?IPIX>9OxZYYW#ZFn8?U4AXcKVM`VN8g*L7{G1g@1Z3o+6 zrfT{6W!OJ!uP@XPpY_UxV}t7|M0Uw7Y|Qf4x|X@3?BX6{UrcM(zxq*LP6elfKLvkZ zcvroDJD>j`wLC)#&KX+r_KKgU%iaiI^7h+%#l0ET;gR#@wtr#1Z3~YMGjxpR?4{;9 z(~V5`8%!rMU9XuIWJ-0WgiJ|g?#WcVs%W-sL#nt!RbSZa7lm81vo=2~5i5(*CbmzI zSdL1oa4Y5nc99-z`Cq$OjHtgnsGFtUSz!U|&J;{J0I&idYBXqC0iT-Ugei8L;&F@@ zP)gGD(x!UR6#rU}Q+R3ve=`xTn&R6i{t$B^Z9oaY;>281ix*A&|4i|VH)DeTL~bg8 z$?GcuMB77Oh{&df4eZB;7~>nm;?VJAa%B9#(PQ6?uxf*!MH;8s^+taRZlR`Xruy6g zkaT<(;4K~F-f!#pPk=QVCdk)&3G(fF9{CO(BY&-q(QI9x;N6`BR5Q_#2LLXOWRdWF z>lp8+58(P&;XQ^Bw;#Z*@wowGFgLu4f7n=pOB(vz7|z!RbK?NAE;IqqqT^El9u3o0 zLzK1~OVD==QK}fu(SYF`4FR<3I-3F3tC+_R?FMLL`)pIBhb`KC4ZMtwTw+w{u#RDQ kf(3*Q@|eYhPCO@sPU|w(pRo&Ae~PG!-NpJH_DpcT0&q1ESpWb4 delta 1347 zcmZ8hOH30{6uqxArJre)7D|VY0@F#UfuwDMiVE09qfInIm4!bNQ3xpYw=gOg8;X(| zYyh7zE?f{L#s!823r%!k)aa5{4Z&YRAqEmzxWLN7MDMhH7Uw0?Ip@uJ_uS7+mx`_x z4NFeLJpkaK7JmU;U;ur>dcx|ci)rWN{l$`NsAQhZ$s+;BTAAzQO1$;+V7Xw~WO0r3 zl!a#k?&*{LP15DSr(NOS$0AV@Gj;c0lIw;CSHgUg^K>ed>Q0?XolJqym5Mj^^6is8 z;Ts=sXrKJtfC%;oNBipa@ohe#H4+@?c)wBax5c;xQYmik>AaW(xAh`P)b6gFuJsG; zuY%Vr#X)dcgAu^pbWQ!w;12@}g;IDTKS zlM-*u{$e^njue>vf=lWpZ7;n~VsDZ)6TO#YN{p_&cZP(qxr(mWlnY8TGAlp>8ehdX zXp78g&j0Z`Z&=ca_#;W^ZE1{ zUzokibe<0tFE9mB-Wy0aNvTz)UD|zzNsAQ#pTLf+4DvJJfQq-Oc&Cc@sCbOdYRkiS zRlAQ>{3)7`^}^D1eFKn*e5phXK|wd>ddb!&q}Z!}zgU7#;<%GCT%Q z!0;o0LWV!!du2SbM*jr zw(moKk&&GM#SAY36fwNC$^fUps^^wh8LZ?w!Trv4f=Bz(Y#bg*8N+&jbqc0$4OfVX z?lekyy5~57F&Z*Dv_5GJZ>Ir&Gp!GEQfWRoWLQnWZMdp&dn3Mr#F!?HB-T J#fz=9#b2v+?&$yk diff --git a/build-fx/src/box.c.o b/build-fx/src/box.c.o index 943e5628832baacbcac572485a23a15c8eca74ee..f22da6055981ae7914e0d66ee27f81758b124551 100644 GIT binary patch delta 356 zcmaFC`-XRdGGog`m5KER44e#5px>rHO@EpGHvMDz*K(cppWRmVSMuf#aZ%vt)yiPL zqs+k0EtSO_e1*fDUCOGw({!@M0-bjZp%e%XY>67alTHF|I#q-IH|5$Y%X>U8TSG88|nmFrH>)WZ!JSY|JRz zA;iGI2=svu%o_p_Ml=Hhv&iHImTp561_m~e3Ls##U|`^evYCMj;p`lQ8s>t@HmuEz xC6f=ZDl>kW{Df7Vam8dFHV|n7CS!o)p2;mhvS;!dHg!=CputvP;~@mtd;r=&TlD|{ delta 356 zcmaFE`+|3ZGGoI;m5KE_44e#5px>rHO@EpGHvMDz*K(cppWRmRSMuf#aZ%vt)yiPL zqr||@EtSO_e1*fDUCOGw(`2&w0_}GUp%^CzxOw1FrH>)1_m~e3Ls!KVPN2fvYC01*ck{l%sG=CSeqFOCLdu{ zX8bVu1*@$lo!!14wpE-oU0V>H;*}3Ty?00NVio5sO^Z diff --git a/build-fx/src/ennemi.c.o b/build-fx/src/ennemi.c.o index 501a6aa6b98e0b7fa9a48667530c2f62ed8b4bdb..453815b8c9a2fdab6c7a6f3107fd224c2d04839c 100644 GIT binary patch delta 1190 zcmY*XQA`_U9RGjUqj0?eYfIs4iv~&xZCLEuvb8HLwvz-FG4vYT7TiNys%vp3Drg)o zR$4HeM^oX*o_r`-G-?b@Kz;H-Ulx2Y_7-PcgqTud<|GDn>67IAu5cON!!N(@yYKh^ z{qA?)H%0)Phk2m&~O1)b}?z+x>UMS1D`SGCs>?FS3F5Kz$CC!C~Ou z@5DTjFUWaDS&w$VQoUY%xjI=*Re?=bV;S=P(Jzw^A+-@(4;Xn=*eajiy7mXemix(S zm3s)$%mT_ky+DNpDZYTN8FEz0xEkj8=+q|4Q7_Dw0h+btJNiY0XT_@o_75#*G&m+>T}1 zbn%G@FSXhnms@kxi^jsQJ96B>%_`qmxKoiU2%o#ePfU0Ryw~xWitO`}{ck2j zOijyu1D+wi$$Rs1i|3}dE63Qc@b&Rb<>2)Lo1d>!%EGNPXzgBX{mp}Jf4*TyKAybz z7dGj8@A_6!ahu*Loei-wsQ3Vw8N|(zo6z!nW^DEix#SMAeV@muxY72VrzGsBOHXw+ z>J+cN1%$y^Xe=#a(U=o7a9IW%ejluKgCxOiWENUSpo}wdFO5tfEL{ zrOxBmFw~o@64l>CWl>bc=4i%qGDqQaMgJwf*jGWkCK7QwiaT~gBO8Ws=ba<8?0Kh6A1ZY#dVqNzyfZ<4>C2O6^NjNo-mV{G>YJ*}6yH05b#Z9&gJreiW9`u&jazep@8YT!P f#YKXjh+h!=THGS|p-4COm==k{kYaoE)Xe?^MNU^h delta 1149 zcmY+DZ)h8J7{{OAC0Q=H#x{3N`^z6_lhF2DvZah)(pybygS^8BBvOEb(_q&f>jz_#V&m zd_T|cx!+y)-t)X0^h*F>f>9CycwoRDerItq{9gE0`19~Lvw_re8>hn#w>l#}{(dIO zTsEiHH{PB_>l?KRw61iZ2_z|J&_mR#M5*!IY~cRYbW)g{X2$WjwP>AYz$UCN=SH|P z(hzp1SA_z}`Npj!qyf(gvLDODQficG{e5=u_4;e|i}j^CFpKqUo@D>}Y2hKL3t9GQ zPDYh4wNNH6p>jf^QtRpk2`#WCYKhyP7NpF|ZVZ*Em)11EF0oL1WgjKTycah!@9!cR z@MprB9~Z5HL`>24lUc9Uz%GoH6DD`=MwBa}Z45T-QJ>$Ek__I_%x;&EzeKy81V|N= zWJpB%IIW>3(rX!Zm#~(&HtU%dE3?@oefU3;*&qq|q_cJGS~S6kg??J@xj&*c=5FM4 zeC09NG!xHiHr!2YF?OlPwi%1(n7|%)BV8j;*VOQk?vGAS4);k|S zo=7O(RdiKPUO})6Hf7oDQywvN$DBLB%fG$K4lc?Mlw0Ph+!F)m&s`gv5mzoZMo&ej zN?ivabjRL``eMP7ec-%o&F1$GFCF^%QlGvu+;adwM}=z>oP6_z{JGUP8ntkO8T~3t z&2xc|qW6mSTF6hAtYkiqI-F%OR*xr{U&ZSFRrKcJAWv>fLy+dZn4jmKr6YW<`U5fb zsQp`G&Emc!a{$$E$@j#!Nk;YQYrOqOCVydN#TMhr)L3uXBo=ggv7q)GUAyG)Vx9E- zLwY*(o~k>OkH$*YJ-`E3?3mv(I|r)!&JC4rW;L;(@1?)1`TGELHXgN<^3<^q3f)Z~ z`vsxvN}NtpmM`vZ(Y;iT2VhXE$UFjo4Nd;QPD955+=e~{;52jsz+vdq03Ji10r0l9 zr2^nH^v;o|<>OZUNgZvu1Hc+Zp90to{rk~C7IKpRO#f6e%qNuPZ>75D2bqWc>@M=sltU diff --git a/build-fx/src/keyboard.c.o b/build-fx/src/keyboard.c.o index 76eea8f98e9221e627498759ab1a536299cd3ccc..cf0ab267845c3d6ab89491ca47f0a78fc78aa885 100644 GIT binary patch delta 585 zcmcb>e};d8vaJmR0|PUI36Nx9&|u(V;M8x^pQgV|f1Ca>{cHNq?gaZQ&6w@OUH>DA zS)rrfLaFnj|AQ~{CcR?F5Sln)VuCoM$HWR*SI2Aip4=&)QWv{&BsQDI6e^jnNZD*E zbIrz+yTs|DjUzV$=SAzO$&TDlnAbmM;Pe6V*B?w`zG?2s{X|rOqu(Q8@s!Ysx1=@A zrnq|oC4oY=xy)0XAneY4APtjj5}6fW8Y=X2BwoIxGFgsMR!t6Uu|PL$;_-O^)U<#oQx24j0p@3TrhSD0|PgVox#As z17qhfFz~|I1q=*)Fm?$813!#i0kj&%u3=zcgRvVJ7zAPL76t|(AlnaQHDd<@gD^~@ zhk-!^%4Pyu0COA@&;po)n1B{=z|;UO5QDKBCVye=W^9?{cHNq?u7U&&6wxIUH>DA zS)rrfLaFm&z=JRIroLjx5Slo7VuCoM=fnzGSEp+Zp4=&)QWv{&BsQDI6e^jnNZD*E zbIsP1yTs|Dts^%B=S7>TX^z}anAbmM;Pe6V*B?w`zG>mf{X|rOqu)DW@sx;(x1=>K zr+9e+C4oW?xy(~sA?(h5APtl36PXoX8Y=X2BwoIxI$4fUR!9DZG}vglM~v6xo-!yZ zJu0|@~L zV-5oYP{xO4DPLx8dVET18AE(dW?E|T$fT;mmAO>T%O#Z;y&Db%yhE17KW%2?xb;doDPk_k} kU{Zozo$<+J2O#-lat4shm^^`9UGxvo2~Hq)Kmph^0PQe+hX4Qo diff --git a/build-fx/src/level.c.o b/build-fx/src/level.c.o index cf6bad19512df23aed1408fa40f74ca66c3dc67c..2e6a71c814d5c99b533b738f6eaa774f3e27e837 100644 GIT binary patch delta 384 zcmZXOu}i~17{zm!T2p998bXsxTYDEvC|D$5M?oo$4*mfSPEJA<1i`70$*uKuw|_#R zi=&-%YlW^tz>E%692~tw+Qow(_ul&+eBZM3a@_Z6<8jbbm&N?hDXB4*>kt7d*C{kxn+ t%$kUb*r5J5j`%IDC3xaKt^Xk50p&#$ML@*|+9D`7uH^|G$?B0*`~ps)XW0M% delta 155 zcmX@%^TBC?5|jLci7Iy)btW@0rm;LKx+pd|htY;Zl85n$xCR5~b+MN>*etkD8j8{2T@b1}7kf0Y(r502z-d{r~^~ diff --git a/build-fx/src/main.c.o b/build-fx/src/main.c.o index 8f4a68b77474dce9cb1b4462a69a0aeedc74485b..e138c484f6073b52e98352cc0be261158ab9c197 100644 GIT binary patch delta 18 ZcmX>gd_Z_ZJ}YZ^eo;=!<`PyP763yF26O-b delta 18 ZcmX>gd_Z_ZJ}YZ(Vo_%P<`PyP763w424nyL diff --git a/build-fx/src/mario.c.o b/build-fx/src/mario.c.o index 30be578456c50545bb88f809625d1f0829fb2b5f..5493fcecabd9367b1e6187e83f25b8f2f1d34df7 100644 GIT binary patch delta 895 zcmZ9JO=uHA6vzLw=_Z?`-Fz90X>7aOY8s<93rY(Gv%z}kA+?7hLV8Fwr9pZy&|-x^ zgbEef(vMN_&_nU$K@d#A9z4{xhX@{0DYa?@i5`l0=)t3?laF!L2XEeQ-n{+4c{>L! ztF4QwAUl^jLZowPpqcoVZk)~ST)C`{xE0^LJ@@0ykah;PNI+L~B?iqO@fFDIL}{=% zcy&8b(Cw*d%%nHN>%}(9Egdn(P6F!9jGB1VE0`_! zcTk!U1NlR8N)TYp2O1^?a*r;XCuzdcNF9~}iO_vZl&nynl!*1QZ=5c`#Nu=2=l7psO0oW@g%t!%{IKO5koQpsc=UqVNybm}ym)LDM ze*#>b4*)mkZ-ABaA>d)0t27pd0dM_4WXvxlCJiAm1svryX~4&M+z=IS0>^lM!Wc%J zGKLYefS=dgVg3I!z6&(-gE?a|aS;gc{C(q3h!26|Jih|8a9#ykIX?l~IKKdtI-42S zdUXQk4WpTP8&K;-l@|?i?xTxMGo(a)a=ZA2J=HGNWz}qP0vMucxt*-jIXOsDbgjCU Z*g8cU947^vL{B?{-XbfEGUry+{SE)YmxTZT delta 815 zcmZ9J&1(}u7{;I3?QA#3BqlYqrm@K;(xpb)2CWISnhgyiq{bXP6xxFyDJkN?LW>mw z5h~;$62mBncnIRbgP@p##Zzs9rr;r7>IW4hBJ|*&AnGK|uOw^Cj7oJ|{mVizhQH zVZG>&yA3NWv#+D-8EdBc{!~-Wy2h`CJ=#z>7uVw2he_>v+<9AW{#y90g%(KmQ4=G9 zNG{^tIx$x*$HvrKj(-%6H@mZJj10zxi=qF-^^5Wa*ZCd;qkA^x@ZPq3a993YOMbj1 zKUcl{_Z>3Kx3okFAJOl!rqSjyOf(=%;704<}+k^uZWqXj^U^Tl=qU=X| c-S5!J6q|4iN|tSwap-Ptf>^81&S>lY0SD8GQ~&?~ diff --git a/build-fx/src/world.c.o b/build-fx/src/world.c.o index 3ee8929ade3a9120f5575f5bd7a26ddc520ba9ed..835d04b0db804e50d5e771cef6987b9a5def9049 100644 GIT binary patch delta 1445 zcmZ{iZ%i9y9LIlm*FtYsDI5%22DEoKxz^$eba62EqM)(U5ixNZ49*>;O+gAp{%oLe zN2*Iu=n6Z7X0NvFjfpQV$r4GU35ot%`iy1KOYV6- zzvq6>@A>}j`K~#?t6LOlZf)uKq8j)yU4BcTDX1siV%DAB2C|0A5KEdbZ)q#}KzV660E5Y^054+R0?4JH!Bq%vEwCK8d zB}ZlVLJj6S8;$^-gP3*>Wkymu;m`nK|9i}&?9o)PjZ_6U9%WW-bSzwJO^uS5< zgJg&WKV%AisNX<01n4lk>oDCiOLppY#<5~feVhri*#pP8OlM5fE2Fnp=G?4NixqaT zg1xz5r-G@_QarKL%BGTfRyuHldF?*)D#cv42rpC&@Onjr56T%PE(vWBJ}zC}2~MP` z@qYx-VEcJR{CH>eWlI-Tqg#5!P7c^DCWNETbozUmw1o9{DysFCeSdTZ0NQx~3g>$O zmP(w@YR+C2z^C83=!f9pf*G%kA%mZ>+8i%($})_Au#;ZTYr&%~n`TMBPg zai*>y+n$QAt*(`yqfR8p6VZz!$xAV~7)g#!O%R?+Bw~}LV5EP1C|P99#-7klv1imf zSggR1jVVa1h=?orE6)R1w|-;0f;oRF{~+`lKdv_b`XSnl+fC77k`M z0gjRlKLOO1*kV5vXXyrTk@dF$>Ik0)C?`C4m}AA8aF*7s9{?O990jlw9)vfcfdmPF zM#5tNZo-pzb%YlHM8b;z65+1_j%(i>nWetfoSbC+3$JxS3vm*)sV!Qc*FNPckrp@^ k$GeA*SDeO|JjLSw0@GAzX#fBK delta 1202 zcmZ{iPiP}m9LIn2Crw@wcbddzleTFylbT7|m1NV3sVHWT*p^nr~wyX9rULE*O;(wVqwG11#6fVtZ8yXVUeh_KKYSG=BZNav+~nSFUl|m7m{? zt`vlYguE`#6ol%1EtZ3{yCtO0m>Rvn2X%9ae%W{C&DZ5*!e6Xu*?p;bMw{I~zWZXs z)wyR}D$K@0OIm6nv^yHKKw2vDePU6YeqU}L!MGoDvMjZ<1|Yb}?I zhC5<9*g#@reW8ooS6#L}0%zLi`#BfdkIy4<`ahuf0Eigl2sDI1V+^RyZGR5Lir83_!7f~NA<~{MUW~uhTkWm% z&dpSMR%mx4rKB>uKXp0jpJ9Mw34j2OW1xTVi+U1E;p$3uF$`6mx6~4SP)sx4jw{57 zXVMK-Cgx*U);TP(V#;=jn|6uET3Fx|pC?C>HK7vbX@t$uzRh@9$dk^4CJ0-nOVp4q z-`cHD4w)ku;SNUdB=Xg3L$|LTA-*6ZGnJ4QY zD<)a?Ysx!Ed#mCCM-Lpoayk0-&{reh;uW)g01p4(0|utqi^D=9Tx|G1K<&+w*gKuy#pXI{SCk{ z(}w^)rhf$RGyMxdV4#K1PGSm}i`fXb5gcuFJF$QXMwkO82r~Wq37i-L2oLtfaez^# zqX15(=T2-K_%xxxz9RuJ#&jCM%k&(?A;K0}fC;9b2AE_z2N0#Y=VR`last_vy=b->vy; int sgn_vy=sgn(b->vy); if (sgn_vy) { @@ -124,11 +125,12 @@ static void move_y(box_t * b) } b->y+=b->vy; } - b->vy-=b->gravity; + //if (b->vy>=-6) + b->vy-=b->gravity; } -int box_move(box_t * b, int c) +int box_move(box_t * b) { //velx move_x(b); diff --git a/src/box.h b/src/box.h index e31e7c2..8f53825 100755 --- a/src/box.h +++ b/src/box.h @@ -11,12 +11,12 @@ typedef struct int vx; int vy; - + int last_vy; int gravity; //int is_mario; } box_t; -int box_move(box_t * b, int collide); +int box_move(box_t * b); int box_jump(box_t * b, int height); // hauteur du saut #endif \ No newline at end of file diff --git a/src/ennemi.c b/src/ennemi.c index 8cf14fe..fdeced6 100644 --- a/src/ennemi.c +++ b/src/ennemi.c @@ -100,25 +100,26 @@ void move_ennemi(ennemi_t *e) } else { - e->life=DEAD; - e->p1=time_id; + t->life=DEAD; + t->p1=time_id; score_add(200); } - + } } - int sol=0; - - for (int j=0; jb.h; j++) + } + } + for (int i=0; ib.h; j++) + { + gift_t * c=world_get(e->b.x+j ,e->b.y-1); + if ((c->type==GIFT || c->type==BRICK) && (c->time_hit_id || c->state)) { - gift_t * c=world_get(e->b.x+j ,e->b.y-1); - if ((c->type==GIFT || c->type==BRICK) && (c->time_hit_id || c->state)) - { - e->life=DEAD; - e->p1=time_id; - score_add(100); - } - + e->life=DEAD; + //e->p1=time_id; + score_add(100); + break; } } } @@ -131,7 +132,7 @@ void move_ennemi(ennemi_t *e) if (time_id%2) e->b.vx=0; - box_move(&e->b,1); + box_move(&e->b); if (time_id%2) e->b.vx=old_vx; @@ -153,13 +154,13 @@ void move_ennemi(ennemi_t *e) e->type=NONE; if (ennemi_check_collision(e)) { - if (mario.p.vy<=-2) + if (mario.p.last_vy<=-2) { e->life=DEAD; e->p1=time_id; score_add(200); mario.p.vy=4; - mario.p.y=e->b.y+CARAPACE_X; + mario.p.y=e->b.y+CARAPACE_Y; } else hurt_mario(); @@ -180,7 +181,7 @@ void move_ennemi(ennemi_t *e) if (time_id%2) e->b.vx=0; - box_move(&e->b,1); + box_move(&e->b); if (time_id%2) e->b.vx=old_vx; @@ -202,7 +203,7 @@ void move_ennemi(ennemi_t *e) e->type=NONE; if (ennemi_check_collision(e)) { - if (mario.p.vy<=-2) + if (mario.p.last_vy<=-2) { e->type=CARAPACE_VERTE; e->b.h=CARAPACE_Y; @@ -217,18 +218,18 @@ void move_ennemi(ennemi_t *e) } } else - e->life=DEAD; + e->life=DEAD; } if (e->type==CARAPACE_VERTE) { if (e->life==1) { - box_move(&e->b,0); + box_move(&e->b); if (e->b.vx==0) { e->p1*=-1; - e->b.vx=e->p1; + e->b.vx=3*e->p1; } if (e->b.y<0) e->type=NONE; @@ -239,13 +240,25 @@ void move_ennemi(ennemi_t *e) { if (mario.p.x>=e->b.x) e->p1=-1; - if (mario.p.vy<=e->b.x) + if (mario.p.x<=e->b.x) e->p1=1; e->b.vx=3*e->p1; + if (mario.p.last_vy<=-2) + { + mario.p.vy=4; + mario.p.y=e->b.y+CARAPACE_Y; + } + else + { + if (mario.p.x>=e->b.x) + mario.p.x=e->b.x+e->b.w; + if (mario.p.x<=e->b.x) + mario.p.x=e->b.x-mario.p.w; + } } else { - if (mario.p.vy<=-2) + if (mario.p.last_vy<=-2) { e->p1=0; e->b.vx=0; diff --git a/src/keyboard.c b/src/keyboard.c index 025b8b9..6820046 100755 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -65,7 +65,6 @@ int menu_pause() // 1 exit, 0 continue dimage(0,0,&img_dev); dupdate(); sleep_ms(3,1000); - sleep_ms(3,1000); return 0; } else diff --git a/src/level.c b/src/level.c index 3627c96..e4d5f3a 100644 --- a/src/level.c +++ b/src/level.c @@ -172,11 +172,34 @@ void set_level(int n) {EARTH,0x11}, {EARTH,0x10}, {COLLINE,0x01}, {0,0}, {0,0}, {GIFT,0x11}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {EARTH,0x11}, {EARTH,0x10}, {COLLINE,0x11}, {COLLINE,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {EARTH,0x11}, {EARTH,0x10}, {COLLINE,0x21}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, + {EARTH,0x11}, {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {NUAGE,0x01}, {NUAGE,0x00}, + {EARTH,0x11}, {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {NUAGE,0x11}, {NUAGE,0x10}, + {EARTH,0x11}, {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {NUAGE,0x21}, {NUAGE,0x20}, + {EARTH,0x11}, {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {BRICK,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, + {EARTH,0x01}, {EARTH,0x10}, {BUISSON,0x00}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, + {EARTH,0x11}, {EARTH,0x10}, {BUISSON,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, + {EARTH,0x11}, {EARTH,0x10}, {BUISSON,0x20}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {BRICK,0}, {0,0}, {0,0}, {0,0}, + {EARTH,0x11}, {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {BRICK,0}, {0,0}, {0,0}, {0,0}, + {EARTH,0x11}, {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {BRICK,0}, {NUAGE,0x01}, {NUAGE,0x00}, {0,0}, + {EARTH,0x11}, {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {NUAGE,0x11}, {NUAGE,0x10}, {0,0}, + {EARTH,0x11}, {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {NUAGE,0x11}, {NUAGE,0x10}, {0,0}, + {EARTH,0x11}, {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {NUAGE,0x11}, {NUAGE,0x10}, {0,0}, + {EARTH,0x11}, {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {NUAGE,0x21}, {NUAGE,0x20}, {0,0}, + {EARTH,0x11}, {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {BRICK,0}, {0,0}, {0,0}, {0,0}, + {EARTH,0x11}, {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {BRICK,0}, {0,0}, {0,0}, {0,0}, {GIFT,0x11}, {0,0}, {0,0}, {0,0}, + {EARTH,0x11}, {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {BRICK,0}, {0,0}, {0,0}, {0,0}, {GIFT,0x11}, {0,0}, {0,0}, {0,0}, + {EARTH,0x11}, {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {BRICK,0}, {0,0}, {0,0}, {0,0}, + {EARTH,0x11}, {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {NUAGE,0x01}, {NUAGE,0x00}, + {EARTH,0x11}, {EARTH,0x10}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {NUAGE,0x11}, {NUAGE,0x10}, + {EARTH,0x11}, {EARTH,0x10}, {BLOC,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {NUAGE,0x11}, {NUAGE,0x10}, + {EARTH,0x11}, {EARTH,0x10}, {BLOC,0}, {BLOC,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {NUAGE,0x21}, {NUAGE,0x20}, + {EARTH,0x11}, {EARTH,0x10}, {BLOC,0}, {BLOC,0}, {BLOC,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, + {EARTH,0x11}, {EARTH,0x10}, {BLOC,0}, {BLOC,0}, {BLOC,0}, {BLOC,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, {0,0}, }; lvl=&level_0; extern image_t img_lvl0; w_fond=&img_lvl0; - w_current_x=114; + w_current_x=137; w_current_y=13; mario_x_max=0; mario.p.x=25; @@ -186,17 +209,17 @@ void set_level(int n) ennemis_global_size=10; ennemi_t ennemies0[]= { - {GOOMBA,{176,16,GOOMBA_X,GOOMBA_Y,-1,0,1},-1,0,1}, - {GOOMBA,{321,16,GOOMBA_X,GOOMBA_Y,-1,0,1},-1,0,1}, - {GOOMBA,{409,16,GOOMBA_X,GOOMBA_Y,-1,0,1},-1,0,1}, - {GOOMBA,{421,16,GOOMBA_X,GOOMBA_Y,-1,0,1},-1,0,1}, - {GOOMBA,{640,80,GOOMBA_X,GOOMBA_Y,-1,0,1},-1,0,1}, - {GOOMBA,{656,80,GOOMBA_X,GOOMBA_Y,-1,0,1},-1,0,1}, - {GOOMBA,{776,16,GOOMBA_X,GOOMBA_Y,-1,0,1},-1,0,1}, - {GOOMBA,{788,16,GOOMBA_X,GOOMBA_Y,-1,0,1},-1,0,1}, - {KOOPA_VERTE,{856,16,KOOPA_X,KOOPA_Y,-1,0,1},-1,0,1}, - {GOOMBA,{912,16,GOOMBA_X,GOOMBA_Y,-1,0,1},-1,0,1}, - {GOOMBA,{924,16,GOOMBA_X,GOOMBA_Y,-1,0,1},-1,0,1} + {GOOMBA,{176,16,GOOMBA_X,GOOMBA_Y,-1,0,0,1},-1,0,1}, + {GOOMBA,{321,16,GOOMBA_X,GOOMBA_Y,-1,0,0,1},-1,0,1}, + {GOOMBA,{409,16,GOOMBA_X,GOOMBA_Y,-1,0,0,1},-1,0,1}, + {GOOMBA,{421,16,GOOMBA_X,GOOMBA_Y,-1,0,0,1},-1,0,1}, + {GOOMBA,{640,80,GOOMBA_X,GOOMBA_Y,-1,0,0,1},-1,0,1}, + {GOOMBA,{656,80,GOOMBA_X,GOOMBA_Y,-1,0,0,1},-1,0,1}, + {GOOMBA,{776,16,GOOMBA_X,GOOMBA_Y,-1,0,0,1},-1,0,1}, + {GOOMBA,{788,16,GOOMBA_X,GOOMBA_Y,-1,0,0,1},-1,0,1}, + {KOOPA_VERTE,{856,16,KOOPA_X,KOOPA_Y,-1,0,0,1},-1,0,1}, + {GOOMBA,{912,16,GOOMBA_X,GOOMBA_Y,-1,0,0,1},-1,0,1}, + {GOOMBA,{924,16,GOOMBA_X,GOOMBA_Y,-1,0,0,1},-1,0,1} }; init_ennemies(ennemies0); diff --git a/src/main.c b/src/main.c index 0fdfd1b..df8f581 100755 --- a/src/main.c +++ b/src/main.c @@ -46,10 +46,11 @@ int main(void) if (has_ticked) { has_ticked=0; - mario_move(); + //mario_move(); + + world_move(); dclear(C_WHITE); - - world_draw(mario.p.x,mario.p.y); + world_draw(mario.p.x,mario.p.y); score_display(); dupdate(); diff --git a/src/mario.c b/src/mario.c index 7671b08..ade1e7b 100755 --- a/src/mario.c +++ b/src/mario.c @@ -27,7 +27,7 @@ tileset_t mario_big={&img_mariobig, 8,16, 1}; pnj mario= { - {26,17,8,8,0,0,1}, + {26,17,8,8,0,0,0,1}, M_SMALL, M_RIGHT1, M_WALK, 0 @@ -61,23 +61,26 @@ void mario_smaller() void mario_draw() { - if (mario.size==M_SMALL) + if (mario_immunity==0 || (mario_immunity/7)%2==0) { - if (mario.p.vx*sgn(mario.p.vx)>=3) - draw_tile(mario.p.x-world_get_real_x0(mario.p.x), mario.p.y-world_get_real_y0(mario.p.y), &mario_small, 2*last_vx_sign+(id_frame/4)%2, 0); - else if (mario.p.vx*sgn(mario.p.vx)>=1) - draw_tile(mario.p.x-world_get_real_x0(mario.p.x), mario.p.y-world_get_real_y0(mario.p.y), &mario_small, 2*last_vx_sign+(id_frame/8)%2, 0); + if (mario.size==M_SMALL) + { + if (mario.p.vx*sgn(mario.p.vx)>=3) + draw_tile(mario.p.x-world_get_real_x0(mario.p.x), mario.p.y-world_get_real_y0(mario.p.y), &mario_small, 2*last_vx_sign+(id_frame/4)%2, 0); + else if (mario.p.vx*sgn(mario.p.vx)>=1) + draw_tile(mario.p.x-world_get_real_x0(mario.p.x), mario.p.y-world_get_real_y0(mario.p.y), &mario_small, 2*last_vx_sign+(id_frame/8)%2, 0); + else + draw_tile(mario.p.x-world_get_real_x0(mario.p.x), mario.p.y-world_get_real_y0(mario.p.y), &mario_small, 2*last_vx_sign, 0); + } else - draw_tile(mario.p.x-world_get_real_x0(mario.p.x), mario.p.y-world_get_real_y0(mario.p.y), &mario_small, 2*last_vx_sign, 0); - } - else - { - if (mario.p.vx*sgn(mario.p.vx)>=3) - draw_tile(mario.p.x-world_get_real_x0(mario.p.x), mario.p.y-world_get_real_y0(mario.p.y), &mario_big, 2*last_vx_sign+(id_frame/4)%2, mario_has_bullets); - else if (mario.p.vx*sgn(mario.p.vx)>=1) - draw_tile(mario.p.x-world_get_real_x0(mario.p.x), mario.p.y-world_get_real_y0(mario.p.y), &mario_big, 2*last_vx_sign+(id_frame/8)%2, mario_has_bullets); - else - draw_tile(mario.p.x-world_get_real_x0(mario.p.x), mario.p.y-world_get_real_y0(mario.p.y), &mario_big, 2*last_vx_sign, mario_has_bullets); + { + if (mario.p.vx*sgn(mario.p.vx)>=3) + draw_tile(mario.p.x-world_get_real_x0(mario.p.x), mario.p.y-world_get_real_y0(mario.p.y), &mario_big, 2*last_vx_sign+(id_frame/4)%2, mario_has_bullets); + else if (mario.p.vx*sgn(mario.p.vx)>=1) + draw_tile(mario.p.x-world_get_real_x0(mario.p.x), mario.p.y-world_get_real_y0(mario.p.y), &mario_big, 2*last_vx_sign+(id_frame/8)%2, mario_has_bullets); + else + draw_tile(mario.p.x-world_get_real_x0(mario.p.x), mario.p.y-world_get_real_y0(mario.p.y), &mario_big, 2*last_vx_sign, mario_has_bullets); + } } } @@ -87,16 +90,16 @@ int test_sol_le_plus_proche(int x, int y) int t=0; while (t==0) { - int type_sol = world_get_ctg(x, y-1); - if (type_sol==CTG_SOIL) - t=1; - if (type_sol==CTG_DEATH) - return distance+1; - type_sol = world_get_ctg(x+7, y-1); - if (type_sol==CTG_SOIL) - t=1; - if (type_sol==CTG_DEATH) - return distance+1; + int type_sol = world_get_ctg(x, y-1); + if (type_sol==CTG_SOIL) + t=1; + if (type_sol==CTG_DEATH) + return distance+1; + type_sol = world_get_ctg(x+7, y-1); + if (type_sol==CTG_SOIL) + t=1; + if (type_sol==CTG_DEATH) + return distance+1; y--; distance++; } @@ -192,7 +195,7 @@ void mario_move() if (mario.p.x+mario.p.vx + gravity + box_move(&mario.p); // <-> + gravity if (mario.p.y<0) mario_dead=1; @@ -203,57 +206,57 @@ void mario_move() coin_t* c; c=(coin_t*)world_get(mario.p.x, mario.p.y); if (c->type==COIN && c->taken==0) - {score_add_coin();c->taken=1;} + {score_add_coin();c->taken=1;} c=world_get(mario.p.x+mario.p.w-1, mario.p.y); if (c->type==COIN && c->taken==0) - {score_add_coin();c->taken=1;} + {score_add_coin();c->taken=1;} c=world_get(mario.p.x, mario.p.y+mario.p.h-1); if (c->type==COIN && c->taken==0) - {score_add_coin();c->taken=1;} + {score_add_coin();c->taken=1;} c=world_get(mario.p.x+mario.p.w-1, mario.p.y+mario.p.h-1); if (c->type==COIN && c->taken==0) - {score_add_coin();c->taken=1;} + {score_add_coin();c->taken=1;} //if ((mario.p.x+mario.p.w/2)/8==(mario.p.x+mario.p.w/2-1)/8) //{ - gift_t* t=(gift_t*)world_get((mario.p.x+mario.p.w/2),mario.p.y+mario.p.h); + gift_t* t=(gift_t*)world_get((mario.p.x+mario.p.w/2),mario.p.y+mario.p.h); - if (t->type==GIFT || t->type==BRICK) + if (t->type==GIFT || t->type==BRICK) + { + brick_t *c=(brick_t*)t; + if (c->time_hit_id==0) { - brick_t *c=(brick_t*)t; - if (c->time_hit_id==0) + if (c->content==1 && c->number) { - if (c->content==1 && c->number) - { - c->number--; - score_add_coin(); - score_add(200); - c->time_hit_id=1; - } - else if (c->content==2 && c->number) - { - c->number--; - bonus_set(BONUS_CHAMPI,((mario.p.x+mario.p.w/2)/8)*8,mario.p.y+mario.p.h+8); - c->time_hit_id=1; - } - else if (c->content==3 && c->number) - { - c->number--; - bonus_set(BONUS_1UP,((mario.p.x+mario.p.w/2)/8)*8,mario.p.y+mario.p.h+8); - c->time_hit_id=1; - } - else if (c->content==0 && mario.size==M_BIG && c->type==BRICK) - { - c->state=1; - c->time_hit_id=1; - mario.p.vy=0; - } - else if (c->type==BRICK && mario.size==M_SMALL && c->content==0) - c->time_hit_id=1; - - c->hidden=0; + c->number--; + score_add_coin(); + score_add(200); + c->time_hit_id=1; } + else if (c->content==2 && c->number) + { + c->number--; + bonus_set(BONUS_CHAMPI,((mario.p.x+mario.p.w/2)/8)*8,mario.p.y+mario.p.h+8); + c->time_hit_id=1; + } + else if (c->content==3 && c->number) + { + c->number--; + bonus_set(BONUS_1UP,((mario.p.x+mario.p.w/2)/8)*8,mario.p.y+mario.p.h+8); + c->time_hit_id=1; + } + else if (c->content==0 && mario.size==M_BIG && c->type==BRICK) + { + c->state=1; + c->time_hit_id=1; + mario.p.vy=0; + } + else if (c->type==BRICK && mario.size==M_SMALL && c->content==0) + c->time_hit_id=1; + + c->hidden=0; } + } //} diff --git a/src/mario.h b/src/mario.h index 5e70838..d03736e 100755 --- a/src/mario.h +++ b/src/mario.h @@ -17,7 +17,7 @@ typedef struct { - box_t p; + box_t p; int size; // small, big int type1; // left1 left2, right1, right2, int type2; // jump, down... diff --git a/src/tile.c b/src/tile.c index 00779c2..b7b5f82 100755 --- a/src/tile.c +++ b/src/tile.c @@ -39,6 +39,7 @@ tileset_t fleur={&img_fleur, 8, 8, 0}; extern image_t img_bullet; tileset_t bullet={&img_bullet, 4, 4, 1}; + void draw_tile(int sx, int sy, tileset_t const * const set, int x, int y) { dsubimage(sx, 64-sy-set->height, diff --git a/src/tile.h b/src/tile.h index aabf50d..71049a4 100755 --- a/src/tile.h +++ b/src/tile.h @@ -28,6 +28,7 @@ extern tileset_t life_1up; extern tileset_t bullet; +extern tileset_t bloc; void draw_tile(int sx, int sy, tileset_t const * const set, int x, int y); diff --git a/src/world.c b/src/world.c index 211c256..f1726ad 100755 --- a/src/world.c +++ b/src/world.c @@ -48,6 +48,10 @@ void display_cell(int cx, int cy, int sx, int sy, int plan) earth_t* i=(earth_t*)cell; draw_tile(sx, sy, &earth, i->x, i->y); } + if (cell->type==BLOC) + { + draw_tile(sx, sy, &bloc, 0, 0); + } if (cell->type==BLOC) { @@ -132,6 +136,7 @@ int world_get_ctg(int x, int y) case GIFT: case BRICK: case EARTH: + case BLOC: return CTG_SOIL; default: return CTG_EMPTY; @@ -151,7 +156,9 @@ static int min(const int x, const int y) int world_get_real_x0() //mario delta en 0,0 { if (mario.p.x>mario_x_max) mario_x_max=mario.p.x; - return min(max(mario_x_max-32,0),w_current_x*8-128); + if (mario_x_max-40>mario.p.x) + mario_x_max--; + return min(max(mario_x_max-40,0),w_current_x*8-128); } int world_get_real_y0() //mario delta en 0,0 @@ -197,4 +204,11 @@ void world_draw(int x, int y) mx+=8; } +} + +void world_move() +{ + bonus_move(); + bullet_move(); + mario_move(); } \ No newline at end of file diff --git a/src/world.h b/src/world.h index be3af42..f853b1e 100755 --- a/src/world.h +++ b/src/world.h @@ -34,10 +34,12 @@ typedef struct #define BLOC 3 typedef struct { - unsigned type :4; + unsigned type :4; unsigned data :28; // raw binary format } bloc_t; +#define END_LEVEL 4 + #define TUYAU 5 // X, Y, _ (XY tileset) typedef struct { @@ -80,7 +82,7 @@ typedef struct // Generic container typedef struct { - unsigned type :4; + unsigned type :4; unsigned data :28; // raw binary format } world_t; @@ -93,6 +95,7 @@ void display_cell(int cx, int cy, int sx, int sy, int plan); void world_set(world_t * w); void world_draw(int x, int y); +void world_move(); int world_get_real_x0(); int world_get_real_y0();