From da998e0862b3172bb9de1974229ea801fa012641 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Heredero?= <remi@heredero.ch>
Date: Wed, 15 Jun 2022 09:23:49 +0200
Subject: [PATCH] some maps and fix turn, display and new sprite

---
 resources/Base_flipped.png          | Bin 0 -> 1434 bytes
 resources/Character_flipped.png     | Bin 0 -> 4281 bytes
 resources/map/21N2.tmx              |  13 ++----
 resources/map/21N205.tmx            |   2 +-
 resources/map/21N3.tmx              |  27 +++++------
 resources/map/21N304.tmx            |   2 +-
 resources/map/21N307.tmx            |   4 +-
 resources/map/21N308.tmx            |   2 +-
 resources/map/21RI.tmx              |   4 +-
 resources/map/21RS.tmx              |  16 +++----
 resources/map/23N1.tmx              |  28 ++++++------
 resources/map/Maps.tiled-session    |  67 ++++++++++++++--------------
 resources/map/SS.tmx                |  26 +++++------
 resources/map/assets/pokemon_v2.tsx |   6 +--
 resources/sprite_flipper.py         |  26 +++++++++++
 src/Entity/Character.java           |   4 +-
 src/Entity/Player.java              |  40 +++++++++++++----
 src/Main/PokeMudry.java             |   3 +-
 src/Screen/ScreenMap.java           |  39 ++++++++++++----
 src/Screen/ScreenPlayer.java        |   6 +--
 20 files changed, 188 insertions(+), 127 deletions(-)
 create mode 100644 resources/Base_flipped.png
 create mode 100644 resources/Character_flipped.png
 create mode 100644 resources/sprite_flipper.py

