Merge pull request #61 from wushin/Tile-Fixes-Map-Travel

Tile map fixes travel Sprite 1.5

1 files changed, 17 insertions, 17 deletions

diff --git a/maps/046-1.tmx b/maps/046-1.tmx
index f27b1c37..00407e8a 100644
--- a/maps/046-1.tmx
+++ b/maps/046-1.tmx
@@ -29,11 +29,11 @@
   <property name="overlay5scrollY" value="2.3"/>
  </properties>
  <tileset firstgid="1" source="../tilesets/collision.tsx"/>
- <tileset firstgid="3" source="../tilesets/Snow.tsx"/>
- <tileset firstgid="259" source="../tilesets/Snow_x2.tsx"/>
- <tileset firstgid="275" source="../tilesets/Snow_tree_x3.tsx"/>
- <tileset firstgid="279" source="../tilesets/Snow_village2.tsx"/>
- <layer name="Ground_back" width="178" height="128">
+ <tileset firstgid="3" source="../tilesets/snow.tsx"/>
+ <tileset firstgid="259" source="../tilesets/snow_x2.tsx"/>
+ <tileset firstgid="275" source="../tilesets/snow_tree_x3.tsx"/>
+ <tileset firstgid="279" source="../tilesets/snow_village2.tsx"/>
+ <layer name="Ground1" width="178" height="128">
   <data encoding="csv">
 148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,
 148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,
@@ -165,7 +165,7 @@
 86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86
 </data>
  </layer>
- <layer name="Ground" width="178" height="128">
+ <layer name="Ground2" width="178" height="128">
   <data encoding="csv">
 148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,150,148,148,148,148,148,148,148,148,148,147,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,147,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,149,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,
 148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,149,148,148,148,148,148,148,148,148,147,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,147,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,149,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,
@@ -429,7 +429,7 @@
 275,0,0,275,0,0,0,0,0,276,0,0,0,0,0,0,276,0,275,0,0,0,0,0,0,0,0,0,0,0,275,0,0,0,0,275,0,276,0,277,0,0,0,0,0,0,0,0,0,0,0,0,277,0,0,0,0,0,0,0,275,0,277,0,0,275,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,261,262,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,277,0,276,0,277,0,0,276,0,0,276,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,277,0,0,0,0,0,0,0,0,0,0,277,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,275,0,0,0,0,0,0,0
 </data>
  </layer>
- <layer name="Over" width="178" height="128">
+ <layer name="Over1" width="178" height="128">
   <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,150,133,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -825,7 +825,7 @@
 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,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,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
 </data>
  </layer>
- <objectgroup name="Objects" width="178" height="128" visible="0">
+ <objectgroup name="Objects" visible="0">
   <object name="Reinboo" type="spawn" x="0" y="0">
    <properties>
     <property name="eA_death" value="30000"/>
@@ -882,63 +882,63 @@
     <property name="monster_id" value="93"/>
    </properties>
   </object>
-  <object name="ToSnowForest" type="warp" x="3008" y="3744" width="64" height="32">
+  <object name="To Snow Forest" type="warp" x="3008" y="3744" width="64" height="32">
    <properties>
     <property name="dest_map" value="034-1"/>
     <property name="dest_tile_x" value="94"/>
     <property name="dest_tile_y" value="19"/>
    </properties>
   </object>
-  <object name="ToHighlands1" type="warp" x="928" y="416" width="32" height="32">
+  <object name="To Highlands" type="warp" x="928" y="416" width="32" height="32">
    <properties>
     <property name="dest_map" value="047-1"/>
     <property name="dest_tile_x" value="34"/>
     <property name="dest_tile_y" value="112"/>
    </properties>
   </object>
-  <object name="ToHighlands1" type="warp" x="992" y="416" width="32" height="32">
+  <object name="To Highlands" type="warp" x="992" y="416" width="32" height="32">
    <properties>
     <property name="dest_map" value="047-1"/>
     <property name="dest_tile_x" value="36"/>
     <property name="dest_tile_y" value="112"/>
    </properties>
   </object>
-  <object name="ToFrostyUnderground" type="warp" x="2496" y="960" width="32" height="32">
+  <object name="To Frosty Underground" type="warp" x="2496" y="960" width="32" height="32">
    <properties>
     <property name="dest_map" value="046-3"/>
     <property name="dest_tile_x" value="78"/>
     <property name="dest_tile_y" value="29"/>
    </properties>
   </object>
-  <object name="ToFrostyUnderground" type="warp" x="4192" y="1536" width="32" height="32">
+  <object name="To Frosty Underground" type="warp" x="4192" y="1536" width="32" height="32">
    <properties>
     <property name="dest_map" value="046-3"/>
     <property name="dest_tile_x" value="131"/>
     <property name="dest_tile_y" value="47"/>
    </properties>
   </object>
-  <object name="ToFrostyUnderground" type="warp" x="4192" y="1760" width="32" height="32">
+  <object name="To Frosty Underground" type="warp" x="4192" y="1760" width="32" height="32">
    <properties>
     <property name="dest_map" value="046-3"/>
     <property name="dest_tile_x" value="131"/>
     <property name="dest_tile_y" value="54"/>
    </properties>
   </object>
-  <object name="ToFrostyUnderground" type="warp" x="4448" y="608" width="32" height="32">
+  <object name="To Frosty Underground" type="warp" x="4448" y="608" width="32" height="32">
    <properties>
     <property name="dest_map" value="046-3"/>
     <property name="dest_tile_x" value="139"/>
     <property name="dest_tile_y" value="18"/>
    </properties>
   </object>
-  <object name="ToFrostyUnderground" type="warp" x="2656" y="1376" width="32" height="32">
+  <object name="To Frosty Underground" type="warp" x="2656" y="1376" width="32" height="32">
    <properties>
     <property name="dest_map" value="046-3"/>
     <property name="dest_tile_x" value="83"/>
     <property name="dest_tile_y" value="42"/>
    </properties>
   </object>
-  <object name="ToFrostyUnderground" type="warp" x="3968" y="3488" width="32" height="32">
+  <object name="To Frosty Underground" type="warp" x="3968" y="3488" width="32" height="32">
    <properties>
     <property name="dest_map" value="046-3"/>
     <property name="dest_tile_x" value="124"/>