summaryrefslogtreecommitdiff
path: root/maps/001-1.tmx
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2020-05-24 13:01:12 -0300
committerJesusaves <cpntb1@ymail.com>2020-05-24 13:01:12 -0300
commitae237876913c5be808ec97fbf27e47b3500672e0 (patch)
treeb7fbc7507b39f0403a743664c6d40a1436e2c577 /maps/001-1.tmx
parent9ed33459a253f444973d2e633ba0f62d1c5d8dd7 (diff)
parentfcc3ed1968d71f0b2086fea1595fc86f0787ca13 (diff)
downloadclientdata-tulimmap.tar.gz
clientdata-tulimmap.tar.bz2
clientdata-tulimmap.tar.xz
clientdata-tulimmap.zip
Merge branch 'master' into tulimmap without silly conflictstulimmap
Diffstat (limited to 'maps/001-1.tmx')
-rw-r--r--maps/001-1.tmx4
1 files changed, 2 insertions, 2 deletions
diff --git a/maps/001-1.tmx b/maps/001-1.tmx
index b7bac5c5..3fb779cb 100644
--- a/maps/001-1.tmx
+++ b/maps/001-1.tmx
@@ -1905,7 +1905,7 @@
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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>
- <objectgroup id="11" name="Object" visible="0">
+ <objectgroup id="11" name="Object">
<object id="1" name="To Library" type="warp" x="1632" y="2560" width="32" height="32">
<properties>
<property name="dest_map" value="001-2-4"/>
@@ -1989,7 +1989,7 @@
<properties>
<property name="dest_map" value="001-2-28"/>
<property name="dest_x" value="29"/>
- <property name="dest_y" value="42"/>
+ <property name="dest_y" value="41"/>
<property name="npc_id" value="NPC_ARTIS_DOOR"/>
<property name="trigger_x" value="2"/>
<property name="trigger_y" value="3"/>