diff --git a/CMakeLists.txt b/CMakeLists.txt
index d36cab6..3b2875c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -25,11 +25,17 @@ add_custom_command(
 	WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/assets/  
 
   OUTPUT "${CMAKE_CURRENT_LIST_DIR}/assets/level0.json"
+  OUTPUT "${CMAKE_CURRENT_LIST_DIR}/assets/level1.json"
+  OUTPUT "${CMAKE_CURRENT_LIST_DIR}/assets/level2.json"
+  OUTPUT "${CMAKE_CURRENT_LIST_DIR}/assets/level3.json"
 # if several levels/maps are created, just copy the previous line and change the .json name with the new level/map
   DEPENDS 	assets/converters.py
 		assets/tileset.png 
 		assets/tilesetnpp.tsx
 		assets/level0.tmx
+    assets/level1.tmx
+    assets/level2.tmx
+    assets/level3.tmx
 # if several levels/maps are created, just copy the previous line and change the .json name with the new level/map
   )
 
@@ -46,6 +52,9 @@ set(SOURCES
 # Shared assets, fx-9860G-only assets and fx-CG-50-only assets
 set(ASSETS
   assets/level0.json
+  assets/level1.json
+  assets/level2.json
+  assets/level3.json
   # ...
 )
 
diff --git a/assets-cg/font.png b/assets-cg/font.png
index 1b1622c..73c7244 100644
Binary files a/assets-cg/font.png and b/assets-cg/font.png differ
diff --git a/assets/level0.tmx b/assets/level0.tmx
index d182d19..0fd416f 100644
--- a/assets/level0.tmx
+++ b/assets/level0.tmx
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="48" height="24" tilewidth="8" tileheight="8" infinite="0" nextlayerid="5" nextobjectid="1">
+<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="48" height="24" tilewidth="8" tileheight="8" infinite="0" nextlayerid="6" nextobjectid="4">
  <editorsettings>
-  <export target="level0_walkable.json" format="json"/>
+  <export target="level0.json" format="json"/>
  </editorsettings>
  <tileset firstgid="1" source="tilesetnpp.tsx"/>
  <tileset firstgid="409" source="Walkable.tsx"/>
- <tileset firstgid="413" source="../../Collab_RPG_Fcalva4/assets/tilesetnpp.tsx"/>
  <layer id="1" name="Background" width="48" height="24">
   <data encoding="csv">
 2,297,298,299,300,2,386,297,298,299,300,2,2,2,2,2,2,337,338,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,297,298,299,2,2,2,345,346,347,348,2,337,338,
@@ -62,7 +61,7 @@
 226,227,228,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,273,274,275,276,0,0,0,201,202,203,204,201,202,203,204,0,0,0,0,0,249,250,251,252,273,274,275
 </data>
  </layer>
- <layer id="3" name="Walkable" width="48" height="24" visible="0">
+ <layer id="3" name="Walkable" width="48" height="24">
   <data encoding="csv">
 0,0,410,410,0,0,0,0,410,410,0,0,0,0,0,0,0,410,410,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,410,410,0,0,0,410,410,410,410,0,410,410,
 410,410,410,410,410,410,410,410,410,410,410,410,0,0,410,410,410,410,410,0,0,0,0,0,0,0,0,0,410,410,0,0,0,0,0,410,410,410,410,410,410,410,410,410,410,0,410,410,
@@ -90,4 +89,12 @@
 0,0,0,0,410,410,0,410,410,410,410,410,0,0,0,0,410,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,410,0,0,0,0,0,0,0,0,0,0,0
 </data>
  </layer>
+ <objectgroup id="4" name="ExtraData">
+  <object id="1" name="PlayerStart" x="52" y="44">
+   <point/>
+  </object>
+  <object id="2" name="PNJ1" x="132" y="148">
+   <point/>
+  </object>
+ </objectgroup>
 </map>
diff --git a/assets/level1.tmx b/assets/level1.tmx
index d2f7a30..9fd42bb 100644
--- a/assets/level1.tmx
+++ b/assets/level1.tmx
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="48" height="24" tilewidth="8" tileheight="8" infinite="0" nextlayerid="4" nextobjectid="1">
- <tileset firstgid="1" source="../../Collab_RPG_Fcalva4/assets/tilesetnpp.tsx"/>
- <tileset firstgid="409" source="../../Collab_RPG_Fcalva4/assets/Walkable.tsx"/>
- <tileset firstgid="413" source="Walkable.tsx"/>
+ <tileset firstgid="1" source="tilesetnpp.tsx"/>
+ <tileset firstgid="411" source="Walkable.tsx"/>
  <layer id="1" name="Background" width="48" height="24">
   <data encoding="csv">
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
@@ -59,32 +58,32 @@
 276,0,0,273,274,275,276,0,0,0,0,273,274,275,276,0,0,0,0,0,0,0,0,0,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="3" name="Walkable" width="48" height="24" visible="0">
+ <layer id="3" name="Walkable" width="48" 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,410,410,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,410,410,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,416,416,416,0,0,0,0,0,0,0,0,0,0,0,0,0,410,410,0,0,0,0,0,410,410,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,414,414,0,0,
-0,0,0,416,416,416,416,0,0,0,410,410,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,410,410,416,416,416,416,416,416,416,416,0,0,0,0,416,416,
-0,0,416,416,416,416,416,416,416,416,416,416,416,416,0,0,0,0,0,0,0,0,416,416,416,416,416,416,416,416,416,416,416,416,416,416,416,416,416,416,416,416,416,416,416,416,416,416,
-414,416,416,416,416,416,416,416,416,416,416,416,416,416,0,0,410,410,0,0,416,416,416,416,416,416,416,416,416,416,416,416,416,416,416,416,416,416,416,416,416,416,416,416,416,416,416,416,
-0,416,416,416,416,416,416,416,416,416,416,416,416,416,416,0,0,0,0,416,416,416,416,416,416,416,416,416,416,416,416,416,416,416,416,416,416,416,416,416,416,416,416,416,416,416,416,416,
-0,0,416,416,416,416,416,416,416,416,416,416,416,416,416,416,416,416,416,416,416,416,416,416,416,416,416,416,416,416,416,416,416,416,416,0,0,416,416,416,416,416,416,416,416,416,416,416,
-0,0,0,416,416,416,416,416,416,0,0,0,416,416,416,416,416,416,416,416,416,416,416,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,416,416,416,416,416,416,416,
-0,0,0,0,416,416,416,416,0,0,0,0,416,416,416,416,416,416,416,416,416,416,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,416,416,416,
-410,410,410,410,410,410,0,0,0,0,0,0,0,0,416,416,416,416,416,416,416,416,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,414,414,0,0,0,416,416,416,
-0,0,0,0,410,410,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,412,412,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,412,412,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,414,414,414,0,0,0,0,0,0,0,0,0,0,0,0,0,412,412,0,0,0,0,0,412,412,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,412,412,0,0,
+0,0,0,414,414,414,414,0,0,0,412,412,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,412,412,414,414,414,414,414,414,414,414,0,0,0,0,414,414,
+0,0,414,414,414,414,414,414,414,414,414,414,414,414,0,0,0,0,0,0,0,0,414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,
+412,414,414,414,414,414,414,414,414,414,414,414,414,414,0,0,412,412,0,0,414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,
+0,414,414,414,414,414,414,414,414,414,414,414,414,414,414,0,0,0,0,414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,
+0,0,414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,0,0,414,414,414,414,414,414,414,414,414,414,414,
+0,0,0,414,414,414,414,414,414,0,0,0,414,414,414,414,414,414,414,414,414,414,414,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,414,414,414,414,414,414,414,
+0,0,0,0,414,414,414,414,0,0,0,0,414,414,414,414,414,414,414,414,414,414,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,414,414,414,
+412,412,412,412,412,412,0,0,0,0,0,0,0,0,414,414,414,414,414,414,414,414,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,412,412,0,0,0,414,414,414,
+0,0,0,0,412,412,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,410,410,0,0,0,0,0,0,0,0,0,0,0,410,410,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,414,414,0,0,
-410,410,410,410,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,410,410,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-410,410,410,410,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,410,410,0,0,0,0,0,0,0,0,0,0,
-410,410,410,410,0,0,0,0,0,0,0,0,0,0,410,410,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,410,410,410,410,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,410,410,0,0,0,0,0,0,0,0,0,0,0,410,410,410,410,0,414,414,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,410,410,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,410,410,410,0,0,0,0,0,0,414,414,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,410,410,0,0,410,410,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+0,0,0,0,0,0,0,0,0,412,412,0,0,0,0,0,0,0,0,0,0,0,412,412,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,412,412,0,0,
+412,412,412,412,412,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,412,412,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+412,412,412,412,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,412,412,0,0,0,0,0,0,0,0,0,0,
+412,412,412,412,0,0,0,0,0,0,0,0,0,0,412,412,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,412,412,412,412,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,412,412,0,0,0,0,0,0,0,0,0,0,0,412,412,412,412,0,412,412,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,412,412,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,412,412,412,412,0,0,0,0,0,0,412,412,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,412,412,0,0,412,412,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 </data>
  </layer>
 </map>
diff --git a/assets/level2.tmx b/assets/level2.tmx
index 31132d1..0d65f1f 100644
--- a/assets/level2.tmx
+++ b/assets/level2.tmx
@@ -1,41 +1,39 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="48" height="24" tilewidth="8" tileheight="8" infinite="0" nextlayerid="4" nextobjectid="1">
- <tileset firstgid="1" source="../../Collab_RPG_Fcalva4/assets/tilesetnpp.tsx"/>
- <tileset firstgid="409" source="../../Collab_RPG_Fcalva4/assets/Walkable.tsx"/>
- <tileset firstgid="413" source="Walkable.tsx"/>
- <tileset firstgid="417" source="tilesetnpp.tsx"/>
+ <tileset firstgid="1" source="tilesetnpp.tsx"/>
+ <tileset firstgid="411" source="Walkable.tsx"/>
  <layer id="1" name="Background" width="48" height="24">
   <data encoding="csv">
-2,2,2,2,802,2,2,2,2,2,2,325,2,290,265,2,349,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,297,298,299,
-2,2,2,2,2,802,2,2,2,2,2,277,2,386,266,2,349,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,297,298,299,300,2,2,2,
-714,715,716,2,2,2,2,2,2,2,2,301,2,266,290,2,349,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
-2,2,2,2,2,2,2,2,2,2,2,256,2,265,266,2,257,2,2,2,2,2,2,2,2,2,2,2,297,298,299,300,297,298,299,258,259,262,330,333,333,336,262,263,264,2,2,2,
-2,2,2,2,2,2,2,2,2,2,2,281,2,266,290,2,280,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,283,283,3,91,87,88,92,3,312,288,2,2,2,
-2,2,2,2,2,2,2,2,2,2,2,2,2,290,266,2,2,2,2,2,297,298,299,300,2,2,2,2,2,2,2,9,10,2,2,283,283,3,115,111,112,113,3,312,312,131,2,2,
-2,2,2,2,2,2,2,2,2,2,2,2,2,386,266,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,33,34,2,2,283,283,3,114,114,115,114,3,312,312,132,2,2,
-2,2,2,2,2,2,2,2,2,2,2,2,2,313,290,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,282,283,3,3,3,3,3,3,312,288,132,2,2,
+2,2,2,2,386,2,2,2,2,2,2,325,2,290,265,2,349,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,297,298,299,
+2,2,2,2,2,386,2,2,2,2,2,277,2,386,266,2,349,385,385,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,297,298,299,300,2,2,2,
+298,299,300,2,2,2,2,385,385,2,2,301,2,266,290,2,349,2,385,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+2,2,2,2,2,2,2,2,386,2,2,256,2,265,266,2,257,2,2,2,2,2,2,2,2,2,2,2,297,298,299,300,297,298,299,258,259,262,330,333,333,336,262,263,264,2,2,2,
+2,2,2,2,2,2,2,2,386,386,2,281,2,266,290,2,280,2,2,2,2,2,2,2,2,2,386,2,2,2,2,2,2,2,2,283,283,3,91,87,88,92,3,312,288,2,385,2,
+2,2,2,2,2,2,2,2,2,2,2,2,2,290,266,2,2,2,385,2,297,298,299,300,2,2,2,2,2,2,2,9,10,2,2,283,283,3,115,111,112,113,3,312,312,131,2,2,
+2,2,2,2,2,2,2,2,2,2,2,2,2,386,266,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,33,34,385,2,283,283,3,114,114,115,114,3,312,312,132,385,2,
+2,386,2,2,2,2,2,2,2,2,2,2,2,313,290,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,282,283,3,3,3,3,3,3,312,288,132,2,2,
 2,2,2,297,298,299,300,2,345,346,347,348,2,265,266,2,2,149,150,151,152,149,150,151,152,149,150,151,152,149,150,151,152,2,2,282,283,3,3,3,3,3,3,287,288,132,2,2,
-2,2,2,2,2,2,2,802,369,370,371,372,2,266,290,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,282,283,3,3,3,3,3,3,312,312,132,2,2,
-2,2,2,2,2,2,802,2,393,394,395,396,2,290,266,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,282,283,3,3,3,3,3,3,312,288,132,2,2,
-2,2,2,2,2,2,2,2,2,2,2,2,2,386,313,2,2,149,149,150,151,149,150,151,152,149,150,151,152,149,150,151,152,2,2,282,330,308,308,308,308,308,308,311,312,132,2,2,
-2,2,2,2,2,2,2,2,2,2,2,2,2,266,290,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,330,331,331,331,331,331,331,331,331,336,132,2,2,
+2,2,2,2,2,2,2,386,369,370,371,372,2,266,290,2,2,2,2,2,2,385,2,2,2,2,385,2,2,2,2,2,2,2,2,282,283,3,3,3,3,3,3,312,312,132,2,2,
+2,2,2,2,2,2,386,2,393,394,395,396,2,290,266,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,282,283,3,3,3,3,3,3,312,288,132,2,2,
+2,2,2,2,2,385,2,2,2,2,2,2,2,386,313,2,2,149,149,150,151,149,150,151,152,149,150,151,152,149,150,151,152,2,2,282,330,308,308,308,308,308,308,311,312,132,2,2,
+2,2,2,2,2,2,2,2,2,2,2,2,2,266,290,2,2,2,2,2,2,2,2,2,2,385,2,2,385,2,2,2,2,2,2,330,331,331,331,331,331,331,331,331,336,132,2,2,
 2,297,298,299,300,2,2,2,2,2,2,2,2,265,266,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,90,91,92,162,163,164,165,90,91,92,132,2,2,
 2,2,2,2,2,2,2,2,2,2,2,2,2,266,290,2,2,149,150,151,152,149,150,151,152,149,150,151,152,149,150,151,152,2,2,114,115,116,186,187,188,189,114,115,116,132,2,2,
-2,2,802,802,2,2,2,2,2,2,2,2,2,313,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,110,113,110,210,211,212,213,113,110,113,133,2,2,
-2,2,2,2,2,2,2,2,2,2,2,2,2,290,265,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,234,290,265,237,2,2,2,2,2,2,
-2,2,2,2,2,2,297,298,299,300,2,2,2,386,266,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,160,161,802,386,266,2,2,2,2,2,2,2,
-2,2,2,2,2,2,2,2,2,2,2,2,2,266,290,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,266,290,2,2,2,2,2,2,2,
-2,2,2,2,2,2,2,802,802,2,2,2,2,266,266,265,266,266,265,386,265,266,266,265,266,266,265,386,265,266,266,265,266,266,265,386,265,266,266,265,266,265,266,266,265,386,265,266,
-2,345,346,347,348,2,2,2,2,2,2,2,2,266,290,289,290,265,266,290,289,385,265,289,290,265,266,290,289,385,265,266,290,265,266,290,289,385,265,266,290,289,290,265,266,290,289,385,
-2,369,370,371,372,2,2,2,2,2,2,2,2,2,2,2,2,802,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
-2,393,394,395,396,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,802,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
-2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2
+2,385,386,386,2,2,2,2,2,2,2,2,2,313,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,110,113,110,210,211,212,213,113,110,113,133,2,2,
+2,385,2,2,2,2,2,2,2,2,2,2,2,290,265,2,2,2,2,2,2,2,2,386,2,2,2,2,385,2,2,2,2,2,2,2,2,2,234,290,265,237,2,2,2,2,385,2,
+2,2,2,2,2,2,297,298,299,300,2,2,2,386,266,2,2,2,2,2,2,2,2,386,386,2,2,2,2,2,2,2,2,2,2,2,160,161,386,386,266,2,2,2,2,385,385,2,
+2,386,386,2,2,2,2,2,2,2,2,2,2,266,290,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,266,290,2,2,2,2,2,2,2,
+2,2,2,2,2,2,2,386,386,2,2,2,2,266,266,265,266,266,265,386,265,266,266,265,266,266,265,386,265,266,266,265,266,266,265,386,265,266,266,265,266,265,266,266,265,386,265,266,
+2,345,346,347,348,2,2,2,2,2,2,385,2,266,290,289,290,265,266,290,289,385,265,289,290,265,266,290,289,385,265,266,290,265,266,290,289,385,265,266,290,289,290,265,266,290,289,385,
+2,369,370,371,372,2,2,2,2,2,2,2,2,2,2,2,2,386,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+2,393,394,395,396,2,2,2,385,2,2,2,2,2,2,2,2,2,385,2,2,2,2,2,2,2,385,385,385,2,2,2,386,2,2,2,2,2,385,2,2,385,2,2,2,2,2,2,
+2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,386,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2
 </data>
  </layer>
  <layer id="2" name="Foreground" width="48" height="24">
   <data encoding="csv">
-666,667,668,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,297,298,299,300,0,0,0,225,226,227,228,225,226,227,228,0,0,0,0,0,273,274,275,276,0,0,0,
-690,691,692,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,201,202,203,204,0,0,0,0,249,250,251,252,249,250,251,252,0,0,258,259,263,264,0,0,0,0,0,0,
+250,251,252,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,297,298,299,300,0,0,0,225,226,227,228,225,226,227,228,0,0,0,0,0,273,274,275,276,0,0,0,
+274,275,276,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,201,202,203,204,0,0,0,0,249,250,251,252,249,250,251,252,0,0,258,259,263,264,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,225,226,227,228,0,0,0,0,273,274,275,276,273,274,275,276,0,0,282,3,3,288,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,249,250,251,252,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,201,202,203,204,0,0,0,0,0,0,0,0,0,0,0,0,0,273,274,275,276,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -60,31 +58,31 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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="3" name="Walkable" width="48" height="24" visible="0">
+ <layer id="3" name="Walkable" width="48" height="24">
   <data encoding="csv">
-0,0,0,0,0,0,0,0,0,0,0,410,0,0,0,0,410,0,0,0,0,0,414,414,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,414,414,
-0,0,0,0,0,0,0,0,0,0,0,410,0,0,0,0,410,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,414,414,0,0,0,0,
-414,414,0,0,0,0,0,0,0,0,0,410,0,0,0,0,410,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,410,0,0,0,0,410,0,0,0,0,0,0,0,0,0,0,0,0,414,414,0,0,414,414,410,410,410,410,410,410,410,410,410,410,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,410,0,0,0,0,410,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,410,410,410,410,410,410,410,410,410,410,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,414,414,0,0,0,0,0,0,0,0,0,0,0,0,410,410,410,410,410,410,410,410,410,410,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,410,410,410,410,410,410,410,410,410,410,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,410,410,410,410,410,410,410,410,410,410,0,0,0,
-0,0,0,0,414,414,0,0,414,414,414,414,0,0,0,0,0,410,410,410,410,410,410,410,410,410,410,410,410,410,410,410,410,0,0,410,410,410,410,410,410,410,410,410,410,0,0,0,
-0,0,0,0,0,0,0,0,414,414,414,414,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,410,410,410,410,410,410,410,410,410,410,0,0,0,
-0,0,0,0,0,0,0,0,414,414,414,414,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,410,410,410,410,410,410,410,410,410,410,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,410,410,410,410,410,410,410,410,410,410,410,410,410,410,410,410,0,0,410,410,410,410,410,410,410,410,410,410,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,410,410,410,410,410,410,410,410,410,410,0,0,0,
-0,0,414,414,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,410,410,410,410,410,410,410,410,410,410,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,410,410,410,410,410,410,410,410,410,410,410,410,410,410,410,410,0,0,410,410,410,410,410,410,410,410,410,410,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,410,410,410,410,0,0,410,410,410,410,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,412,0,0,0,0,412,0,0,0,0,0,412,412,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,412,412,
+0,0,0,0,0,0,0,0,0,0,0,412,0,0,0,0,412,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,412,412,0,0,0,0,
+412,412,0,0,0,0,0,0,0,0,0,412,0,0,0,0,412,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,412,0,0,0,0,412,0,0,0,0,0,0,0,0,0,0,0,0,412,412,0,0,412,412,412,412,412,412,412,412,412,412,412,412,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,412,0,0,0,0,412,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,412,412,412,412,412,412,412,412,412,412,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,412,412,0,0,0,0,0,0,0,0,0,0,0,0,412,412,412,412,412,412,412,412,412,412,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,412,412,412,412,412,412,412,412,412,412,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,412,412,412,412,412,412,412,412,412,412,0,0,0,
+0,0,0,0,412,412,0,0,412,412,412,412,0,0,0,0,0,412,412,412,412,412,412,412,412,412,412,412,412,412,412,412,412,0,0,412,412,412,412,412,412,412,412,412,412,0,0,0,
+0,0,0,0,0,0,0,0,412,412,412,412,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,412,412,412,412,412,412,412,412,412,412,0,0,0,
+0,0,0,0,0,0,0,0,412,412,412,412,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,412,412,412,412,412,412,412,412,412,412,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,412,412,412,412,412,412,412,412,412,412,412,412,412,412,412,412,0,0,412,412,412,412,412,412,412,412,412,412,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,412,412,412,412,412,412,412,412,412,412,0,0,0,
+0,0,412,412,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,412,412,412,412,412,412,412,412,412,412,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,412,412,412,412,412,412,412,412,412,412,412,412,412,412,412,412,0,0,412,412,412,412,412,412,412,412,412,412,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,412,412,412,412,0,0,412,412,412,412,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,414,414,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,414,414,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,412,412,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,412,412,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,414,414,414,414,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,414,414,414,414,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,414,414,414,414,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,412,412,412,412,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,412,412,412,412,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,412,412,412,412,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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>
diff --git a/assets/level3.tmx b/assets/level3.tmx
index 8a30759..f260e15 100644
--- a/assets/level3.tmx
+++ b/assets/level3.tmx
@@ -1,35 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="48" height="24" tilewidth="8" tileheight="8" infinite="0" nextlayerid="4" nextobjectid="1">
- <tileset firstgid="1" source="../../Collab_RPG_Fcalva4/assets/tilesetnpp.tsx"/>
- <tileset firstgid="409" source="../../Collab_RPG_Fcalva4/assets/Walkable.tsx"/>
- <tileset firstgid="413" source="Walkable.tsx"/>
- <tileset firstgid="417" source="tilesetnpp.tsx"/>
+ <tileset firstgid="1" source="tilesetnpp.tsx"/>
+ <tileset firstgid="411" source="Walkable.tsx"/>
  <layer id="1" name="Background" width="48" height="24">
   <data encoding="csv">
-300,418,418,713,714,715,716,418,418,418,418,713,714,715,716,418,418,418,418,418,418,339,340,418,418,418,418,418,418,418,418,418,418,418,418,418,418,418,418,418,418,418,418,418,418,418,418,418,
-2,418,418,418,418,418,418,418,418,418,418,418,418,418,2,418,418,385,385,418,418,363,364,418,418,418,418,387,418,418,386,418,418,386,418,258,259,260,261,261,261,261,262,263,264,418,339,340,
-281,179,180,181,179,180,179,181,179,180,179,180,179,180,281,418,418,418,418,418,418,418,418,418,418,418,418,418,385,418,418,418,418,418,418,282,283,284,285,285,285,285,286,287,288,418,363,364,
-325,386,385,386,266,386,386,386,385,265,386,386,385,386,325,418,258,259,260,261,261,261,261,261,262,263,264,418,418,418,418,418,418,418,418,306,307,308,309,309,309,309,310,311,312,131,418,418,
-277,385,385,386,290,386,385,386,386,266,386,385,386,386,277,418,282,283,284,285,285,285,285,285,286,287,288,418,418,418,418,418,418,418,418,330,331,332,333,333,333,333,334,335,336,132,418,418,
-301,386,386,385,314,386,386,385,386,290,386,386,385,386,301,418,306,307,308,309,309,309,309,309,310,311,312,131,418,418,418,418,418,418,418,162,163,164,162,163,164,165,163,164,165,132,418,418,
-325,313,290,265,313,265,241,290,313,314,290,241,313,290,325,418,330,331,332,333,333,333,333,333,334,335,336,132,418,418,418,418,418,418,418,86,87,88,186,187,188,189,90,91,92,132,418,418,
-349,418,2,2,2,2,2,2,2,2,418,418,418,418,349,418,162,163,164,162,163,164,165,162,163,164,165,132,418,297,298,299,300,418,418,110,111,112,210,211,212,213,114,115,116,133,418,418,
-387,418,2,2,2,2,2,2,2,2,418,418,418,418,418,418,86,87,88,186,187,188,189,86,87,88,92,132,418,418,418,418,418,385,418,418,418,418,418,265,266,418,418,418,418,418,418,418,
-418,418,258,259,260,261,261,262,263,264,418,21,22,23,24,418,110,111,112,210,211,212,213,110,111,112,116,133,386,241,241,313,241,313,266,265,266,266,265,289,290,418,160,161,385,418,418,387,
-418,418,282,283,284,285,285,286,287,288,418,45,46,47,48,418,418,418,418,418,265,266,418,418,418,418,418,313,290,265,313,265,313,266,290,289,290,265,266,313,314,418,418,418,418,418,418,418,
-418,418,306,307,308,309,309,310,311,312,131,69,70,71,72,418,266,265,266,266,265,386,160,161,418,386,418,265,265,266,241,418,258,259,260,261,261,262,263,264,418,418,418,418,418,418,418,418,
-386,418,330,331,332,333,333,334,335,336,132,418,418,418,418,266,290,289,290,265,266,290,266,265,266,266,265,289,289,290,386,418,282,283,284,285,285,286,287,288,418,418,418,418,418,418,418,418,
-418,418,162,163,165,162,163,163,165,165,132,418,313,290,265,313,265,418,418,418,418,418,290,289,290,265,266,313,313,314,241,418,306,307,308,309,309,310,311,312,131,418,418,418,418,418,418,418,
-418,418,86,87,88,186,187,188,189,92,132,418,265,266,266,418,258,259,260,261,261,261,261,261,261,262,263,264,418,265,266,418,330,331,332,333,333,334,335,336,132,418,418,418,418,418,418,418,
-418,418,110,111,112,210,211,212,213,116,133,418,289,290,418,418,282,283,284,285,285,285,285,285,285,286,287,288,418,289,290,418,162,163,164,162,163,164,165,165,132,418,418,297,298,299,300,418,
-418,418,418,418,418,418,265,266,418,418,418,386,313,314,418,418,306,307,308,309,309,309,309,309,309,310,311,312,131,241,265,418,86,87,88,186,187,188,189,92,132,418,418,418,418,418,418,418,
-418,418,418,386,418,418,289,290,160,161,418,418,265,266,418,418,330,331,332,333,333,333,333,333,333,334,335,336,132,266,266,418,110,111,112,210,211,212,213,116,133,418,418,418,418,418,386,418,
-418,418,418,418,418,418,313,314,289,265,266,290,289,290,418,418,162,163,164,165,162,163,164,162,163,163,165,165,132,265,266,241,418,418,418,418,265,266,418,418,418,418,418,418,418,418,386,418,
-265,266,266,265,386,313,265,266,265,266,313,314,313,314,266,418,86,87,88,90,90,87,88,186,187,188,189,92,132,289,289,290,266,265,266,266,289,290,418,160,161,418,21,22,23,24,418,418,
-289,290,265,266,290,418,418,418,418,418,418,418,266,265,266,418,110,111,112,114,114,111,112,210,211,212,213,116,133,241,313,314,290,289,290,265,313,314,418,386,418,418,45,46,47,48,418,418,
-418,418,418,418,418,418,418,418,418,386,418,418,418,265,266,418,418,418,418,418,418,418,418,418,265,266,418,418,418,418,345,346,347,348,418,339,340,418,418,418,418,418,69,70,71,72,418,418,
-418,297,298,299,300,418,418,339,340,418,418,2,2,289,290,266,265,266,266,265,386,265,266,266,289,290,418,160,161,418,369,370,371,372,418,363,364,418,418,418,418,418,418,418,418,418,418,418,
-418,418,418,418,386,418,418,363,364,418,418,418,418,313,314,290,289,290,265,266,290,289,290,265,313,314,418,418,385,418,393,394,395,396,418,418,418,418,418,418,418,387,418,418,418,386,418,418
+300,2,2,297,298,299,300,2,2,2,2,297,298,299,300,2,2,2,2,2,2,339,340,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,385,385,2,2,363,364,2,2,2,2,387,2,2,386,2,2,386,2,258,259,260,261,261,261,261,262,263,264,2,339,340,
+281,179,180,181,179,180,179,181,179,180,179,180,179,180,281,2,2,2,2,2,2,2,2,2,2,2,2,2,385,2,2,2,2,2,2,282,283,284,285,285,285,285,286,287,288,2,363,364,
+325,386,385,386,266,386,386,386,385,265,386,386,385,386,325,2,258,259,260,261,261,261,261,261,262,263,264,2,2,2,2,2,2,2,2,306,307,308,309,309,309,309,310,311,312,131,2,2,
+277,385,385,386,290,386,385,386,386,266,386,385,386,386,277,2,282,283,284,285,285,285,285,285,286,287,288,2,2,2,2,2,2,2,2,330,331,332,333,333,333,333,334,335,336,132,2,2,
+301,386,386,385,314,386,386,385,386,290,386,386,385,386,301,2,306,307,308,309,309,309,309,309,310,311,312,131,2,2,2,2,2,2,2,162,163,164,162,163,164,165,163,164,165,132,2,2,
+325,313,290,265,313,265,241,290,313,314,290,241,313,290,325,2,330,331,332,333,333,333,333,333,334,335,336,132,2,2,2,2,2,2,2,86,87,88,186,187,188,189,90,91,92,132,2,2,
+349,2,2,2,2,2,2,2,2,2,2,2,2,2,349,2,162,163,164,162,163,164,165,162,163,164,165,132,2,297,298,299,300,2,2,110,111,112,210,211,212,213,114,115,116,133,2,2,
+387,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,86,87,88,186,187,188,189,86,87,88,92,132,2,2,2,2,2,385,2,2,2,2,2,265,266,2,2,2,2,2,2,2,
+2,2,258,259,260,261,261,262,263,264,2,21,22,23,24,2,110,111,112,210,211,212,213,110,111,112,116,133,386,241,241,313,241,313,266,265,266,266,265,289,290,2,160,161,385,2,2,387,
+2,2,282,283,284,285,285,286,287,288,2,45,46,47,48,2,2,2,2,2,265,266,2,2,2,2,2,313,290,265,313,265,313,266,290,289,290,265,266,313,314,2,2,2,2,2,2,2,
+2,2,306,307,308,309,309,310,311,312,131,69,70,71,72,2,266,265,266,266,265,386,160,161,2,386,2,265,265,266,241,2,258,259,260,261,261,262,263,264,2,2,2,2,2,2,2,2,
+386,2,330,331,332,333,333,334,335,336,132,2,2,2,2,266,290,289,290,265,266,290,266,265,266,266,265,289,289,290,386,2,282,283,284,285,285,286,287,288,2,2,2,2,2,2,2,2,
+2,2,162,163,165,162,163,163,165,165,132,2,313,290,265,313,265,2,2,2,2,2,290,289,290,265,266,313,313,314,241,2,306,307,308,309,309,310,311,312,131,2,2,2,2,2,2,2,
+2,2,86,87,88,186,187,188,189,92,132,2,265,266,266,2,258,259,260,261,261,261,261,261,261,262,263,264,2,265,266,2,330,331,332,333,333,334,335,336,132,2,2,2,2,2,2,2,
+2,2,110,111,112,210,211,212,213,116,133,2,289,290,2,2,282,283,284,285,285,285,285,285,285,286,287,288,2,289,290,2,162,163,164,162,163,164,165,165,132,2,2,297,298,299,300,2,
+2,2,2,2,2,2,265,266,2,2,2,386,313,314,2,2,306,307,308,309,309,309,309,309,309,310,311,312,131,241,265,2,86,87,88,186,187,188,189,92,132,2,2,2,2,2,2,2,
+2,2,2,386,2,2,289,290,160,161,2,2,265,266,2,2,330,331,332,333,333,333,333,333,333,334,335,336,132,266,266,2,110,111,112,210,211,212,213,116,133,2,2,2,2,2,386,2,
+2,2,2,2,2,2,313,314,289,265,266,290,289,290,2,2,162,163,164,165,162,163,164,162,163,163,165,165,132,265,266,241,2,2,2,2,265,266,2,2,2,2,2,2,2,2,386,2,
+265,266,266,265,386,313,265,266,265,266,313,314,313,314,266,2,86,87,88,90,90,87,88,186,187,188,189,92,132,289,289,290,266,265,266,266,289,290,2,160,161,2,21,22,23,24,2,2,
+289,290,265,266,290,2,2,2,2,2,2,2,266,265,266,2,110,111,112,114,114,111,112,210,211,212,213,116,133,241,313,314,290,289,290,265,313,314,2,386,2,2,45,46,47,48,2,2,
+2,2,2,2,2,2,2,2,2,386,2,2,2,265,266,2,2,2,2,2,2,2,2,2,265,266,2,2,2,2,345,346,347,348,2,339,340,2,2,2,2,2,69,70,71,72,2,2,
+2,297,298,299,300,2,2,339,340,2,2,2,2,289,290,266,265,266,266,265,386,265,266,266,289,290,2,160,161,2,369,370,371,372,2,363,364,2,2,2,2,2,2,2,2,2,2,2,
+2,2,2,2,386,2,2,363,364,2,2,2,2,313,314,290,289,290,265,266,290,289,290,265,313,314,2,2,385,2,393,394,395,396,2,2,2,2,2,2,2,387,2,2,2,386,2,2
 </data>
  </layer>
  <layer id="2" name="Foreground" width="48" height="24">
@@ -62,30 +60,30 @@
  </layer>
  <layer id="3" name="Walkable" width="48" height="24">
   <data encoding="csv">
-0,0,0,0,414,414,0,0,0,0,0,0,0,414,0,0,0,0,0,0,0,414,414,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,414,414,0,0,0,0,414,0,0,0,0,0,0,0,414,414,414,414,414,414,414,414,414,414,0,414,414,
-414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,414,0,0,0,0,0,0,0,0,414,0,414,414,
-414,0,0,0,0,0,0,0,0,0,0,0,0,0,414,0,414,414,414,414,414,414,414,414,414,414,414,0,0,0,0,0,0,0,0,414,0,0,0,0,0,0,0,0,414,0,0,0,
-414,0,0,0,0,0,0,0,0,0,0,0,0,0,414,0,414,0,0,0,0,0,0,0,0,0,414,0,0,0,0,0,0,0,0,414,0,0,0,0,0,0,0,0,414,0,0,0,
-414,0,0,0,0,0,0,0,0,0,0,0,0,0,414,0,414,0,0,0,0,0,0,0,0,0,414,0,0,0,0,0,0,0,0,414,0,0,0,0,0,0,0,0,414,0,0,0,
-414,0,0,0,0,0,0,0,0,0,0,0,0,0,414,0,414,0,0,0,0,0,0,0,0,0,414,0,0,0,0,0,0,0,0,414,0,0,414,414,414,414,0,0,414,0,0,0,
-414,0,0,0,0,0,0,0,0,0,0,0,0,0,414,0,414,0,0,0,0,0,0,0,0,0,414,0,0,0,414,414,0,0,0,414,414,414,414,0,0,414,414,414,414,0,0,0,
-414,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,414,0,0,414,414,414,414,0,0,0,414,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,414,414,414,414,414,414,414,414,0,414,414,414,414,0,414,414,414,414,0,0,414,414,414,414,414,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,414,414,0,0,0,414,
-0,0,414,0,0,0,0,0,0,414,0,414,414,414,414,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,414,0,0,0,0,0,0,414,0,414,414,414,414,0,0,0,0,0,0,0,414,414,0,0,0,0,0,0,0,0,414,414,414,414,414,414,414,414,0,0,0,0,0,0,0,0,
-0,0,414,0,0,0,0,0,0,414,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,414,0,0,0,0,0,0,414,0,0,0,0,0,0,0,0,
-0,0,414,0,0,0,0,0,0,414,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,414,0,0,0,0,0,0,414,0,0,0,0,0,0,0,0,
-0,0,414,0,0,414,414,414,414,414,0,0,0,0,0,0,414,414,414,414,414,414,414,414,414,414,414,414,0,0,0,0,414,0,0,0,0,0,0,414,0,0,0,0,0,0,0,0,
-0,0,414,414,414,414,0,0,414,414,0,0,0,0,0,0,414,0,0,0,0,0,0,0,0,0,0,414,0,0,0,0,414,0,0,0,0,0,0,414,0,0,0,0,414,414,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,414,0,0,0,0,0,0,0,0,0,0,414,0,0,0,0,414,0,0,414,414,414,414,414,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,414,414,0,0,0,0,0,0,414,0,0,0,0,0,0,0,0,0,0,414,0,0,0,0,414,414,414,414,0,0,414,414,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,414,0,0,0,0,0,0,0,0,0,0,414,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,414,0,0,0,0,0,0,414,414,414,414,414,0,0,0,0,0,0,0,0,0,0,0,414,414,0,414,414,414,414,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,414,414,414,414,414,414,414,414,0,0,414,414,0,0,0,0,0,0,0,0,0,0,0,0,0,0,414,414,414,414,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,414,414,414,414,0,414,414,0,0,0,0,0,414,414,414,414,0,0,
-0,0,414,414,0,0,0,414,414,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,414,414,0,414,414,414,414,0,414,414,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,414,414,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,414,414,414,414,0,0,0,0,0,0,0,414,0,0,0,0,0,0
+0,0,0,0,412,412,0,0,0,0,0,0,412,412,0,0,0,0,0,0,0,412,412,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,412,412,0,0,0,0,412,0,0,0,0,0,0,0,412,412,412,412,412,412,412,412,412,412,0,412,412,
+412,412,412,412,412,412,412,412,412,412,412,412,412,412,412,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,412,0,0,0,0,0,0,0,0,412,0,412,412,
+412,0,0,0,0,0,0,0,0,0,0,0,0,0,412,0,412,412,412,412,412,412,412,412,412,412,412,0,0,0,0,0,0,0,0,412,0,0,0,0,0,0,0,0,412,0,0,0,
+412,0,0,0,0,0,0,0,0,0,0,0,0,0,412,0,412,0,0,0,0,0,0,0,0,0,412,0,0,0,0,0,0,0,0,412,0,0,0,0,0,0,0,0,412,0,0,0,
+412,0,0,0,0,0,0,0,0,0,0,0,0,0,412,0,412,0,0,0,0,0,0,0,0,0,412,0,0,0,0,0,0,0,0,412,0,0,0,0,0,0,0,0,412,0,0,0,
+412,0,0,0,0,0,0,0,0,0,0,0,0,0,412,0,412,0,0,0,0,0,0,0,0,0,412,0,0,0,0,0,0,0,0,412,0,0,412,412,412,412,0,0,412,0,0,0,
+412,0,0,0,0,0,0,0,0,0,0,0,0,0,412,0,412,0,0,0,0,0,0,0,0,0,412,0,0,0,412,412,0,0,0,412,412,412,412,0,0,412,412,412,412,0,0,0,
+412,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,412,0,0,412,412,412,412,0,0,0,412,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,412,412,412,412,412,412,412,412,0,412,412,412,412,0,412,412,412,412,0,0,412,412,412,412,412,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,412,412,0,0,0,412,
+0,0,412,0,0,0,0,0,0,412,0,412,412,412,412,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,412,0,0,0,0,0,0,412,0,412,412,412,412,0,0,0,0,0,0,0,412,412,0,0,0,0,0,0,0,0,412,412,412,412,412,412,412,412,0,0,0,0,0,0,0,0,
+0,0,412,0,0,0,0,0,0,412,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,412,0,0,0,0,0,0,412,0,0,0,0,0,0,0,0,
+0,0,412,0,0,0,0,0,0,412,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,412,0,0,0,0,0,0,412,0,0,0,0,0,0,0,0,
+0,0,412,0,0,412,412,412,412,412,0,0,0,0,0,0,412,412,412,412,412,412,412,412,412,412,412,412,0,0,0,0,412,0,0,0,0,0,0,412,0,0,0,0,0,0,0,0,
+0,0,412,412,412,412,0,0,412,412,0,0,0,0,0,0,412,0,0,0,0,0,0,0,0,0,0,412,0,0,0,0,412,0,0,0,0,0,0,412,0,0,0,0,412,412,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,412,0,0,0,0,0,0,0,0,0,0,412,0,0,0,0,412,0,0,412,412,412,412,412,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,412,412,0,0,0,0,0,0,412,0,0,0,0,0,0,0,0,0,0,412,0,0,0,0,412,412,412,412,0,0,412,412,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,412,0,0,0,0,0,0,0,0,0,0,412,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,412,0,0,0,0,0,0,412,412,412,412,412,0,0,0,0,0,0,0,0,0,0,0,412,412,0,412,412,412,412,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,412,412,412,412,412,412,412,412,0,0,412,412,0,0,0,0,0,0,0,0,0,0,0,0,0,0,412,412,412,412,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,412,412,412,412,0,412,412,0,0,0,0,0,412,412,412,412,0,0,
+0,0,412,412,0,0,0,412,412,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,412,412,0,412,412,412,412,0,412,412,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,412,412,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,412,412,412,412,0,0,0,0,0,0,0,412,0,0,0,0,0,0
 </data>
  </layer>
 </map>
diff --git a/src/config.h b/src/config.h
index c434419..ea1b966 100644
--- a/src/config.h
+++ b/src/config.h
@@ -8,4 +8,20 @@
 
 #define USB_FEATURE 0
 
+
+#ifdef FXCG50
+    #define T_HEIGHT 16
+    #define T_WIDTH  16
+#else
+    #define T_HEIGHT 8
+    #define T_WIDTH  8
+#endif
+
+#ifdef FXCG50
+    #define PXSIZE   2
+#else
+    #define PXSIZE   1
+#endif
+
+
 #endif
diff --git a/src/map.c b/src/map.c
index dbd0ea5..977c7c0 100644
--- a/src/map.c
+++ b/src/map.c
@@ -1,4 +1,5 @@
 #include "map.h"
+#include "config.h"
 
 #include <gint/display.h>
 
diff --git a/src/map.h b/src/map.h
index 37d3eef..3b3de33 100644
--- a/src/map.h
+++ b/src/map.h
@@ -2,20 +2,6 @@
 #define MAP_H
 
 
-#ifdef FXCG50
-    #define T_HEIGHT 16
-    #define T_WIDTH  16
-#else
-    #define T_HEIGHT 8
-    #define T_WIDTH  8
-#endif
-
-#ifdef FXCG50
-    #define PXSIZE   2
-#else
-    #define PXSIZE   1
-#endif
-
 #define BACKGROUND 0
 #define FOREGROUND 1
 
diff --git a/src/mapdata.h b/src/mapdata.h
index 5af7705..e1ae6a5 100644
--- a/src/mapdata.h
+++ b/src/mapdata.h
@@ -2,6 +2,9 @@
 #define MAPDATA_H
 
 extern Map map_level0;
+extern Map map_level1;
+extern Map map_level2;
+extern Map map_level3;
 
 #endif
 
diff --git a/src/mapstruct.h b/src/mapstruct.h
index 56fe1c3..7ac7d9a 100644
--- a/src/mapstruct.h
+++ b/src/mapstruct.h
@@ -26,4 +26,23 @@ typedef struct {
 } Map;
 
 
+
+typedef struct {
+
+    /* numberof maps in the world */
+    uint16_t nbmaps;
+
+    /* table of coordinates for each map, each is a table of nbmaps elements */
+    /* area of map N is given by (xmin[N], ymin[N]) --> (xmax[N], ymax[N]) */
+    uint16_t *xmin;
+    uint16_t *ymin;
+    uint16_t *xmax;
+    uint16_t *ymax;
+
+    /* pointer to the currentmap*/
+    Map *currentmap; 
+
+} World;
+
+
 #endif
diff --git a/src/player.c b/src/player.c
index 22057da..b466f56 100644
--- a/src/player.c
+++ b/src/player.c
@@ -1,5 +1,6 @@
 #include "player.h"
 #include "map.h"
+#include "config.h"
 #include <gint/display.h>
 
 const char one_px_mov[8] = {
@@ -27,6 +28,7 @@ extern bopti_image_t demo_player_img;
 
 void player_draw(Player *player) {
     dimage(player->px-P_WIDTH/2, player->py-P_HEIGHT/2, &demo_player_img);
+    dprint( 10, 10, C_RED, "X= %d - Y= %d", player->x, player->y );
 }
 
 void player_move(Map *map_level, Player *player, Direction direction) {