From 71f3e778bb35129e4794ec246ff60cfb9ef4093f Mon Sep 17 00:00:00 2001
From: Milang <milan.garnier@orange.fr>
Date: Sun, 2 Feb 2020 16:05:56 +0100
Subject: [PATCH] fully added level decompression

---
 SuperCbr.g1a                        | Bin 77920 -> 56892 bytes
 assets-fx/bin/lvl_1_2.png           | Bin 0 -> 3018 bytes
 include/level.h                     |   6 +-
 include/world.h                     |   2 +-
 levelconverter/1-2.png.c            | Bin 3989 -> 0 bytes
 levelconverter/1-2.png.packlvl      | Bin 3519 -> 0 bytes
 levelconverter/{1-2.png => 1_2.png} | Bin
 levelconverter/levelconv.py         |  73 +++---------
 src/config.c                        |   1 +
 src/keyboard.c                      |  10 +-
 src/level.c                         | 165 +++++++++++++++++++++++-----
 src/world.c                         |   2 +-
 12 files changed, 168 insertions(+), 91 deletions(-)
 create mode 100644 assets-fx/bin/lvl_1_2.png
 delete mode 100644 levelconverter/1-2.png.c
 delete mode 100644 levelconverter/1-2.png.packlvl
 rename levelconverter/{1-2.png => 1_2.png} (100%)