diff --git a/resources/Base_flipped.png b/resources/Base_flipped.png
new file mode 100644
index 0000000000000000000000000000000000000000..3123e12324ac1569c8bb636fbbf935838df9f0f6
GIT binary patch
literal 1434
zcmV;L1!ek)P)<h;3K|Lk000e1NJLTq004jh004jp00000=2boy000GHNkl<Zc%1E<
zTW=&O426#YMausF-<l{pz}bhoG|<@YB0EwvQ#?dnYCh~PZuWryclq0kJU{ZA&0XVD
zkBfj-6SjdBzI8xEAb?P7!7;GJHx7u%>E^Tr$G{rjy#ef`EE-thL-ReRp9cfP)5!f6
zA7(YD#W%3TzwW?qDvbm2>=?$Crq=kzff5k{5CURZF|fw>T_73ATCaEp*7!$lGBW@`
zV5YW`7zSS9Lk4m`fScBc_-_EhSDa3B*T5Rzxg$sgF{>+SDguBpt4r;5zIEVOs;KtB
zZa}f%@q&qi?dtI8jyhjUQ-xu{<Iklyv~QptQQRMb_5%<5$~1TQa~{@qQEc{t5cBpa
z$1q=N_sT4@rP$*|3P+pmg9!G{A@Y2&e+-_<EAaUPVs7!rb}Ym>x;WWTA3Xrhrh&&Z
z1Kj+o@)(Dw1FWC`+;;2PD3ddmnND+;Cl0%<f9*;LM3Rh{^Ocx?^BVuCwKp|7;1&{*
ziECTsRw9`gJO5e-BoqKB${YZY`O9eD=K=g;?w*I;@cc6^`kQ@?pS3dV1w8-iMnvWd
zrOQj0ETLUuqL1<3j8<HJ9xh)kD-r2;$-Df?<<<voec;vyew04Irw`Z465r|rXGl4V
zdVK?He6J6XB&p^1j)65k&8p5ziAQFk>H`b>!vQ`rcQwDY$|B$E1G|G-et&#a^??Px
zn+2H>h||2sH?YVr=>x`IaG4+V0Yaea1Ga%R{)#>jWLru_<}0DiZxp#V^z49yJ^iMp
z4;%(+3=<C=UL?diaj@41_RV^l-#-i>b7sKfdFTh7gM&U00hD=uk3IjVl72h<mcH|B
z=ERy$6xot^PO>WzsgMYuC}Ys(w>CB&O^(*Cgu4in=JQOr!P-vj@xX&`-q6eO04sS4
z5UXY9*(emR>jNZ^XJ5R?pCxx0dcPZr8gOkswAH3A*nHQ>f%Ff5p+0auy3~U5m(c%3
zpt#E)R&IUZ)(3v5J}}?UUe^aM@YD2sT6_abd>4>76Ud!kD|~vYVr);7VEEa@MZOa#
zfVds8Ya2e*tZSKX4y`f}Yk_ESmt$a&4?_)IvTzNo@vT0PV+j#oYM^WzSmek111J#n
z_&t?~qG!KLd_OJ)3F`F#*T51#ysz|T1#Uz}WHn~Ob$;xyPdiLaZ^d439A3)!{pf%j
zCBKU))Y|3)Vilyefj%HfS!y-ye+d5h)Lw$aO91QcrJ9_YM~jk*@Ev$Jsu<CbpeAC-
zFo#*0GLn;legGe;6_Y=%IB*^h0ANOfc1h@{lk_uen`b4q+Z)C-gtMnc0?8hzI!^*Q
z4)Q|p0JE3egW2%F;ROlf4;WW=%e)9O9Vy!66M!rdYSY5t0PRUw#ks`b@SE?_PL(U^
zxd7kIoA!|D&eHGllgh0R-1@*z(g#9YS2dvP18e*=jhX)d*T51#bKtk=09u7H9(ZLE
zTXin;O?qCptM?JpYr97+H7{G_`!2|WQX{5;<tqjj_%SyGtRG+*Smb*L!WUvF>h*os
zzyd!U-xE;{I=9pD2-Uz6KL`{^M$qdRSmXOcD-pcuhl2!7155lc2nC-S4uC*;Gw<El
zJRqAyqdQ>6=^_v#G4^<o1gUY*c}I;XkVze5c>jd@wa1Hq2tW;;#x=eHOO1U8-YLaQ
zPJJ~uRj3LHkTP{0@B<%SCS~wEPwl(w4P$m}Cip~h!~=`pHi4MCe=m4SPHmAX0s0&A
zc_2Q?h~qR2MIU40$|p9z<>#sI#;4z7s7%ZNn3H)1t@DCVNerDdI#8{~x8&ZG04!cW
o5_!x;E|zbI1acgy{3v<gKeKPmF+joGq5uE@07*qoM6N<$f+!!Sy8r+H

literal 0
HcmV?d00001

diff --git a/resources/Character_flipped.png b/resources/Character_flipped.png
new file mode 100644
index 0000000000000000000000000000000000000000..d545b0fe0704924da2aba35c538776edab8a5b89
GIT binary patch
literal 4281
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

literal 0
HcmV?d00001

diff --git a/resources/map/21N2.tmx b/resources/map/21N2.tmx
index 5ac007c..b5caf2d 100644
--- a/resources/map/21N2.tmx
+++ b/resources/map/21N2.tmx
@@ -90,7 +90,7 @@
  <objectgroup id="6" name="door">
   <object id="1" name="down" x="80.6667" y="177.667">
    <properties>
-    <property name="nextDirection" value="down"/>
+    <property name="nextDirection" value="DOWN"/>
     <property name="nextMap" value="21RS"/>
     <property name="nextX" type="int" value="5"/>
     <property name="nextY" type="int" value="16"/>
@@ -98,26 +98,19 @@
   </object>
   <object id="2" name="up" x="178" y="177.667">
    <properties>
-    <property name="nextDirection" value="down"/>
+    <property name="nextDirection" value="DOWN"/>
     <property name="nextMap" value="21N3"/>
     <property name="nextX" type="int" value="2"/>
     <property name="nextY" type="int" value="16"/>
    </properties>
   </object>
-  <object id="3" name="21N209" x="48.6667" y="369.333"/>
-  <object id="4" name="21N208" x="370" y="370"/>
-  <object id="5" name="WC" x="336" y="208"/>
-  <object id="6" name="WC" x="400.667" y="208.666"/>
-  <object id="7" name="21N203" x="688.667" y="207.333"/>
-  <object id="8" name="21N208" x="657.333" y="369.333"/>
   <object id="9" name="21N205" x="1039.67" y="368.75">
    <properties>
-    <property name="nextDirection" value=""/>
+    <property name="nextDirection" value="UP"/>
     <property name="nextMap" value="21N205"/>
     <property name="nextX" type="int" value="1"/>
     <property name="nextY" type="int" value="1"/>
    </properties>
   </object>
-  <object id="10" name="21N206" x="1008" y="529.333"/>
  </objectgroup>
 </map>
diff --git a/resources/map/21N205.tmx b/resources/map/21N205.tmx
index 3a3c0c4..a43bd5c 100644
--- a/resources/map/21N205.tmx
+++ b/resources/map/21N205.tmx
@@ -60,7 +60,7 @@
  <objectgroup id="7" name="door">
   <object id="1" x="49" y="433.5">
    <properties>
-    <property name="nextDirection" value=""/>
+    <property name="changeDirection" value="DOWN"/>
     <property name="nextMap" value="21N2"/>
     <property name="nextX" type="int" value="32"/>
     <property name="nextY" type="int" value="11"/>
diff --git a/resources/map/21N3.tmx b/resources/map/21N3.tmx
index 55955dd..816c777 100644
--- a/resources/map/21N3.tmx
+++ b/resources/map/21N3.tmx
@@ -78,16 +78,20 @@
  <objectgroup id="6" name="door">
   <object id="1" name="down" x="78" y="48.6667">
    <properties>
-    <property name="nextDirection" value="down"/>
+    <property name="nextDirection" value="DOWN"/>
     <property name="nextMap" value="21N2"/>
     <property name="nextX" type="int" value="5"/>
     <property name="nextY" type="int" value="16"/>
    </properties>
   </object>
-  <object id="2" name="up" x="175.333" y="48.6667"/>
+  <object id="2" name="up" x="175.333" y="48.6667">
+   <properties>
+    <property name="nextDirection" value="DOWN"/>
+   </properties>
+  </object>
   <object id="3" name="21N308" x="48.6667" y="241.333">
    <properties>
-    <property name="nextDirection" value=""/>
+    <property name="nextDirection" value="DOWN"/>
     <property name="nextMap" value="21N308"/>
     <property name="nextX" type="int" value="1"/>
     <property name="nextY" type="int" value="12"/>
@@ -95,25 +99,15 @@
   </object>
   <object id="4" name="21N307" x="370" y="242">
    <properties>
-    <property name="nextDirection" value=""/>
+    <property name="nextDirection" value="DOWN"/>
     <property name="nextMap" value="21N307"/>
     <property name="nextX" type="int" value="2"/>
     <property name="nextY" type="int" value="12"/>
    </properties>
   </object>
-  <object id="5" name="WC" x="336" y="80.0003"/>
-  <object id="6" name="WC" x="400.667" y="80.6663"/>
-  <object id="7" name="21N303" x="688.667" y="79.3333">
-   <properties>
-    <property name="nextDirection" value=""/>
-    <property name="nextMap" value="21N303"/>
-    <property name="nextX" type="int" value="0"/>
-    <property name="nextY" type="int" value="0"/>
-   </properties>
-  </object>
   <object id="8" name="21N307" x="657.333" y="241.333">
    <properties>
-    <property name="nextDirection" value=""/>
+    <property name="nextDirection" value="DOWN"/>
     <property name="nextMap" value="21N307"/>
     <property name="nextX" type="int" value="11"/>
     <property name="nextY" type="int" value="0"/>
@@ -121,12 +115,11 @@
   </object>
   <object id="9" name="21N304" x="1039.67" y="240.75">
    <properties>
-    <property name="nextDirection" value=""/>
+    <property name="nextDirection" value="UP"/>
     <property name="nextMap" value="21N304"/>
     <property name="nextX" type="int" value="1"/>
     <property name="nextY" type="int" value="1"/>
    </properties>
   </object>
-  <object id="10" name="21N305" x="1008" y="401.333"/>
  </objectgroup>
 </map>
diff --git a/resources/map/21N304.tmx b/resources/map/21N304.tmx
index cf7f5c4..7d02200 100644
--- a/resources/map/21N304.tmx
+++ b/resources/map/21N304.tmx
@@ -60,7 +60,7 @@
  <objectgroup id="7" name="door">
   <object id="1" x="49" y="433.5">
    <properties>
-    <property name="nextDirection" value=""/>
+    <property name="changeDirection" value="DOWN"/>
     <property name="nextMap" value="21N3"/>
     <property name="nextX" type="int" value="32"/>
     <property name="nextY" type="int" value="11"/>
diff --git a/resources/map/21N307.tmx b/resources/map/21N307.tmx
index ee19edb..6533d6c 100644
--- a/resources/map/21N307.tmx
+++ b/resources/map/21N307.tmx
@@ -60,7 +60,7 @@
  <objectgroup id="5" name="door">
   <object id="1" x="81.3333" y="14.6667">
    <properties>
-    <property name="nextDirection" value=""/>
+    <property name="changeDirection" value="UP"/>
     <property name="nextMap" value="21N3"/>
     <property name="nextX" type="int" value="11"/>
     <property name="nextY" type="int" value="7"/>
@@ -68,7 +68,7 @@
   </object>
   <object id="2" x="370.667" y="16">
    <properties>
-    <property name="nextDirection" value=""/>
+    <property name="changeDirection" value="UP"/>
     <property name="nextMap" value="21N307"/>
     <property name="nextX" type="int" value="20"/>
     <property name="nextY" type="int" value="7"/>
diff --git a/resources/map/21N308.tmx b/resources/map/21N308.tmx
index cada9bf..02ad206 100644
--- a/resources/map/21N308.tmx
+++ b/resources/map/21N308.tmx
@@ -78,7 +78,7 @@
  <objectgroup id="7" name="door">
   <object id="1" x="80.6667" y="16">
    <properties>
-    <property name="nextDirection" value=""/>
+    <property name="changeDirection" value="UP"/>
     <property name="nextMap" value="21N3"/>
     <property name="nextX" type="int" value="1"/>
     <property name="nextY" type="int" value="13"/>
diff --git a/resources/map/21RI.tmx b/resources/map/21RI.tmx
index 09f2636..37008ab 100644
--- a/resources/map/21RI.tmx
+++ b/resources/map/21RI.tmx
@@ -90,7 +90,7 @@
  <objectgroup id="6" name="door">
   <object id="1" name="down" x="80.6667" y="177.667">
    <properties>
-    <property name="nextDirection" value="down"/>
+    <property name="nextDirection" value="DOWN"/>
     <property name="nextMap" value="SS"/>
     <property name="nextX" type="int" value="5"/>
     <property name="nextY" type="int" value="20"/>
@@ -98,7 +98,7 @@
   </object>
   <object id="2" name="up" x="178" y="177.667">
    <properties>
-    <property name="nextDirection" value="down"/>
+    <property name="nextDirection" value="DOWN"/>
     <property name="nextMap" value="21RS"/>
     <property name="nextX" type="int" value="2"/>
     <property name="nextY" type="int" value="16"/>
diff --git a/resources/map/21RS.tmx b/resources/map/21RS.tmx
index e60edaa..2100be2 100644
--- a/resources/map/21RS.tmx
+++ b/resources/map/21RS.tmx
@@ -10,7 +10,7 @@
 1007,1007,1007,1007,1007,1007,1007,1007,1007,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,1007,1007,1007,1007,837,837,837,837,837,837,837,
 1007,1007,1007,1007,1007,1007,1007,1007,1007,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,1007,1007,1007,1007,837,837,837,837,837,837,837,
 1007,1007,1007,1007,1007,1007,1007,1007,1007,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,1007,1007,1007,1007,837,837,837,837,837,837,837,
-1007,1007,1007,1007,1007,1007,1007,1007,1007,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,1007,1007,1007,1007,837,837,837,837,837,837,837,
+1007,1007,1063,1007,1007,1063,1007,1007,1007,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,1007,1007,1007,1007,837,837,837,837,837,837,837,
 1063,1063,1063,1063,1063,1063,1063,1063,1063,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,1007,1007,1007,1007,837,837,837,837,837,837,837,
 1063,1063,1063,1063,1063,1063,1063,1063,1063,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,1031,1031,1031,1031,837,837,837,837,837,837,837,
 1063,1063,1063,1063,1063,1063,1063,1063,1063,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,
@@ -90,7 +90,7 @@
  <objectgroup id="6" name="door">
   <object id="1" name="down" x="80.6667" y="177.667">
    <properties>
-    <property name="nextDirection" value="down"/>
+    <property name="nextDirection" value="DOWN"/>
     <property name="nextMap" value="21RI"/>
     <property name="nextX" type="int" value="5"/>
     <property name="nextY" type="int" value="16"/>
@@ -98,7 +98,7 @@
   </object>
   <object id="2" name="up" x="178" y="177.667">
    <properties>
-    <property name="nextDirection" value="down"/>
+    <property name="nextDirection" value="DOWN"/>
     <property name="nextMap" value="21N2"/>
     <property name="nextX" type="int" value="2"/>
     <property name="nextY" type="int" value="16"/>
@@ -106,7 +106,7 @@
   </object>
   <object id="11" name="RI" x="1231.5" y="497.5">
    <properties>
-    <property name="nextDirection" value="down"/>
+    <property name="nextDirection" value="DOWN"/>
     <property name="nextMap" value="21RI"/>
     <property name="nextX" type="int" value="38"/>
     <property name="nextY" type="int" value="2"/>
@@ -114,16 +114,16 @@
   </object>
   <object id="12" name="out" x="1200.5" y="16.5">
    <properties>
-    <property name="nextDirection" value="down"/>
-    <property name="nextMap" value="21N1"/>
+    <property name="nextDirection" value="UP"/>
+    <property name="nextMap" value="RS"/>
     <property name="nextX" type="int" value="0"/>
     <property name="nextY" type="int" value="0"/>
    </properties>
   </object>
   <object id="13" name="out" x="1233" y="15.5">
    <properties>
-    <property name="nextDirection" value="down"/>
-    <property name="nextMap" value="21N1"/>
+    <property name="nextDirection" value="UP"/>
+    <property name="nextMap" value="RS"/>
     <property name="nextX" type="int" value="0"/>
     <property name="nextY" type="int" value="0"/>
    </properties>
diff --git a/resources/map/23N1.tmx b/resources/map/23N1.tmx
index 0cfbc23..3f40f0c 100644
--- a/resources/map/23N1.tmx
+++ b/resources/map/23N1.tmx
@@ -10,8 +10,8 @@
 21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,77,77,77,77,77,77,77,77,77,77,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,
 21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,77,77,77,77,77,77,77,77,77,77,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,
 21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,77,77,77,77,77,77,77,77,77,77,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,
-21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,77,77,77,77,77,77,77,77,77,77,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,
-21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,77,77,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,77,77,77,77,77,77,77,77,77,77,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,
+21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,77,21,21,77,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,77,77,77,77,77,77,77,77,77,77,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,
+21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,77,77,77,77,77,77,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,77,77,77,77,77,77,77,77,77,77,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,
 77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,
 77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,
 77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,
@@ -21,8 +21,8 @@
 21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,21,21,
 21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,21,21,
 21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,21,21,
-21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,77,77,77,77,77,77,77,77,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,
-21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,77,77,77,77,77,77,77,77,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,
+21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,77,77,77,77,77,77,77,77,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,77,77,77,77,77,77,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,
+21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,77,77,77,77,77,77,77,77,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,77,21,21,77,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,
 21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,77,77,77,77,77,77,77,77,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,
 21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,77,77,77,77,77,77,77,77,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,
 21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,77,77,77,77,77,77,77,77,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,
@@ -92,7 +92,7 @@
  <objectgroup id="5" name="door">
   <object id="1" name="up" x="878.5" y="210.5">
    <properties>
-    <property name="nextDirection" value=""/>
+    <property name="nextDirection" value="DOWN"/>
     <property name="nextMap" value=""/>
     <property name="nextX" type="int" value="0"/>
     <property name="nextY" type="int" value="0"/>
@@ -100,23 +100,23 @@
   </object>
   <object id="2" name="down" x="976" y="208.5">
    <properties>
-    <property name="nextDirection" value=""/>
-    <property name="nextMap" value=""/>
-    <property name="nextX" type="int" value="0"/>
-    <property name="nextY" type="int" value="0"/>
+    <property name="nextDirection" value="DOWN"/>
+    <property name="nextMap" value="SS"/>
+    <property name="nextX" type="int" value="81"/>
+    <property name="nextY" type="int" value="10"/>
    </properties>
   </object>
   <object id="3" name="down" x="2511" y="592.5">
    <properties>
-    <property name="nextDirection" value=""/>
-    <property name="nextMap" value=""/>
-    <property name="nextX" type="int" value="0"/>
-    <property name="nextY" type="int" value="0"/>
+    <property name="nextDirection" value="UP"/>
+    <property name="nextMap" value="SS"/>
+    <property name="nextX" type="int" value="133"/>
+    <property name="nextY" type="int" value="1"/>
    </properties>
   </object>
   <object id="4" name="up" x="2607" y="592">
    <properties>
-    <property name="nextDirection" value=""/>
+    <property name="nextDirection" value="UP"/>
     <property name="nextMap" value=""/>
     <property name="nextX" type="int" value="0"/>
     <property name="nextY" type="int" value="0"/>
diff --git a/resources/map/Maps.tiled-session b/resources/map/Maps.tiled-session
index 18cd08a..b163c3e 100644
--- a/resources/map/Maps.tiled-session
+++ b/resources/map/Maps.tiled-session
@@ -19,11 +19,11 @@
             "expandedObjectLayers": [
                 6
             ],
-            "scale": 1.5,
+            "scale": 0.75,
             "selectedLayer": 3,
             "viewCenter": {
-                "x": 254,
-                "y": 269
+                "x": 968.6666666666666,
+                "y": 588.6666666666666
             }
         },
         "21N205.tmx": {
@@ -33,8 +33,8 @@
             "scale": 2,
             "selectedLayer": 3,
             "viewCenter": {
-                "x": 80.5,
-                "y": 302.25
+                "x": 173.25,
+                "y": 328.75
             }
         },
         "21N3.tmx": {
@@ -42,10 +42,10 @@
                 6
             ],
             "scale": 1,
-            "selectedLayer": 0,
+            "selectedLayer": 3,
             "viewCenter": {
-                "x": 673,
-                "y": 358.5
+                "x": 697.5,
+                "y": 339.5
             }
         },
         "21N304.tmx": {
@@ -55,8 +55,8 @@
             "scale": 2.0908482142857143,
             "selectedLayer": 3,
             "viewCenter": {
-                "x": 122.43834738977259,
-                "y": 302.50880751574675
+                "x": 126.02540834845733,
+                "y": 270.94267107932103
             }
         },
         "21N307.tmx": {
@@ -64,10 +64,10 @@
                 5
             ],
             "scale": 1.5,
-            "selectedLayer": 0,
+            "selectedLayer": 3,
             "viewCenter": {
-                "x": 251.3333333333333,
-                "y": 237
+                "x": 173.66666666666666,
+                "y": 52.333333333333314
             }
         },
         "21N308.tmx": {
@@ -77,7 +77,7 @@
             "scale": 1.5,
             "selectedLayer": 4,
             "viewCenter": {
-                "x": 256.6666666666667,
+                "x": 257,
                 "y": 214.33333333333331
             }
         },
@@ -93,11 +93,11 @@
             "expandedObjectLayers": [
                 6
             ],
-            "scale": 1,
-            "selectedLayer": 1,
+            "scale": 0.75,
+            "selectedLayer": 3,
             "viewCenter": {
-                "x": 233,
-                "y": 318.5
+                "x": 772.6666666666666,
+                "y": 484.66666666666663
             }
         },
         "21RS.tmx": {
@@ -107,19 +107,19 @@
             "scale": 1,
             "selectedLayer": 3,
             "viewCenter": {
-                "x": 313,
-                "y": 380.5
+                "x": 933.5,
+                "y": 292.5
             }
         },
         "23N1.tmx": {
             "expandedObjectLayers": [
                 5
             ],
-            "scale": 2,
-            "selectedLayer": 3,
+            "scale": 1,
+            "selectedLayer": 0,
             "viewCenter": {
-                "x": 2511,
-                "y": 592.25
+                "x": 2131.5,
+                "y": 597.5
             }
         },
         "C:/Users/remi/AppData/Roaming/Tiled/#Tests": {
@@ -243,8 +243,8 @@
             "scale": 0.5,
             "selectedLayer": 3,
             "viewCenter": {
-                "x": 3098,
-                "y": 503
+                "x": 3567,
+                "y": 847
             }
         },
         "assets/32x32 first tileset.tsx": {
@@ -323,6 +323,7 @@
             "scaleInEditor": 1.5
         },
         "assets/pokemon_v2.tsx": {
+            "dynamicWrapping": false,
             "scaleInDock": 1.5,
             "scaleInEditor": 1
         },
@@ -434,18 +435,18 @@
     "project": "Maps.tiled-project",
     "property.type": "string",
     "recentFiles": [
+        "21N205.tmx",
+        "21RS.tmx",
+        "21N2.tmx",
+        "21N3.tmx",
+        "assets/pokemon_v2.tsx",
+        "assets/PokeMudry.tsx",
         "SS.tmx",
         "21RI.tmx",
         "23N1.tmx",
         "assets/Dungeon_v2.tsx",
-        "21RS.tmx",
-        "21N3.tmx",
         "21N307.tmx",
-        "21N308.tmx",
-        "21N205.tmx",
-        "21N2.tmx",
-        "21N304.tmx",
-        "assets/pokemon_v2.tsx"
+        "21N308.tmx"
     ],
     "resizeMap.removeObjects": true,
     "tileset.lastUsedFilter": "Fichiers de jeu de tuiles Tiled (*.tsx *.xml)",
diff --git a/resources/map/SS.tmx b/resources/map/SS.tmx
index 33193d0..20e70de 100644
--- a/resources/map/SS.tmx
+++ b/resources/map/SS.tmx
@@ -5,8 +5,8 @@
  <tileset firstgid="1215" source="assets/Slates_v2.tsx"/>
  <layer id="4" name="floor" width="166" height="22">
   <data encoding="csv">
-1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,
-586,586,1139,586,586,1139,586,586,586,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,
+1007,1007,1007,1007,1007,1139,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,
+586,586,1139,586,586,1139,586,586,586,1007,1063,1007,1007,1007,1007,1007,1063,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,
 1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,
 1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,
 1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,
@@ -15,8 +15,8 @@
 1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,
 1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,
 1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,
-1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,
-1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,586,586,586,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,
+1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1063,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,
+1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1007,1007,1007,1007,1063,1063,1007,1007,1007,1063,1007,1007,1063,1063,1007,586,586,586,1007,1063,1007,1007,1007,1007,1063,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1063,1007,1007,1007,1063,1007,1007,1007,1007,1063,1007,1007,1007,1007,1007,1007,1007,1007,1063,1063,1063,1007,1007,1063,1063,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1063,1063,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1063,1063,1007,1007,1007,1007,1007,1007,1007,1007,1007,1063,1063,1007,1007,1007,1007,1007,1007,1007,1007,1063,1063,1007,1007,1007,1007,1007,1063,1007,1007,1007,1007,1063,1063,1007,1007,1063,1063,1007,1007,1007,
 1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,
 1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,
 1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,
@@ -25,8 +25,8 @@
 1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,
 1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,
 1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,
-1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,
-1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007
+1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1063,1063,1063,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,
+1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1063,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007
 </data>
  </layer>
  <layer id="2" name="stairs" width="166" height="22">
@@ -90,24 +90,24 @@
   </properties>
   <object id="2" name="up" x="178" y="17.667">
    <properties>
-    <property name="nextDirection" value="down"/>
+    <property name="nextDirection" value="DOWN"/>
     <property name="nextMap" value="21RI"/>
     <property name="nextX" type="int" value="2"/>
     <property name="nextY" type="int" value="16"/>
    </properties>
   </object>
-  <object id="20" x="2607.33" y="336">
+  <object id="20" name="up" x="2607.33" y="336">
    <properties>
-    <property name="nextDirection" value="down"/>
-    <property name="nextMap" value="23RI"/>
+    <property name="nextDirection" value="DOWN"/>
+    <property name="nextMap" value="23N1"/>
     <property name="nextX" type="int" value="0"/>
     <property name="nextY" type="int" value="0"/>
    </properties>
   </object>
-  <object id="21" x="4271.33" y="686.667">
+  <object id="21" name="up" x="4271.33" y="686.667">
    <properties>
-    <property name="nextDirection" value="down"/>
-    <property name="nextMap" value="23RS"/>
+    <property name="nextDirection" value="UP"/>
+    <property name="nextMap" value="23N1"/>
     <property name="nextX" type="int" value="0"/>
     <property name="nextY" type="int" value="0"/>
    </properties>
diff --git a/resources/map/assets/pokemon_v2.tsx b/resources/map/assets/pokemon_v2.tsx
index 1d49493..8896164 100644
--- a/resources/map/assets/pokemon_v2.tsx
+++ b/resources/map/assets/pokemon_v2.tsx
@@ -4342,7 +4342,7 @@
  <tile id="723">
   <properties>
    <property name="speed" type="float" value="1"/>
-   <property name="walkable" type="bool" value="true"/>
+   <property name="walkable" type="bool" value="false"/>
   </properties>
  </tile>
  <tile id="724">
@@ -4360,7 +4360,7 @@
  <tile id="726">
   <properties>
    <property name="speed" type="float" value="1"/>
-   <property name="walkable" type="bool" value="true"/>
+   <property name="walkable" type="bool" value="false"/>
   </properties>
  </tile>
  <tile id="727">
@@ -4564,7 +4564,7 @@
  <tile id="760">
   <properties>
    <property name="speed" type="float" value="1"/>
-   <property name="walkable" type="bool" value="true"/>
+   <property name="walkable" type="bool" value="false"/>
   </properties>
  </tile>
  <tile id="761">
diff --git a/resources/sprite_flipper.py b/resources/sprite_flipper.py
new file mode 100644
index 0000000..a9ce606
--- /dev/null
+++ b/resources/sprite_flipper.py
@@ -0,0 +1,26 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+from PIL import Image
+import numpy as np
+import os
+
+W, H = 32, 32
+
+if __name__ == "__main__":
+    path = input("Path: ")
+    
+    img = Image.open(path).convert()
+    a = np.array(img)
+    b = np.zeros((a.shape[1], a.shape[0], *a.shape[2:]), dtype=a.dtype)
+    
+    w, h = a.shape[1]//W, a.shape[0]//H
+    
+    for y in range(h):
+        for x in range(w):
+            b[x*W:x*W+W,y*H:y*H+H] = a[y*H:y*H+H,x*W:x*W+W]
+
+    img.close()
+    img = Image.fromarray(b)
+    dirname, basename = os.path.dirname(path), os.path.basename(path)
+    basename, ext = os.path.splitext(basename)
+    img.save(os.path.join(dirname, basename+"_flipped"+ext))
diff --git a/src/Entity/Character.java b/src/Entity/Character.java
index d94aa6b..ffa1652 100644
--- a/src/Entity/Character.java
+++ b/src/Entity/Character.java
@@ -137,10 +137,10 @@ public abstract class Character extends Entity{
                 textureY = 2;
                 break;
             case LEFT:
-                textureY = 1;
+                textureY = 3;
                 break;
             case UP:
-                textureY = 3;
+                textureY = 1;
                 break;
             case DOWN:
                 textureY = 0;
diff --git a/src/Entity/Player.java b/src/Entity/Player.java
index 77ae101..74e07fe 100644
--- a/src/Entity/Player.java
+++ b/src/Entity/Player.java
@@ -17,7 +17,7 @@ public class Player extends Character{
 	public boolean onEnemy = false;
 
     public Player(int x, int y, String map) {
-        super("Player", x, y, "Character", map);
+        super("Player", x, y, "Character_flipped", map);
     }
 
     public void addXp(int xp){
@@ -26,6 +26,8 @@ public class Player extends Character{
 
     public void manageEntity(ScreenMap sm, Controller c) {
 
+		boolean onDoor = sm.isDoor(getPosition());
+
 		// Do nothing if hero is already moving
 		if (!isMoving()) {
 
@@ -34,19 +36,21 @@ public class Player extends Character{
 			Player.Direction goalDirection = Player.Direction.NULL;
 			Vector2 nextPos = new Vector2(position);
 
-			if (c.keyStatus.get(Input.Keys.RIGHT)) {
+
+
+			if (c.keyStatus.get(Input.Keys.RIGHT) && !onDoor) {
 				goalDirection = Player.Direction.RIGHT;
 				nextCell = sm.getTile(getPosition(), 1, 0);
 				nextPos.x+=sm.tileWidth;
-			} else if (c.keyStatus.get(Input.Keys.LEFT)) {
+			} else if (c.keyStatus.get(Input.Keys.LEFT) && !onDoor) {
 				goalDirection = Player.Direction.LEFT;
 				nextCell = sm.getTile(getPosition(), -1, 0);
 				nextPos.x-=sm.tileWidth;
-			} else if (c.keyStatus.get(Input.Keys.UP)) {
+			} else if (c.keyStatus.get(Input.Keys.UP) && !onDoor) {
 				goalDirection = Player.Direction.UP;
 				nextCell = sm.getTile(getPosition(), 0, 1);
 				nextPos.y+=sm.tileHeight;
-			} else if (c.keyStatus.get(Input.Keys.DOWN)) {
+			} else if (c.keyStatus.get(Input.Keys.DOWN) && !onDoor) {
 				goalDirection = Player.Direction.DOWN;
 				nextCell = sm.getTile(getPosition(), 0, -1);
 				nextPos.y-=sm.tileHeight;
@@ -59,7 +63,7 @@ public class Player extends Character{
 					turn(goalDirection);
 					System.out.println("It's a enemy !!");
 				} else {
-					setSpeed(sm.getSpeed(nextCell));
+					setSpeed(sm.getSpeed(nextCell)*3); //TODO remove x3
 					go(goalDirection);
 				}
 			} else {
@@ -68,7 +72,7 @@ public class Player extends Character{
 			}
 
 			
-			if(sm.isDoor(getPosition())){
+			if(onDoor){
 				String nMap = null;
 				Integer x = null;
 				Integer y = null;
@@ -77,12 +81,32 @@ public class Player extends Character{
 					x = ScreenMap.Door.nextX;
 					y = ScreenMap.Door.nextY;
 					goalDirection = ScreenMap.Door.nextDirection;
+					/*
+					if (ScreenMap.Door.changeDirection) {
+						switch (goalDirection) {
+							case UP:
+								goalDirection = Direction.DOWN;
+								System.out.println("go down");
+								break;
+
+							case DOWN:
+								goalDirection = Direction.UP;
+								System.out.println("go up");
+						
+							default:
+								goalDirection = Direction.NULL;
+								break;
+						}
+					}
+					*/
 				} catch (Exception e) { }
 				ScreenMap.Door.reset();
 				if (nMap == null || x == null || y == null) return;
 				map = nMap;
 				setPosition(x*sm.tileWidth, y*sm.tileHeight);
-				System.out.println("Go to: " + sm.map + " in " + x + " x " + y);
+				System.out.println(goalDirection);
+				turn(goalDirection);
+				System.out.println("Go to: " + map + " in " + x + " x " + y);
 			}
 		}
 	}
diff --git a/src/Main/PokeMudry.java b/src/Main/PokeMudry.java
index 1b4d60f..ddf24bc 100644
--- a/src/Main/PokeMudry.java
+++ b/src/Main/PokeMudry.java
@@ -46,7 +46,8 @@ public class PokeMudry extends PortableApplication {
         // add player, create and add all enemies in entities
 		entities.add((Entity) sp.p);
 		enemies.add(new Enemy("Mudry", 10, 15, "lumberjack_sheet32", "desert", 25, "informatique"));
-		//enemies.add(new Enemy("Pignat", 5, 1, "lumberjack_sheet32", "test", 150));
+		enemies.add(new Enemy("Mudry", 5, 11, "lumberjack_sheet32", "21N304", 25, "informatique"));
+		
         for (Enemy enemy : enemies) { entities.add(enemy); }
 
 		//Init all entities
diff --git a/src/Screen/ScreenMap.java b/src/Screen/ScreenMap.java
index 625b6c2..020029e 100644
--- a/src/Screen/ScreenMap.java
+++ b/src/Screen/ScreenMap.java
@@ -16,6 +16,7 @@ import com.badlogic.gdx.maps.tiled.TmxMapLoader;
 import com.badlogic.gdx.maps.tiled.renderers.OrthogonalTiledMapRenderer;
 import com.badlogic.gdx.math.Vector2;
 
+import Entity.Character;
 import Entity.Player;
 import ch.hevs.gdx2d.components.screen_management.RenderingScreen;
 import ch.hevs.gdx2d.lib.GdxGraphics;
@@ -52,15 +53,28 @@ public class ScreenMap extends RenderingScreen{
 		createMap("test");
 		createMap("test_couloir");
 		createMap("desert");
+
         createMap("SS");
+        //createMap("RI");
+        //createMap("RS");
+        
         createMap("21RI");
         createMap("21RS");
         createMap("21N2");
         createMap("21N3");
+        
         createMap("21N205");
         createMap("21N304");
         createMap("21N307");
         createMap("21N308");
+
+        //createMap("23RI");
+        //createMap("23RS");
+        createMap("23N1");
+        //createMap("23N2");
+        
+        //createMap("23N20");
+        //createMap("23N215");
         
 	}
 
@@ -69,11 +83,15 @@ public class ScreenMap extends RenderingScreen{
         
         tiledLayer.clear();
         
+        // Get actual map of the player
         try { map = player.getMap(); } catch (Exception e) {}
 
-		for (int i = 0; i < 50; i++) {
+		// Get all layers on the current map
+        for (int i = 0; i < 50; i++) {
             try { tiledLayer.add((TiledMapTileLayer) tMap.get(map).getLayers().get(i)); } catch (Exception e) { }
         }
+
+        // Get heigh and width of tiles and the size of the tiles
         TiledMapTileLayer tl = tiledLayer.get(0);
         width = tl.getWidth();
         tileWidth = (int) tl.getTileWidth();
@@ -82,14 +100,15 @@ public class ScreenMap extends RenderingScreen{
         
         //System.out.println(width + " x " + height + " - " + tileWidth + " x " + tileHeight);
         
-		try {
+		// Get all doors on the current map
+        try {
             doors = tMap.get(map).getLayers().get("door").getObjects();
 		} catch (Exception e) {	doors = null; }
         
 		
 		// Render the tileMap
-        //g.zoom(zoom);
-        g.moveCamera(player.getPosition().x, player.getPosition().y, width * tileWidth, height * tileHeight);
+        g.zoom(zoom);
+        g.moveCamera((int)player.getPosition().x, (int)player.getPosition().y, width * tileWidth, height * tileHeight);
 
 		tMapRenderer.get(map).setView(g.getCamera());
 		tMapRenderer.get(map).render();
@@ -116,10 +135,11 @@ public class ScreenMap extends RenderingScreen{
 
     public boolean isWalkable(Vector<TiledMapTile> tile) {
 		if (tile == null) return false;
-        boolean walkable = false;
+		if (tile.size() == 0) return false;
+        boolean walkable = true;
         for (TiledMapTile tiledMapTile : tile) {
             Object test = tiledMapTile.getProperties().get("walkable");
-            walkable = Boolean.parseBoolean(test.toString()) ? true:walkable;
+            walkable = Boolean.parseBoolean(test.toString()) ? walkable:false;
         }
         return walkable;
 	}
@@ -160,7 +180,8 @@ public class ScreenMap extends RenderingScreen{
 				try { Door.nextMap = mapProperties.get("nextMap").toString(); } catch (Exception e) { }
 				try { Door.nextX = Integer.parseInt(mapProperties.get("nextX").toString()); } catch (Exception e) { }
 				try { Door.nextY = Integer.parseInt(mapProperties.get("nextY").toString()); } catch (Exception e) { }
-				try { Door.nextDirection = Door.nextDirection.valueOf(mapProperties.get("nextDirection").toString()); } catch (Exception e) { }
+                try { Door.nextDirection = Character.Direction.valueOf(mapProperties.get("nextDirection").toString()); } catch (Exception e) { }
+				try { Door.changeDirection = Boolean.parseBoolean(mapProperties.get("changeDirection").toString()); } catch (Exception e) { }
 			}
         }
         
@@ -171,13 +192,15 @@ public class ScreenMap extends RenderingScreen{
 		public static String nextMap;
 		public static Integer nextX;
 		public static Integer nextY;
-        public static Player.Direction nextDirection;
+        public static Character.Direction nextDirection;
+        public static Boolean changeDirection;
 
 		public static void reset(){
 			nextMap = null;
 			nextX = null;
 			nextY = null;
             nextDirection = null;
+            changeDirection = null;
 		}
 	}
 
diff --git a/src/Screen/ScreenPlayer.java b/src/Screen/ScreenPlayer.java
index 04197ed..2090001 100644
--- a/src/Screen/ScreenPlayer.java
+++ b/src/Screen/ScreenPlayer.java
@@ -16,10 +16,10 @@ public class ScreenPlayer {
     public void init(){
 
         // One player by ScreenPlayer
-        p = new Player(8, 15, "desert");
-      //p = new Player(4, 2, "21RI");
+        //p = new Player(8, 15, "desert");
+        p = new Player(4, 2, "21RI");
 
-        b = new Battle(new Enemy("enemi", 0, 0, "charachter", "desert", 50, "enemi"));
+        b = new Battle(new Enemy("enemi", 0, 0, "lumberjack_sheet32", "desert", 50, "enemi"));
 
         // Create both type of screen and record for reuse
         screenManager.registerScreen(ScreenMap.class);