diff --git a/resources/map/21N1.tmx b/resources/map/21N1.tmx
new file mode 100644
index 0000000..413f4e7
--- /dev/null
+++ b/resources/map/21N1.tmx
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map version="1.8" tiledversion="1.8.5" orientation="orthogonal" renderorder="right-down" width="41" height="24" tilewidth="32" tileheight="32" infinite="0" nextlayerid="9" nextobjectid="11">
+ <tileset firstgid="1" source="assets/pokemon_v2.tsx"/>
+ <tileset firstgid="987" source="assets/Dungeon_v2.tsx"/>
+ <tileset firstgid="1215" source="assets/Slates_v2.tsx"/>
+ <layer id="4" name="floor" width="41" height="24">
+  <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,1228,1228,1228,1228,1228,1228,1228,1228,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,
+1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1228,1228,1228,1228,1228,1228,1228,1228,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,
+1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1228,1228,1228,1228,1228,1228,1228,1228,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,
+1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1228,1228,1228,1228,1228,1228,1228,1228,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,
+1007,1007,1228,1007,1007,1228,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1228,1228,1228,1228,1228,1228,1228,1228,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,
+1007,1007,1228,1007,1007,1228,1007,1007,1007,1007,1228,1007,1228,1007,1007,1007,1007,1007,1007,1007,1007,1228,1228,1228,1228,1228,1228,1228,1228,1228,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,
+1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,
+1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,
+1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,
+1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,
+1007,1228,1007,1007,1007,1007,1007,1007,1007,1007,1007,1228,1007,1007,1007,1007,1007,1007,1007,1007,1228,1007,1007,1228,1228,1228,1228,1228,1228,1228,1007,1007,1228,1007,1007,1007,1007,1007,1007,1007,1007,
+1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,
+1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,
+1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,
+1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,
+1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1228,1228,1228,1228,1228,1228,1228,1007,1228,1007,1007,1007,1007,1007,1007,1007,1007,1007,
+1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1228,1228,1228,1228,1228,1228,1228,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,
+1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1228,1228,1228,1228,1228,1228,1228,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,
+1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1228,1228,1228,1228,1228,1228,1228,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,
+1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1228,1228,1228,1228,1228,1228,1228,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,
+1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1228,1228,1228,1228,1228,1228,1228,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,
+1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1228,1228,1228,1228,1228,1228,1228,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,
+1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,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>
+ <imagelayer id="8" name="Calque d'Images 1" offsetx="-383.639" offsety="-0.00441463">
+  <image source="png/21N1.PNG" width="4164" height="1053"/>
+ </imagelayer>
+ <layer id="2" name="stairs" width="41" height="24">
+  <data encoding="csv">
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,3221225833,1073742184,3221225831,359,360,361,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+1025,3221225833,1073742184,3221225831,359,360,361,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+1044,0,620,620,620,620,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1267,0,0,0,0,0,0,0,0,0,0,0,
+620,620,620,620,620,620,620,552,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,620,620,620,620,620,620,620,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+594,594,594,594,594,594,620,620,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+594,594,594,594,594,594,620,620,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1012,0,0,0,0,0,0,0,1031,
+0,0,0,0,0,0,620,620,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1031,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1276,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+</data>
+ </layer>
+ <layer id="1" name="wall" width="41" height="24">
+  <data encoding="csv">
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,993,993,993,993,993,993,993,993,993,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,993,993,993,993,993,993,993,993,993,993,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,993,0,0,0,0,0,0,993,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,993,0,0,0,0,0,0,993,0,0,0,0,0,0,0,0,0,0,0,
+1031,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,993,0,0,0,0,0,0,993,0,0,0,0,0,0,0,0,0,0,1050,
+1031,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,993,0,0,0,0,0,0,993,0,0,0,0,0,0,0,0,0,0,1050,
+1149,1027,0,1025,1027,620,1025,991,991,991,0,991,0,991,991,991,991,991,991,991,991,992,993,1050,1050,1050,1050,1050,1050,993,0,0,0,0,0,0,0,0,0,0,1050,
+1009,1169,0,1044,1046,0,1044,1010,1010,1010,0,1010,0,1010,1010,1010,1010,1010,1010,1010,1010,1011,993,1050,1050,1050,1050,1050,1050,993,993,0,0,0,0,0,0,0,0,0,1050,
+1008,620,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1006,993,0,0,0,0,0,0,993,993,0,0,0,0,0,0,0,0,0,1050,
+1008,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,993,993,0,0,0,0,0,0,993,993,0,0,0,0,0,0,0,0,0,1050,
+1028,1029,1029,1029,1029,1029,1012,1029,1029,1029,1029,1031,1029,1029,1029,1188,1277,1012,1012,1012,1012,1006,993,993,993,0,0,0,0,993,993,0,0,0,0,0,0,0,0,0,1050,
+1047,1048,1048,1048,1048,1048,1012,1048,1048,1048,1048,1031,1048,1048,1048,1207,1277,1012,1012,1012,1012,1025,991,991,991,991,991,991,993,991,991,991,991,993,991,991,991,991,991,991,992,
+620,0,0,0,0,0,1012,0,0,0,0,0,0,0,1012,1008,1277,1012,1012,0,1012,1044,1010,1010,1010,1010,1010,1010,993,1010,1010,1010,1010,993,1010,1010,1010,1010,1010,1010,1011,
+620,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1008,1277,0,0,0,0,0,0,1031,1031,0,0,0,0,993,0,0,0,0,0,0,0,0,0,0,1006,
+620,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1008,1277,0,0,0,0,0,0,1031,1031,1031,0,0,0,993,0,0,0,0,0,0,0,0,0,0,1006,
+620,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1008,1277,0,0,1189,1029,1031,1029,1029,1029,1029,1031,1029,1029,1029,1029,1031,1029,1029,1029,1031,1029,1029,1029,1029,1190,
+620,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1008,1277,0,0,1208,1048,1031,1048,1048,1048,1048,1031,1048,1048,1048,1048,1031,1048,1048,1048,1031,1048,1048,1048,1048,1209,
+620,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1008,1277,0,0,1006,0,1031,0,1031,1277,1031,1031,0,1031,1031,1031,1031,0,0,0,1031,0,0,0,0,620,
+620,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1008,1277,0,0,1006,0,0,0,1031,1277,0,1031,0,0,1031,1031,1031,0,0,0,0,0,0,0,0,620,
+620,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1008,1277,0,0,1006,0,0,0,1031,1277,0,1031,0,0,1031,1031,0,0,0,0,0,0,0,0,0,620,
+620,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1008,1277,0,0,1006,0,0,0,1031,1277,1031,1031,727,1031,1031,0,0,0,0,0,0,0,0,0,0,620,
+620,620,0,0,0,0,0,0,0,0,0,0,0,0,0,1008,1277,0,0,1006,0,0,0,1031,1031,1031,0,761,1031,1031,0,0,0,0,620,620,620,620,0,0,620,
+620,620,0,0,0,0,0,0,0,0,0,0,0,0,0,1028,1029,1029,1029,1030,620,1031,1031,1031,1031,1031,1031,1031,1031,1031,1031,620,620,620,620,620,620,620,620,620,620,
+620,620,0,0,0,0,0,0,0,0,0,0,0,0,0,1047,1048,1048,1048,1049,620,1031,1031,1031,1031,1031,1031,1031,1031,1031,620,620,620,620,620,620,620,620,620,620,620
+</data>
+ </layer>
+ <objectgroup id="6" name="door">
+  <object id="1" name="down" x="80.6667" y="177.667">
+   <properties>
+    <property name="nextDirection" value="DOWN"/>
+    <property name="nextMap" value="21RS"/>
+    <property name="nextX" type="int" value="5"/>
+    <property name="nextY" type="int" value="16"/>
+   </properties>
+  </object>
+  <object id="2" name="up" x="178" y="177.667">
+   <properties>
+    <property name="nextDirection" value="DOWN"/>
+    <property name="nextMap" value="21N2"/>
+    <property name="nextX" type="int" value="2"/>
+    <property name="nextY" type="int" value="16"/>
+   </properties>
+  </object>
+ </objectgroup>
+</map>
diff --git a/resources/map/21N2.tmx b/resources/map/21N2.tmx
index 7b27aed..3d40f46 100644
--- a/resources/map/21N2.tmx
+++ b/resources/map/21N2.tmx
@@ -91,7 +91,7 @@
   <object id="1" name="down" x="80.6667" y="177.667">
    <properties>
     <property name="nextDirection" value="DOWN"/>