diff --git a/SuperCbr.g1a b/SuperCbr.g1a
index b73ad439b3367916664534ddfbe05daff5171e37..c55e7e133baca2291a019c1f5fc44d45538a8c04 100644
GIT binary patch
delta 8589
zcmb_g4OCNCp1<!UKth5><V!>d5h*H?iyy5zlmTTdMQRWbsUK~k2@ph32$ZqNqsn?>
z6{9|n^;mWeEuN0s^@wvGXX>8g?y=Q&-8t?|A|Jz8?Lk3J9ols(rOqrn?En8>LIQq_
z-I>R^-23}~-+TY}f8R@gzx=`lS@_3i{<Y(<{bY-J?7!e|&tJyI;xDO=gfCDmqzhA0
zmn?bdS2@3AWaO(fVVE&79KA8B&?vQpFh)YZY`p^`@d5fBvcorKd}BhCT7?E#y_X2N
zc9~E@>}2Eyp{86yw`36drj1bJCPEw92;EHy4R%T`6=*m%sSUbYLEM9vB7|<)pXGtI
zR|)OS5V{rnWJU8&fNi-#BRfxMXa<bW5L$MM(9|?SlL^oP&mSbTs2O8`*e?(o6-DU0
zWI_u^37x9}nNC8}LEl<Wrmlc^=JyHb)PYP&D)?Rp@)Y<VUm^79BSM{^clIiw@11~g
zGoc0jlAY8C!eGcD=EVr$Uk9F7w-e@uGWj4Y13f+XOo90Hd0su7vv7LqS%!-Q-SmS}
zJm|L-Vv0~pdNax-8yGXh8Qa`Ms49!l8DRelupJ3FWf<@#h&LDTLGaP0-&b1D7h1AX
zf84s#)TIB&6qCBjpmR-igqIgIzhhL>q63;9b*5^N0klX>-ZSnEh^A-gre@ZtHYAph
zSVxGeY@{auMA(jzenRM;K|*WX5OfB#P5kL;i5#vs#(N0-V|=L(^!o-G{c-(A`d{n6
z(D&-^-ZU6=eFm<t*;T&R<lLq<#gt6%$t@MKRdLhTKD@Cy{@;|*uPSm?X1;{)$sS~Y
z9+*F(OL9b6yN>U^7t)iJts0aauZPh}7_qn9{UOJy7ie--O)f2`aLE1`;!4j{5hY(5
zx5$--(Ka6`6^!blhl5PdvK&>M@)n7Uyif8T(l!UX_J<F)mI_~!{E<w>!kD(KxH)~P
z7Cu{LZr{RJGg^g%jZ63-Z;03#htbZO+mUA*tCWc{T|ku$vBm*Aqn^8NI9tV;+g-DB
z6>gHNurq0gl4rP?o8hH=Ph3g+AQSiLYbyPowcnTWT`?u?@lAt_DfC)o{IZ@Iy8nou
zpZ~osRFWw8{`KJ+dEAoi?LRr}IKP`&`$KtG>V=M9#zhjhUQ3jI3lF;;lm(053hfLu
z?gpg3g3#JxLK`7nrky5ZV`DJZjuCihW3hv^%i3-Z5$NS@Uy6M|+aHF)0SC7IerOu>
zL2W%l@z5*Ux`1!8E4Q>)kHsa4GoD?^+ZB$&#xctPu902owBgJ%#BthH&cV2uA-Su{
z!kfD?RdJypJZ0^7mVr!B-~bt7on_|s4Ar_}yAosx$eJw!=5{|>9%Q@h$^*nroSQ9t
zhN|!p$_^1X`_=2__BE)haHuW(8d1){6h3m3H7W}aQXDhHxY@3?*@|pM+QH;y9hvTc
zA=2@Qn>h6LV9%Z@TSA72xhor06pnyzWVmxUmyo$_p#Kf2Y=`+_4h-0pEt1v%NP=Up
z+z{hjnybiFq}}NF&t&B{vW_2MrG7d@I167pCJF_&7CS-!{Y65KI2ix0G;Rs7@U1y+
zdDjbPze`?LJL-}69wh$9GX{y;KTG5N0j*0qzIMx77j@i)|EV1VZu!|>chK2xH`_5v
zlxLmpK(W8-mYucy#!dRB7d`Bm4o8D27_kVhX?Mx`KNUXAROuHMJuDS^rXZ(q#1+CN
z84@c;wvSYdY#YJTojJd3B#caFL)kE98tcm)JmHN{a^}HlZ#)JGm&dDTL~~fh8qetW
z`Ofw?GX32z6AilSiC?|2TE&g#s0K-eYz_Q(C44RKOSl(w{3mzFAc0V>^~T>LIL=n-
zkM_phlig8z#<O5NO&U9AX23DNHKjM2L^9DY#)wi$sNsstECrS;0?)ZK0>$jM1HV}f
zz4?-<os&O4Gtz_y2TQTyFkS&tDaJC~*a;2$Za6n)@k$d*mksEt4~|Bc2c{o{BB~a4
zL?36;y~X=FUN&%HC~eS3fp#DCVbJ$OuZ9Mvun|@ci(yBCR1B^4d{#^yTOb!M#3VAY
z;yt95?x9qu?{hVh7~WB-X-8x4hSG~r!H1!`FD7&rgv=!fk7CQ2h=j|8#y0@(BHR$C
zpq+*QukiKSbhbz%oY$7KQ@pCE);P@5*+uNEYl3~YPR=G>;Lp5p2s$AxDThs*1GS<F
zA{QNiGtNfF9zd;VlEb*0jFG9(5AtW`-H#SUx&d}VgBZ9|(2hZC=FiPv6Nr|y$9Q@2
zNMdRlM%P40kTioi=LlT@(l4JObS5NITr1wQymrAZZebRz7Wk`i`zF(r0RF*5GKD^m
z&=@)NMz9XFjD8r~;Ch2STe?)gub)UMxUEM2Ma5Qq@Ad-y-O82MV+}fPbnT!1Fw6X*
zJ~Sb_MfMIaCDfGPGtu!;`*n(FXH>mBn^QpX+6#qVHjj0NV=9?HGzymQO7<q)u6yv#
z5$CipSJ-D^f=x5`)5(dI0Y_#s4KGQU&>3l8gCKaU&{&iU<hPiFP@?K5PURh9&<&Da
z@XZe`h}D%|AmmaWsKGLoCc|sTVR&_kaWR>Y3z)ZMr-bB`lZ;N<crXncj;}QM3KMw+
zmU0KI9gJr*^KSj^X#dUU%&<R;p%p^Q5(eonShm*9H!pf4x(QYi^Ygt2-uxt?h9)=#
z+5G6D<=h5^bh=#{{jX2Xe1E1vCmy#DTqCQxOlIWmMF&_{FjABLY3aEZppcmz-x8%E
zQ7S387Ba#R>EIRD6Kd=9uNY7-N(?%z71t~lS*3dW?0d{WpfS<TI@l7^?7E8)+)9n(
zhp)+fa`^0#vvZWKXXgBIPLv}r`Sp3H4=`=F=bq>)Ua4}EuJyNv7kp-2$p2$GpR-`r
zr}LKO#Fzi`+-0WrSL0`WwlibaCF}dME?4riK5x{v9@K|g25#o|<{VuT&b{)Q%C^F_
zN}Sm$oEg2?5<>sI#bCF!Y_`{elXq`1_Hf5d<6elW;0oh<dGd~9;p8`@)0X-0B2d?&
zaWgfefYfezO#t)?x6EGK65wXtW5C}D_ga8+L56D3rd6~sYm5W;8GDg~G4B1Ev5)N!
z;9p9k4rPYoHXD+N^~@sc_<5ze<F=dd^V8^o@3R$4Z`>vw|DB{el0Y>r5j#~>b8}|P
z%R3)ZjpHDHV~LhavhOGLV;%LDfiWT@Q^&|2@(&DQ3E79KR9p|K0tIaYWaI~MgfIa<
zv`Yz)3W<Pkts9cyh}j_><x3;?U$196@+|`x%+aVLQ99*9jYDQsZ@EUb2flMErI{S~
zX0>X!+!;ijj`;hQfsW-wx&K!#dB-NA6cYd(i$)>8ZJom57aQ4mn54ghyu}>GB8SE0
zb0}y;17(AO;2^-ywS-=J#4lY|7buDFoy$IC(+~2+%a4jB?xi-E4H%8QB0O4N%|<{8
z5{p;l70EDG$)$3>>E&-j;~U@|XbhGB(h<)L)W4?mRZO5q<myk;xy3v5`}!jE$6XQn
zkIGk?_gJSJbWl11;`5!Mm>ai9QmE-@d{j%=?J(z5<^^SRhDsidwIhjjs>Rx|r-XL~
zTiT@;W~>jsS7(UyG_+HAh5A>8tne0DKa-G6h473!Od?J+-H7EArU2K%EcjfJU6$5_
z3xhGN7boYnE6TBiA6)S+6P<cqBF}`22bUAou~Yz`X0fsqT<Z7+<bfQRoKp--F*OKQ
z0+s@Fi5!<ia+gd5<14>l0_)+l*4YL5tFcUI!54(C(ke9a8_@a*eWjRRoO9nt?nf4q
z1-kkq6CsKZdQ^P8{@gWe>?)v-n;Yj5+6`vAhxz{8NdA@8Nx}hx!D~lyDY+M2Kgjzm
zq5vZ9fduIu_K!-qvUU~27JR{L3O)<Yi@}mBYTPKuXV;o}TBy_Ir(r!Z=$rxEsD4XH
zL61B`Rr(N*G=U9<534lZR;Y{4PXiG-h*VEz3+D>IW9F^X+Q~3+$?j?HW|%`=Z07ts
zP^ghcXn7eHZZHPs3P<^?MR!!RCrsj14f7Y)Tc(cVoiGQW(c%)e>=b{Z_>C!>PfJ(8
zdLv!|g8cPZhTV8kNZ9Z$!xq=`=QirF>)u$xZb;(OHZ8}le$!oc!&Tn68Bm|ly7`bO
zn*3(;lx<~B<_^i2KNv^o#s@;-n{`YPzWm^ePmfcIX=^8p7emW}Rt&8IUKt9ZhicF>
z3g6cdV{aI=B&kaDBmf<<tmhcCCTI|GkDJ$;z6!)o_J%fIzNInc?I!rLzewoYZQuoR
z4z_}jT>Of+lYaQ>AAkmHMt8zI-#pEq+Y%ip4hIG2mfI|wKO}ToK4$0b><4uS?(K`v
zQ|ZToh9($q0@Z`y%?Kw0%rs;O_OgXcV8sxoEq~E^mo3}DpDy2p>zc4FX9`@g;?-&e
z;j$RMVcQzk+RtCzmX4je;u>^9f5jmgq>r#;hmM)DP760-H+;hHAar}4(6%#_VJk25
zoz+FyscSxj7dif1%?7qw&Z}*^Vyoo}O>iNh)d?;(eg&okrU1|ykj9^~ealvx`D3-K
z0`nop8XMnV`-Tqp0$)gRKh}l0SSgo0ieSvPm^aqtOu<)0v~62V=;l`beBC@9zKC9L
z0&*UfR5a*fx+SOdP2kn41^HXyG8Mhv3ab}I=&s)i3A^U9{sg|bVSB&~TC!iuI~!v8
zp@#doT7A2VSZg*<8{<K?0#}#NZKsbMnX!oWLVB3hgj%vhGW>dDCqKjhZ7H;iB8~RM
zNPQ8^vdDSlNH|BYn<bLfDfUp_LG2Wr6tG;LfV9^PSwGXRG_1=n_?dP&;NXqc%{xq6
zw`omVw_0jyv?iN&jyZXbXeW5%TN8LywKi>4iMHBQS!(eY3|?1>Cahd#skXvWXQ==a
z^=JZ(Z#Pv`RBZ){=*;59B_?Zy#jK4-k;3YqTS3)qDKXVn*lLys`}E)1{8qKqhFoi<
ztx79KT4{MpyS1vS+H9>f*(`qIoak_6Rb`!}8g)`qQam&C(7@qVO9h4pGYr<gjs1?@
z7{Ypw7i3FnqOJASRW^&LBTZ)9ju>}=r4nK&)k0v>w6(jcDlMWq+RWTqW`)%-Yip(D
zsVwDB-dN4i&(A?rGEakz`Imz*RzSnIbGVO%6CR8-z?Vm%mwOuE_X_>^s9!b_U+SEQ
z1)D$S;5Q@84m6Gp47@)K|IxVz|JECj2cIAG@VvNfBK{n67kM7OkmQFU;Pdr<cn%PL
z2XEoy3V_=t;mcWq;;XAH=MG`u4jF&`4nQe|h$b1v3uN%-#K^o4a-=bb-8jOrKll+G
z?+iq1ULc0>bO7!|{}{vHI`Ihxo*!@!U7!@9q!jS~0G=66_A0&;iM+=+<1FrRmY4Sg
zj)(Q5I8O=AL&o__=J52518MBx_&`w5(}VL!J*MNOd;R#V;RyZ1GkHc5)yEMN(<>%}
z&kuMc9pnJ^8h9F*Am(QP{7<kgTK1XqbM!=xhbW0n0RH*x4Nel9z~LsK#{mQ<J|f2t
zz)+mFcyK0w@hG0))lUcJhz9WdNw$6FJgmRY@wj?|qlp~<E%L_dnGol<VG~%eE&luZ
zgr$3Yu_k(z(B$Bh-inARqf~O<VmVpPV+*=xa+Dr>tYl6yE`sMX!1)z_F(AKqCWQKY
z=KQVsG;l-x9`J)pEj}E^J&q>H`RP1k72v|~6MSwURTAm^Gt78l!TZNoW+dP(IwHp_
zISKs85Fqu%NG1PX<TdiFNkDK<3BkvBd=6gA$Qd64@YFw%^enGF9Vu=vo}}Yv8zm-g
zyI04b!%YrI6q58jwx13pgT4@;u09U{wQ(_V{^JM@GWbZAe;iPFj*e(Ri9gN2BZ6oA
zgZlfVM^g4!cus(~5QxHIf+K|h+g}4P|EI{Isc{Q1Hy?nx`2c$GJihlkAUp&3&4>8c
zANbK>yf}i)1mK^w#Q(G+@MRr>aU=pSl7I(!03h6dFA|v(fq$suNrA+_9RvmAlP~`N
zJDBrD%BOPEh2DPis=$gz@U<WNNyZDzilCBL&J+4-vro)3LK=Oo?Q!~Q_&hgcjniqi
gT^v)Od!Gs8-c9hU%BJ_+DNG5wdGM1wJ)>d%59^=*t^fc4

delta 17082
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

diff --git a/assets-fx/bin/lvl_1_2.png b/assets-fx/bin/lvl_1_2.png
new file mode 100644
index 0000000000000000000000000000000000000000..d313442a24cb2bdad4bf03b4e2b8f0b3ae5a5931
GIT binary patch
literal 3018
zcmb`J339_A3`HSM>o_yH{}p?TYF`X^i<xQYL(-R^pyuyWYw>XdEH9I*RbiS+t&@%t
z;TDUgq&x~RZ|z5`fqBdAh*}aj1-~rMF+UeT%3CL$t?b5Prq-gSjzvtTEQ8vtw8Cmn
zURX;fw|O4drjDBe>Qp4D@LmjD4)kQV=|NEfU;$Qv5ukv%H3BA0!mbwbbS<*TZVBR5
z*4o(Zj78rD#RSmZ(344EMRbz#3CJ`18YELEPqw6kKL#bbWi_VVq<yzV`ygJI1d;@%
z<I;;LJXnpj39hMW!~VWD&ky@aK;2(fAP-(09y$|c7+%=Twl2CjMF9ZqAY`$Af^Obj
z7}S$2>bZh(o~{LYfR~e?Ei?&0ZG#Hj&~CvbR@=7qSk6ub;}|_B@yLI^5aySmR}P2C
z>5PH({1Bm;9svk*w-%}!;n&0Pl1D=^%c8Xrp8Vig`t<Z|p~(&Zqrd`o=2{W(=Q5y@
z3Bb-AU}p}PK!$&pgM|$UMVI(Jvv?B(mjv;d7I>L15uYhq+(w|D3_=1-3Pc$^3tX3b
MVSd}VTRIl{50yv^FaQ7m

literal 0
HcmV?d00001

diff --git a/include/level.h b/include/level.h
index 14323ec..cc37830 100644
--- a/include/level.h
+++ b/include/level.h
@@ -7,12 +7,12 @@
 
 typedef struct 
 {
-	uint16_t width; 
-	uint16_t height;
+	uint8_t width; 
+	uint8_t height;
 	uint8_t data[]; // rough data
 } packed_level_t;
 
-void unpack_level(packed_level_t const * const packed_level_t);
+//void unpack_level(packed_level_t const * const packed_level_t);
 
 
 void set_level(int w, int l); // Configures the level
diff --git a/include/world.h b/include/world.h
index b1bf89b..22ae31a 100755
--- a/include/world.h
+++ b/include/world.h
@@ -103,7 +103,7 @@ cell_t* world_get(int x, int y);
 
 void display_cell(int cx, int cy, int sx, int sy, int plan);
 
-void world_set(cell_t * w);
+void world_set(int w, int h, int x, int y, cell_t const * a);
 
 void world_draw();
 void world_move();
diff --git a/levelconverter/1-2.png.c b/levelconverter/1-2.png.c
deleted file mode 100644
index 85b525529dfb166c077df03bb9d14110f90520f0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3989
zcmb_f+iuf95M4JwN+kZlyrq&+y-o<Osy+k}@jxL6(Mkv*t58!#GLA%|3K8Xh`XBu<
zW-qh56R#7e*iz%1nKNh3uI+Kk?(f*MAYk@r0jxe>d>LOv@t=6Gj>1Eu9Rw!BolK|0
zf}n#3b3rQ^>@WKufb+JMq8m7Gqcu?@0(*fcN?z4GegM$+Hk)>h?MlX^su@gqGCH+a
zrpBAG#+2G471)#}v~IWF8xpq)Ac^Uw8t<xsn?o=at#cr&G=L0X6sQA2z|blJMp_D6
zHK&g^ql1b@fO{*WH$~eggU^PnaR9DHJ~9Lt6P~7O2lQk1-#~Zr^r0ED@y!5pX;e+2
zolX5TGZW>sqzGpxNSlNlofJ7VZ46G$?HDnS1DcbK4urIcd+gAht!dkvvuxUuB8RrW
z16u(*N`QQ4=?H9yxZ%}-XNf4NeayDLjI^#exdH%i?#Yaqf`Vpeq5{a28DwsN`aa$a
zOfGAOfT~d<0N!dG*hF;+Mq*>xChpqV;h??-_enG8<#WpH&ET`6%JlBk1Eps-5ncgJ
z0F+r;6$Ca3UmJr%{hY`e`UFvgt|f8L4^=Bat+DD72u-{pAt2r~K_GzmdoU16MgZ1q
z0bM0U4o$SyhyB$Gfi1vU4s(BNGt<N~d2wt(v7vc}twVFi0fPx(+q&aGWNc0XWGbMM
z1_~jNhyvRMZp(H-cQyI&COe;8PR`-K3C`nW9kmongjPt!n#Km6+F{Hqdc!z|SlgT8
zZgFpY+MAWLWme?3dC@O!i=)$CFE7jd*DPCx>Px<ezkWMg^`5?+PT#*C_mj~u3i&7s
zU+|;IM$_069h@X?^xbs&ahzTDhiU2yzl?p#X-vr4MVk1yCyCDm=R-n98=Q~)^pwzb
zN1nX$Eap?64}`kd6tW?FF!K54bW7j@s9j!UH^uz>Rgo=bfAcfW^@YJp(8n*axI)Lr
d;qyG4l-J?>XLysB`R}V`ejP6IAIsUi{0F$~6QBS9

diff --git a/levelconverter/1-2.png.packlvl b/levelconverter/1-2.png.packlvl
deleted file mode 100644
index 5fb0d46b471e45e9a7836c21605abc4223ac4051..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3519
zcmb_fOHRWu5Vad1-EfB<po^sK1(4{jVnvZyaSf!Z_u(E~jPZEBiIXNJk*IloZ{CcJ
zJt^V$Cp^a(^jQF0-p`*e=WX-d?62F+TD)TvrZr4eg%~S-f(45(oFDTrfN^Z4Tn&t4
zvMFxPU>11F_BrP94nXB~lh#spj}fZRFjZiPn#By%CZ&b!_K+vK)=pN}!?m$+)PO~S
zk`lfZ1BW9iv#eTS6aioWv%wHZ1|sVjh&39ko5@pTXfn$jut%9|%d$BP-wlj0fLDW8
z#sMj!kTmZAU9*1!%2deX8MpD%K(I3JmeI|mWtsFu?3NyJ?*wZhuyuN5WK<Xo)5{UF
zLIs|~M5|;i^M!Ier!h;{W|r+!dSqntE6@noQ3vpyMKiD=>A>fQM?@YBUbE4c5&5RU
z8UWzFhm3T=B-5Ul0V|PVWd{uBDKgNxv>XTeg*pSMZJ+`r`b!Xt&a!3RmUE+m;TYa0
zQusfg3Dd(+Dkq20?hJ$Mr<(|`fGGgNRMrPkN%(a#Skpbh7=MF2;;K<N^CQRNrxw;<
zf|I2;Buu0?O^gYopSwYF5(8MX0>4U+j4Y+5N58eg#0W6U3HG~okR*l9%WVsSMOJ9G
zMrPYVfDWK(Z97PeatK(N0U-hzF+k*jW`Se5ET}KXx7V-J@#A=c|0deD*<H5_P3@A`
Z#+yx@+ZSRFP22N3G!4uxy(xB!{{U|xq&WZp

diff --git a/levelconverter/1-2.png b/levelconverter/1_2.png
similarity index 100%
rename from levelconverter/1-2.png
rename to levelconverter/1_2.png
diff --git a/levelconverter/levelconv.py b/levelconverter/levelconv.py
index 3ff8808..02c55da 100644
--- a/levelconverter/levelconv.py
+++ b/levelconverter/levelconv.py
@@ -28,18 +28,22 @@ def color_compare(color1, color2):
 		return 0
 
 def write_char(val):
-	return '%c' % int(val%256)
+	a = val%256
+	return a.to_bytes(1,'little')
+	#if a>128:
+	#	a -= 256
+	# return chr(a)
+	# return '%c' % int(val%256)
 
 # Load image
 filename = input("File name ?\n> ")
 img = Image.open(filename)
-print("Converting", filename, "to", "\"" + filename + ".c\",", "size =", img.size)
+print("Converting " + filename + " to assets-fx/" + filename + " //size =", img.size)
 
 #rough binary
-code = write_char(img.size[0] - img.size[0]%256)
-code += write_char(img.size[0]%256)
-code += write_char((img.size[1] - img.size[1]%256)/256)
-code += write_char(img.size[1]%256)
+# code = str().encode('latin1')
+code = write_char(int(img.size[0]))
+code += write_char(int(img.size[1]))
 
 
 
@@ -79,52 +83,11 @@ for x in range(0,img.size[0]):
 
 		elif color_compare(pixels[x,y],tuyau_bout):
 			code += write_char(8)
+
 		elif color_compare(pixels[x,y], tuyau_milieu):
-			left=0
-			right=0
-			up=0 # vide par defaut
-			down=0
-			tx=0
-			ty=0
-			if x:
-				left = (color_compare(pixels[x-1,y], tuyau_bout)) or (color_compare(pixels[x-1,y], tuyau_milieu))
-			if x != img.size[0]-1:
-				right = (color_compare(pixels[x+1,y], tuyau_bout)) or (color_compare(pixels[x+1,y], tuyau_milieu))
-
-			if y:
-				up = (color_compare(pixels[x,y-1], tuyau_bout)) or (color_compare(pixels[x,y-1], tuyau_milieu))
-			if y != img.size[1]-1:
-				down = (color_compare(pixels[x,y+1], tuyau_bout)) or (color_compare(pixels[x,y+1], tuyau_milieu))
-
-			if right and left==0:
-				tx=0
-				ty=3
-			elif left and right==0:
-				tx=1
-				ty=3
-			elif up==0 and down:
-				tx=1
-				ty=0
-			elif up and down==0:
-				tx=1
-				ty=1
-			hexa="0x"+str(tx)+str(ty)
-			code += "{TUYAU,"+hexa+"}, "
+			code += write_char(9)
 		elif color_compare(pixels[x,y], drapeau):
-			if not color_compare(pixels[x,y-1], drapeau):
-				code += "{END_LEVEL,0x1400}, "
-			elif not color_compare(pixels[x,y-2], drapeau):
-				code+= "{END_LEVEL,0x1401}, "
-			elif not color_compare(pixels[x,y-3], drapeau):
-				code+= "{END_LEVEL,0x1302}, "
-			elif not color_compare(pixels[x,y-4], drapeau):
-				code+= "{END_LEVEL,0x1202}, "
-			elif not color_compare(pixels[x,y-5], drapeau):
-				code+= "{END_LEVEL,0x1202}, "
-			elif not color_compare(pixels[x,y-6], drapeau):
-				code+= "{END_LEVEL,0x1202}, "
-			else:
-				code+= "{END_LEVEL,0x1102},"
+			code += write_char(10) # temporary code+= "{END_LEVEL,0x1102},"
 		else:
 			code += write_char(0)
 			#code += str(pixels[x,y])
@@ -138,10 +101,8 @@ for x in range(0,img.size[0]):
 			ennemis += "\n	KOOPA_R(" + str(8*x) + ", " + str(8*i) + ", -1),"
 ennemis += "\n};\nennemis_global_size=" + str(nombre_ennemis) + ";\ninit_ennemies(ennemies0);\n"
 
-#f = open(filename+".packlvl", 'w')
-#f.write(code)
-#f.close()
+f = open("../assets-fx/bin/lvl_"+filename, 'wb')
+f.write(code)
+f.close()
 
-build(bytes(code, 'utf-8'), filename+".o", "_lvl_"+filename.replace(".png",""))
-
-print("Converted succesfully !")
\ No newline at end of file
+print("Converted succesfully ! (", os.path.getsize("../assets-fx/bin/lvl_"+filename), "bytes )")
diff --git a/src/config.c b/src/config.c
index 52b146d..432f1e1 100644
--- a/src/config.c
+++ b/src/config.c
@@ -24,6 +24,7 @@ void configmenu()
 		
 		dtext(40,9,&loglevels[ll_get_level()][0],C_BLACK,C_NONE);
 		dupdate();
+		ll_pause();
 		int key=mkb_getkey();
 		if (key==KEY_EXIT)
 			break;
diff --git a/src/keyboard.c b/src/keyboard.c
index d4e4834..9128ddb 100755
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -6,6 +6,7 @@
 //#include <gint/timer.h>
 #include <gint/clock.h>
 #include <config.h>
+#include <liblog.h>
 
 static mkb_t keys[6]={0};
 
@@ -30,6 +31,8 @@ int mkb_getkey()
 	while (1)
 	{
 		key_event_t const e=pollevent();
+		if (e.key==KEY_ARROW)
+			ll_pause();
 		if (e.type==KEYEV_DOWN) // Returns only whan a key is down
 			return e.key;
 		else
@@ -119,7 +122,7 @@ void mkb_update()
 {
 	key_event_t e;
 	e=pollevent();
-	int menu=0;
+	int menu=0, log=0;
 	for (int i=0; i<6; i++)
 		if (keys[i]==2) keys[i]=1;
 	while(e.type!=KEYEV_NONE)
@@ -145,7 +148,8 @@ void mkb_update()
 		if(keydown(KEY_EXIT))
 			menu=1; // Displays menu after updating the keyboard
 
-
+		if (e.key==KEY_ARROW)
+			log=1;
 
 		if (k!=MK_NONE)
 		{
@@ -167,6 +171,8 @@ void mkb_update()
 			finish_level=-1; // Exits the level
 		return;
 	}
+	if (log)
+		ll_pause();
 }
 
 
diff --git a/src/level.c b/src/level.c
index 585073b..515a2ac 100644
--- a/src/level.c
+++ b/src/level.c
@@ -13,6 +13,7 @@
 #include <gint/timer.h>
 #include <gint/std/string.h>
 #include <gint/std/stdio.h>
+#include <liblog.h>
 
 #define PACKED_EMPTY 0
 #define PACKED_STONE 1
@@ -26,6 +27,8 @@
 #define PACKED_TUYAU_BOUT 8
 #define PACKED_TUYAU_MIDDLE 9
 
+#define PACKED_FLAG 10
+
 void malloc_error()
 {
 	extern image_t img_ram;
@@ -36,37 +39,61 @@ void malloc_error()
 		mkb_getkey();
 }
 
-static uint8_t pack_access(packed_level_t const * const p, int x, int y)
+static uint8_t pack_access(packed_level_t const * const p, unsigned int x, unsigned int y)
 {
-	if  (0<=x && x<w && 0<=y && y<h)
+	if  (x<p->width && y<p->height)
+	{
+		ll_sendp(LEVEL_INFO, "\n[i]pack access at %d,%d",x,y);
 		return p->data[x*p->height+y];
+	}
 	else
+	{
+		ll_sendp(LEVEL_WARNING, "\n[w]pack access out of range at %d,%d",x,y);
 		return PACKED_EMPTY;
+	}
 }
 
-static void cell_set(cell_t *const array, int w, int h, int x, int y, cell_t const cell)
+static void cell_set(cell_t *const array, unsigned int w, unsigned int h, unsigned int x, unsigned int y, cell_t const cell)
 {
-	if  (0<=x && x<w && 0<=y && y<h)
-		array[x*w+y] = cell;
+	if  (x<w && y<h)
+		array[x*h+y] = cell;
 }
 
 
-void unpack_level(packed_level_t const * const p)
+static void unpack_level(packed_level_t * p)
 {
-	const unsigned int w = p->width;
-	const unsigned int h = p->height;
+	unsigned int w = p->width;
+	unsigned int h = p->height;
+
+	ll_sendp(LEVEL_INFO, "\nUnpacking level %dx%d", w,h);
 
 	cell_t * c = (cell_t *) malloc(sizeof(cell_t) * w * h);
+	ll_sendp(LEVEL_INFO, "\n[i]malloc %d", sizeof(cell_t) * w * h);
 	if (c==0)
-		malloc_error();
+	{ // overriding parameters
+
+		w = 232;//p->width;
+		h = 13;//p->height;
+		ll_sendp(LEVEL_CRITICAL, "\n[e]malloc failed !\n[i]Trying defaults:\n %dx%d", w,h);
+		ll_sendp(LEVEL_WARNING, "\n[w]writing into pack new coordinates:\n %dx%d", w,h);
+
+		p->width=w;
+		p->height=h;
+
+		cell_t * c = (cell_t *) malloc(sizeof(cell_t) * w * h);
+		if (c==0)
+			malloc_error();
+	}
+
+	ll_set_level(LEVEL_WARNING);
 
 	int sx=0, sy=p->height; // Mario start coords
-
-	for (int x=0; x<w; x++)
+	ll_sendp(LEVEL_INFO, "\n[i]Converting...", w,h);
+	for (unsigned int x=0; x<w; x++)
 	{
-		for (int y=0; y<h; y++)
+		for (unsigned int y=0; y<h; y++)
 		{
-			int contents = pack_access(p,x,y);
+			unsigned int contents = pack_access(p,x,y);
 			cell_t cell = {0,0};
 			if (contents==PACKED_EMPTY)
 			{
@@ -125,52 +152,134 @@ void unpack_level(packed_level_t const * const p)
 			}
 			else if (contents==PACKED_TUYAU_BOUT)
 			{
-				int x=0, y=0;
+				int px=0, py=0;
 				int props=0;
 
 				{ // haut du tuyau horizontal
 					if (pack_access(p,x-1,y)==PACKED_TUYAU_BOUT)
 					{
-						x=1;
+						px=1;
 						if (pack_access(p,x,y-1)==PACKED_TUYAU_MIDDLE)
-							y=2;
+							py=2;
 						if (pack_access(p,x,y+1)==PACKED_TUYAU_MIDDLE)
-							y=4;
+							py=4;
 					}
 					if (pack_access(p,x+1,y)==PACKED_TUYAU_BOUT)
 					{
-						x=0;
+						px=0;
 						if (pack_access(p,x,y-1)==PACKED_TUYAU_MIDDLE)
-							y=2;
+							py=2;
 						if (pack_access(p,x,y+1)==PACKED_TUYAU_MIDDLE)
-							y=4;
+							py=4;
 					}
 				}
 
 				{ // bout de tuyau vertical
 					if (pack_access(p,x,y-1)==PACKED_TUYAU_BOUT)
 					{
-						y=0;
+						py=0;
 						if (pack_access(p,x+1,y)==PACKED_TUYAU_MIDDLE)
-							x=0;
+							px=0;
 						if (pack_access(p,x-1,y)==PACKED_TUYAU_MIDDLE)
-							x=2;
+							px=2;
 					}
 					if (pack_access(p,x,y+1)==PACKED_TUYAU_BOUT)
 					{
-						y=1;
+						py=1;
 						if (pack_access(p,x+1,y)==PACKED_TUYAU_MIDDLE)
-							x=0;
+							px=0;
 						if (pack_access(p,x-1,y)==PACKED_TUYAU_MIDDLE)
-							x=2;
+							px=2;
 					}
 				}
-
-				props=16*x+y;
+				props=16*px+py;
 				cell_t t={TUYAU,props};
 				cell = t;
 			}
+			else if (contents==PACKED_TUYAU_MIDDLE)
+			{
+				int px=0, py=0;
+				int props=0;
+
+				if (/*pack_access(p,x-1,y)==PACKED_TUYAU_MIDDLE && */pack_access(p,x+1,y)!=PACKED_TUYAU_MIDDLE)
+				{
+					if (pack_access(p,x+1,y)==PACKED_TUYAU_BOUT)
+					{
+						px=1;
+						if (pack_access(p,x,y+1)!=PACKED_TUYAU_MIDDLE)
+							py=0;
+						else
+							py=1;
+					}
+					else
+					{
+						px=1;
+						py=3;
+					}
+				}
+
+				if (/*pack_access(p,x+1,y)==PACKED_TUYAU_MIDDLE && */pack_access(p,x-1,y)!=PACKED_TUYAU_MIDDLE)
+				{
+					if (pack_access(p,x-1,y)==PACKED_TUYAU_BOUT)
+					{
+						px=1;
+						if (pack_access(p,x,y+1)!=PACKED_TUYAU_MIDDLE)
+							py=0;
+						else
+							py=1;
+					}
+					else
+					{
+						px=0;
+						py=3;
+					}
+				}
+
+				props=16*px+py;
+				cell_t t={TUYAU,props};
+				cell = t;
+			}
+			else if (contents==PACKED_FLAG)
+			{
+				int props=0;
+				if (pack_access(p,x,y-1)!=PACKED_FLAG)
+					props=0x1400;
+				else if (pack_access(p,x,y-2)!=PACKED_FLAG)
+					props=0x1401;
+				else if (pack_access(p,x,y-3)!=PACKED_FLAG)
+					props=0x1302;
+				else if (pack_access(p,x,y-4)!=PACKED_FLAG)
+					props=0x1302;
+				else if (pack_access(p,x,y-5)!=PACKED_FLAG)
+					props=0x1202;
+				else if (pack_access(p,x,y-6)!=PACKED_FLAG)
+					props=0x1202;
+				else
+					props=0x1102;
+				cell_t t={END_LEVEL,props};
+				cell = t;
+			}
+
+
+			ll_sendp(LEVEL_INFO, "\n[i]Converted cell %d,%d\n {%d,%p}\n[i]Writing cell...", x,y, cell.type, cell.data);
 			cell_set(c,w,h,x,y,cell);
+			ll_sendp(LEVEL_INFO, "\n[i]Wrote cell", x,y, cell.type, cell.data);
 		}
 	}
+	ll_sendp(LEVEL_INFO, "\n[i]Converted!\n[i]Sending to level zone...", w,h);
+	world_set(w, h, sx, sy, c);
+	ll_sendp(LEVEL_INFO, "\n[i]Achieved unpacking", w,h);
+	free(c);
+}
+
+void set_level(int w, int l)
+{
+	extern packed_level_t bin_lvl_1_2;
+	unpack_level(&bin_lvl_1_2);
+}
+
+void get_lvl_id(int w, int l, char * str)
+{
+	str[3]='\0';
+	sprintf(str, "%d-%d", w+1, l+1);
 }
\ No newline at end of file
diff --git a/src/world.c b/src/world.c
index c9e772b..7faff4f 100755
--- a/src/world.c
+++ b/src/world.c
@@ -219,7 +219,7 @@ void world_move()
 	
 }
 
-void init_level(int w, int h, int x, int y, cell_t const * a)
+void world_set(int w, int h, int x, int y, cell_t const * a)
 {
 	// Resets mario's vx
 	mario.p.vx=0; mario.p.vy=0;