From 9940b9059a980e1f714f7ae8a498be832b4f1e07 Mon Sep 17 00:00:00 2001 From: OrPas Date: Fri, 8 Jan 2021 15:29:14 +0100 Subject: [PATCH] Change block system but bugs --- ELPHO.g1a | Bin 23672 -> 23752 bytes build-fx/ELPHO.bin | Bin 23160 -> 23240 bytes build-fx/ELPHO.elf | Bin 35632 -> 35788 bytes build-fx/map | 655 +++++++++++++++++++++--------------------- build-fx/src/main.c.o | Bin 2588 -> 2716 bytes src/.main.c.swo | Bin 12288 -> 0 bytes src/.main.c.swp | Bin 16384 -> 0 bytes src/main.c | 28 +- 8 files changed, 350 insertions(+), 333 deletions(-) delete mode 100644 src/.main.c.swo delete mode 100644 src/.main.c.swp diff --git a/ELPHO.g1a b/ELPHO.g1a index 76d9f6cd0a6a53c4e4423193a787201d4c8fb770..88982578c316281aa4bfcdb3bc053b47a7ba00a8 100644 GIT binary patch delta 2944 zcmZ`*eN0=|6~EWm&NIg38QH=ifX!!Uf%w)K0U=$TKmZl<6^H_aE~Y_+r8M)_XxStx z(~4D8AtL2^Yqs$RN>IllORzoEWo;(W!YZ_)6%w@a2byR~0$Z|`CJ~FYY~Jra^A)Li z)_M2d^ZT81&$;*9`~2t{o&E#0UJd zzW5tTr@O2R|su2AR9H zCj&wo1MOoqI@Z+EO);$@@^ilJ{Q2LB^ZkDi=LdJG^Hb+v|4E#87OHDf18cKYf2;Nw zm&whlSKd1IrQKCxY`e8sxniup-#Xdwr&m644<7s287K7i9~}Rt<{E0cmBEk$~ju_!3D`T*-QKN z?UM@yL#CJB9R2w8Wc#Fw6!@+H$uGWq(43VxW4|OLsMIr2E z3BZPWn7k_XIUFWo`Q@scv-CFcWG|mYeffExRGfzJU3G)x(UKE=arf0VoE2t6jP=#YI$u;s%Xx}w9^n@j48(3 zW^&SHUST>#`*_Iok*SZcXATnfEZXcoem1s1hn_sh$718*cse!@@5ixehG4f^r_x0w zYxi+#xJcM;ABbAsE1v{qRW30hv^}y2jWF8?FEratg9!c7uoo*KOF`adK4(JNN~%_b z&sWX;PimB&I8JksN*$I_!g;e}ZM?`;-xe`63I{k3UQF&KgzfF&rIr;DbGf82>(?~H zFFbG0BB8Huvn=xNV+YOM4QpjEvP|*P_&h^!S2+A%;f{C5I}L+dqiauK597aY!oild zalh?^n%S1UvS8asb(qMQ&b0~7+~Ba4c;>XexM_M`^YY=jD02!yH4=jeO<=QhYn;w~ z2?zzJSyaRjA55s+F^$lSxWkDLbXE-L7U$}7u2h~F?k^QNtm!C;Z=ByP$c{7 z`PeQImT?}AJP<-y&IGPDu%gD$qBgY9C#6TOx+F2#5+AeIo4`0KtYMim!DYvH;vytL zAT0T!fVj_*5W8ucY*TG}9S>+w=}LK39Dvo-Qz>wiGLD-yeO6nOI3xzVZN4@mVs1M%~@!A=IFfUP&W3DIV#{k zgmlzLVdur!6!WwWo>&GC1Hw~GGU}fsTiw%jpA2!PvcR?B; z9!LjdWKL6)+8TFgqw)-Ldc}D%Pv%I1a;Y_uPq1*hlOcyDAONIh_trgGX^R#?nBY4W6U$3Dpu-BTgFnden^C&w@S? z{R-$sAMUG{H~82?TvHKSB(C-a2gOl4zQOmP6=H`_A;24fi$7)ss*eAnDYgmgvqJ^_ z#)A^sHT)Ee0h@RV<^i@Suz}|ICgk$1&V4v4mZxBTVC*SaH!zW-pZlBRlRCbIB{CgC z2%UVmIafzD;jqNNY_8;M&AWKciRjY|(>7M9vY9D6fE_Bnw>jKug^qcot?_1uJ&$@h av~@8Oc3@3~gnsiupAVh5sSAn^;r{{KH}5V0 delta 2884 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 delta 2862 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 delta 7184 zcmZ`;4^UJ`n(z0R!8gnw-Vi)cfj0~zl8DX&$vUXJ4vK`0;{r-98c`955=Fx*Dtl*c zCdup;Dz2{W8L#5)PF<*5s+LlcAt~$DyQ6NcE34w|Lc-;|jaN%Njax)OEB~q9vsy)hx&bAdK#_-auvxa$0zGj+enNd`k-SZF+ z9%#MCx>Mg$>YM2$%^<{tX2tBLrZ7EY$Sjs&lErkNhv}YHrt{K_SKQGAW4=TpF#-Pb zu$=Lcj9p=>b)a_Euuk7r5RstPX8!a4$baEKnE$UoWB&L2|LFhdKbim2TQv>dgRkGN z2|pUE`M4%%zsvT#c25i0?*{MKo8R5@PSvI7-VWLQ-nK8-sb?N;fA53pk5{d;GusE% z^t;i1cmCa@8||8OzGb7`FNZx!+m~nL&lBFV{eRQ;)*`9z(wTxgv0KY_ zyjopyhgCoILHVC=SO;ZIzc0=|;T(H12w{^_SZOFd`0&8Pu7~>{?tA#sLuT)McqP6s z-WC^ekm0$lr0(0Vw z{f@M{^tA1j#I2kiuNsEj>q}g@b|>~qV$=N7|J@qD^3~SY*bjFPD(bu-)1CP!_4wY( zbXO149aNfu%b2dh{gg<2$hu3e?!lBeP%vGxh3Q#06;*+UDpa2fRydN+lSr_H+P3M# zG3g!)F1@>p>6rmutE{wwOX=njWxKnd>GK0jx2<7%9@N^S@oD9-Bt>~^mS%;J()00X z)@n%_=A-sHIqN1@9A0{rJNDXo{6{}=`1edQ-s;HZ!wyaA;bRWJG<43{F7@&b=P#YT zOfQ2kJQZU4(hx6qtt>>1+A(fve4;PogglxlbM~P@bO6fmj_?BaF=qr{My(+} z=05XyO?*ubmzG7C-V~xHOxMuoP!K-dVK%f!@y1#Ud6>R&l>sVLMdl?E|3l(n?v1s>9nD| zmz`Hh-Wo zpEobun1%)yZb?IyML&0TnjI0`R~P*Ta{CI_TZ2sBG|9&bme?>3%QmBQoGUz5oDcRf zY9cDZwyXnXAK1+%7YlbT+%!oLY}eD+iFF@Wi_R52PG))`NhOIU%V^Qzr<5C#R)l^F|E|HJi>2i-&tic5d+hUwi0RF z+Tg8$|BYKdW&dnx%^9~eyMs#`O49^R8Ull!ucT8cVeAf_6=7=u(^q!!>57f? zRe7ARsniy9jc54k&&aJgAIKeEW-nd`ZVQSM@2R{m*(^+7u@%fC@s6rr%1+}GaF*#+ z1H63Y`))8)Wt!cpYh?PhrnUDWXtq zyleHF(tI#iqo+oL6sh3b4RRr>>yonONEm>dD3kHNwP!?YQ;n(8P*+~_tNEDwEf0t> z-H^Ct-7}KZ%|q+opI>V_NHv8ILpsL5!OLr(k@|U0ZHd&yFV<@Ky;@tcpsT?;5lyXFXpHF#jW^cAPLu%fB@~ElYBA~gQ}jj;`cdFS3o*|N z!Pf*`?lnx$iJJ7R0Y%NKLR|+6=A>zj*lwMwngw)fM16r4x`+R$2PrT zS=Nmx(T{Q&WejfCh|`6TN81SJ;l*nG^2Y)o%v@yX}&B(6)r7j>pL zQnr?X?bX8chA#6v^O5*2Lp?gsprD?%4ng z-nJh4LhVWvyDe_7F%2vO$+N*u8xbC0 z{Nce4&Zk=Z#W4b?qV%3&ozbKcrimsz%mX`i%GTNV#T|byAyP1AL64EEOY<-^J-l<* z@*HIX)t%4-O2)rY2E_+=H6TxVwCiV0WOji`lSav9fdeL%k0Fa8xAqD8KSAVi;G~M% zaPJ_@O@x44Sxk(mBR3DJ+zz$Uev(#H=M$h%hmlI54^N1te`f81%X!c zN|;_t6ISLmaXAuqib-RF9;Bls@I`@f$}#s66)MqwD~{8K#{rYPos`Lf|F+z1+z!$eEmW42eY z@D>m8NBgvj^0Zd#u{NYy`p_v7~j8w~hgl?-~a=od{jxIQE^BV^>w~zYdmdOL` zh$+kZ`J;ncMFeey2WB8rl@k`-w^Dm@Nm68Mu5xYG;adeAl?7Vr)R*?VvvZ{kXtzCr>MInZO6{@p~_O zYkE+XREapSX%tWlo&yIZB!P3I;uvB2dRkSJLc}#X{_^^6t%CemjGf~*7^@g?($L#T z%W?Xd(}H!>fCFW>)^r|~xuz^9x@(+oge}g>$DP2r3S*5;KRK$-M#Qi|Kr!mhRwKby zzOUg#P=?=TUjKc~2*XK<@4)?|X%dhc`D1DLw{SzUi1^{A&QFc=TMEPBe0NiH7t(Ru z79qaDXE01ICw5pG9o6(97uJ8+s1O6;dh+oux!{|)pJb8;qm0keVS(XNZSat`o4ASH z0{h{Y>uRA{IGhXPvA9amF&?fd#AleBjL)twACHIG4#fLD(1n9#7r-2ymmSum4qks) z3nx7dva*p{C^x_>W-lANH}3B6m|f5Q33R7*CHrU4m28idmpzP-Fe>y*UoPhBIpbLXkbk6r64HsZ(&|Gwy zldU2vH18460T`%mf;04jE*6Elm1XFjOT4qkZyf15O*JYqeor4C?9qxF(}WKhSMhVb zQL*m4(|oE&bGyLxtQoV^f58~}c>WRc_`ngZg5s5M4L3qNuBmW(F*Z9;CEu0(>bkO}4EFT8bO(79mXI=zY zgd;ar7yWM)NueO_MskjuK*l-*|A)pci9x5;=0@sdfjlWB=${cUirM~f&+bD#@e4;2 zZvNB0%e>))`Xor-#jY~bdN(Jsfz&z~xpPoJ-&Bpy%sRV=YO4|LKk3SbY$UhIZIbpTjmhoW zf}?Xx>6j&Zn0u-)Hjps}0UtIHAKa=#6m(8-eHc=^(&0a_6`~J9{hj2VyVFYp?t|~% z@AvzC-*?VE_uO+QU+H|6l`%4n(Q}9;!oCP>BYz>Ii5#@a$hF~KCB;TaO%l&zVULpE zhN1>IpNBLTYO!!m;O%g3LMtL77lIcIVAYzzA1tA@flrmtdcl8CLJNVvTteghz9^xc z06$+sI}85bbu_*v7dY>I-+TTS@_zg)d9VG(ytlkR{z2ZQx$d5wlYids`l-9ku}D93 z4W8`(xxv@&h%DTDKO#cmUHRl`NKD2z~R=}yOWLNrD?zZ3S2so(n zZacqrIu>gek99g4Z0C}=GM8Oh`F%B8c4+z8aqa8qr7_lWZQ351onqOF=%(%d%C}Ni6RU8X5Ol~&vtzBz~S%Bmh+4=Y>C~cfHV8I zzqc_q?JM;2?eK;6LZgY*J3BvYei_g5=3nmm)8E~8wP9xSY|`1&n9L{gT7Eb`l#l1h z5zDt;%vPX!mG_;i%U!2R^apCad8TZxCYPhi8V)9SLEf)B&gI1gNA(aSA(g9UE{wih{e zs+x%FkHKGq*KaBI+gj9#oW;P6TL@lb=={4cn4$XsbWBauzhuaw{&frPv)~XgUkXt_ zY|%$8__%>Z{xq-UZp`l^Oa65W{>FmmEjYgxvkD8YTZ0oyJn0Ejkl!h&B;$!-Jff)- zjD$5+NmH;_Qzq2(9uV<_5{1wi&*(jaJp)5(SkHhSO+^$P{IEI^85u*9LZNz0O>()= zaZJ&MDVWhzH5D8M8C7*;OJYz{2X$$91IH85U`kDAMv_Skolw%@m|DzStE|WQ)+388 zD7d!VihV_5KpP2*wIZq&dl&of2@&JJ@T7=qBp&b6-5i!PnT*Mexyf22e-6HsLqG}Pp^Kfsl6XtvOWF`{2GC-b; zo-W>FBGT1yojhq(Q#|;(6!HvYG6v=nDwMQ7nj%klB$2?EhQ)mp+lFL5H*q%jEyc#X zsnN*8QC%?PG3*)B%8kg4JCECnxZ(ivK0|DW^D~}nRq)+#&KdpK=ZIw!<30~knjg<& zr=&zN?jCT`xEucgo`Lf*_`gAn+ku$(Ylg#Y9OL(48rOtN|0EmsNMVkZ(D}cI_jAHI e7HfiVLp}1`2!!!o+;F7JdG>R_U0g7%koO;JI#yBu literal 2588 zcmb7FO>7%Q6n^70#L1@AO%s|zq&NXZPF3s@qJjelJ8fx2TvDV~RHD&(ZEq4MwiDT# zwvnhpNsxrc%{aEKHMaX^@2=mGVF5GRD92!Wv-ib)ZFJ+w%s2ax$@y|bOHVu?O! zyzl$oH*ep}yd5tbj6B0!jBI1H8@@!i6Tl5LXexZ9P>ZE)z_V5IEth-}&wXL{s(%6# zc^#q_5Bx4GnTT1Cyl|eZ6Wa^^Se;l1{A``rQSfipiABM`Unj=%eNiX&GWhFtVi&>x zvq_Avf0^@v*8*?0===@!=8NQ#Vc#UYeT~dHLnHv?})PAv3_bq>1LNsjwk__*B!f^ zcl}ZA^-X^kTgkGY*}%S~?r8A>%XgKROOK8%1|Kd{aQE7tw+;^DUC-a@>3n_bYJUj1 zuCoRAXkVt1uB0l{m8nXyLds;NP@F2pidLqU=n68q%WUkY(hg*;zVSoh`*~JoLw!q4 z9OoOOE2W)di-oV}8MM{BQf5!}Ej6F5mfFS^%{p#es1~l4m(Ny@bS(WHEf)SdagJWq z#98od`hRw4|NbGb@6dC{`@KQ`7%xTOub^0ki!^38x(^_hp)Lcr}XVp27 z6S@Jl6jW3CxFNmO!pZc6I;&@MGnouZNNd^nq+U~QjBLgYY(~~nkh*cY6A#pgSZXG2 z?NGbuPxM%u@Nr*v2)|w8afUYUCE6i0j}Sc|{5=wnp4lmQ^xQV#KaExp{sDpRjUzPY@CH~L5Jj3@Z@-ytA zsE1*HY##e#^H{shha~=l#AA)N-jMjNyKCq9o2~US} zK!^S??_GXh^H?he_S597eCz{Y*~EMIf#kkbAJ?&nBoyy`44m}drt`oTG0;cmJulvS z0GQ{)8FF*o!4LilY~wL8c)gZ2w1VdAXvX0GBRrqS!eUQ2eHFS+IKp@?Zn&=Py@Ts+ L$IlTAVW#dsLLxfG diff --git a/src/.main.c.swo b/src/.main.c.swo deleted file mode 100644 index e7de51c465eb3ef138de17137856892976ac9cc3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12288 zcmeI2O=}ZD7{{lA;2c_C(W6rfWrJ;YQ!TBe5sC&AtF}n$3m%ru?lc*?*uIw zU~F&glkFQv*&__&Fids$U+vcFMrD0te)UeNyi~k-W$bb@j8fBe5*3;inWSbCyJo{t zLDn6+g(k=V88`?7&2(#id2;j8LeA31&0Lrkr%!Dj#L09986X2>fDDiUGC&5%02v?y zhr~b{O|U1Z^+>PYnO;9J)c1zekpVJ52FL&zAOmE843GgbKnBPF86X3P(17DHc7Bqv zw?O~@-+%xAew?xQ;5B#!UV!JI4c5U5u)r)h2hM<#;MWvmAHg1Y37&zcUU$VkP<&9-)7>qie}7pFv2>9Aj~f`o#@F91&-=S##!=r+UHQ^* z#5AfwVilxfKbgMLCapZ{=g=WtHbPvsQi-Qf#i#Dd?&h{rG0NNjt}?9 z+bD>FK4?+YQpF3UC=n{wE8>f=>We6d7fM0F>x*c8&{hzv|8Hh?=aQZ7Mqd=pz%QGb zbIy0Z^FQC5+4D^@n!0V%O}u|)n&DW)*fI6D+|fJcv86cGHO-{Ut&ZWr&09w{cMsmY zantId8`eZtPihr2nU@SjOAeJPW16n0Qqs`#$+D!VEAx@-+y77c%w{cpV%9Pk;x31vZ1L!HEkQ`xv|grok>S46XrP;3BX9oLs=zH{erH z122Mu;9jr}{B;3iZ-WVt0>7Tm*sGudlHix~82br)1>Ofozya_ScoIy4VQ>Xl3Qon~ z7dQx>2h(69SPT||pXXy-;6AVyl))ab7F+`6gJb71b{O0PZUI+J_Lus13&|Jfh}MGIB_;(-+^zz2jDeu1UwF^U?&&>>%ryV zGVlTB>Rs><*ac|rE(RxoGy0Z)S}xDyP3OTnM@q>dAZTpV*$AaCiqteQDVRmwS2 zDa*N%Tr_!>`wP0)6)YWZ+ckB7`R)7bph<^qWI`(KxihshSTothM^rwppetUGd0s1* zWi>DBy!HYwOL~3`zjh@X#;c9rlwv$y(dBVPvy7Z!N~X-SS)Sq@9lUXt?&N#-@+Q@~ z)1i8utYH`)4NcZ&@)ivXJ{g?6w+CtXU1719+Y#?hdxL^sd*rEtHlfCE9NLi^9$LS( zv$J8G#cdO>I--sxS&aEIl*Y3Z^( zRut>C84P-W8w!U2>T;=4u@spbmd=zmkaV{kpG@$nL@1<`@@}7h1>5iVb-CL&ZrVEJD}dvJ#iEiQgPpo7PIyd= zDJ3~B@nsOq6;VNWg`8yrNajKk zM_9Rrr?Qf+*IqVjGYOu~Ix$UlY$?bP-CUYQx0XA-ba7Ibi@4&tXkWo;U#~N9bWZW$ z7R!^StgCz!e{-hfY+-XIhm5(=l9qQ`L{{-eoN2qJGl;gUw_VY(OY2PAP3BZN=&0q^oxh8<^#Qwk;7UgD~ZI-tMxi;rtcp_5HJBdYQa znio%W@+iT3623LkUT9&3PbcgcnbpRVscFl!-O}%DWBGMVXLiEjYNSiHN(tVZsyjua zYUz|SkY8@qxe?}Gw)i|f1;pxVyX3{tP zOyk^Ms!*(``I3c=!P?!>KAFb?wrAzoy6|;;;~v!{z0jnnpcs{sG({z}|KE>2@jmRE zY5!k;zkdSz`vYJfD1x=%6!!AJgXh3AU>sZrR)b#fCHC^4fmc8oNMIMZ1#AEpf#cZU z*T9?LelQ4nKqrWUdEhwq{6BzCz`-A^05Qc>}xx z4uj{xV}Qo_C=iEGKqw#-5DEwdgaSeVp}>DafoX}7KQpRzmk$@!IMoE?{Im?J= zR;5y@V2btn+Du7O0@bHu-X;y3e6m1?o3W&i6}~)mmBnPF8#wafZpJi=e7TnqpLQ%b zKiw0@V8En5#ZJXAOCPX0$=7D>&Q~Cn;n}S+DyPHWv#(<)wnZsh^v{Bn=eKxSQ?b#g zXJ)CTC;#j-y5i3P1`>w;f~a>SVFTCz2b=kFKvWlpHzqp6xcm)#4nPo}5>&T&#qMq| zfT$KE!ONJursDr6u{$d*w^Nimg); + dimage(current_player->x,current_player->y, current_anim->img); for(i=0;i<=(sizeof(ListOfObjects) / sizeof(struct object));i++) { dimage(xref+current_object->XrefAdd, current_object->y, current_object->img); @@ -144,9 +151,18 @@ int main(void) } /* Simulation du monde */ + current_player->isWalkableTop = true; + for(i=0;i<=(sizeof(ListOfObjects) / sizeof(struct object));i++) + { + if(current_player->x == xref+current_object->XrefAdd && current_object->isFinish == true) + { + current_player->isWalkableTop = false; + + } + } if(state == 1) { - if(x <= xref+160) + if(current_player->isWalkableTop == true) { xref = xref-1; }