-    <property name="nextMap" value="21RS"/>
+    <property name="nextMap" value="21N1"/>
     <property name="nextX" type="int" value="5"/>
     <property name="nextY" type="int" value="16"/>
    </properties>
diff --git a/resources/map/21RS.tmx b/resources/map/21RS.tmx
index 080a394..3b51ba5 100644
--- a/resources/map/21RS.tmx
+++ b/resources/map/21RS.tmx
@@ -99,7 +99,7 @@
   <object id="2" name="up" x="178" y="177.667">
    <properties>
     <property name="nextDirection" value="DOWN"/>
-    <property name="nextMap" value="21N2"/>
+    <property name="nextMap" value="21N1"/>
     <property name="nextX" type="int" value="2"/>
     <property name="nextY" type="int" value="16"/>
    </properties>
diff --git a/resources/map/Maps.tiled-session b/resources/map/Maps.tiled-session
index 738d6f6..41c92a2 100644
--- a/resources/map/Maps.tiled-session
+++ b/resources/map/Maps.tiled-session
@@ -15,6 +15,14 @@
             "scaleInDock": 1,
             "scaleInEditor": 1
         },
+        "21N1.tmx": {
+            "scale": 0.75,
+            "selectedLayer": 4,
+            "viewCenter": {
+                "x": 177.99999999999994,
+                "y": 178
+            }
+        },
         "21N2.tmx": {
             "expandedObjectLayers": [
                 6
@@ -22,7 +30,7 @@
             "scale": 0.75,
             "selectedLayer": 1,
             "viewCenter": {
-                "x": 552.6666666666666,
+                "x": 552.6666666666667,
                 "y": 527.3333333333333
             }
         },