diff options
| author | Fate <fate-tmw@googlemail.com> | 2008-11-23 00:23:50 -0700 |
|---|---|---|
| committer | Fate <fate-tmw@googlemail.com> | 2008-11-23 00:23:50 -0700 |
| commit | 5e3b3ca60fd86cc0872901dcd888d20077c040a0 (patch) | |
| tree | c4260b129e4ca6105559017fa09f3c02294fd397 /maps/013-1.tmx | |
| parent | a1d23a0a3dae86aa3a20a0fe3fbb4e953045427a (diff) | |
| parent | c3a4cf5300255bb08c50827b89baceccc42bdd3a (diff) | |
| download | clientdata-5e3b3ca60fd86cc0872901dcd888d20077c040a0.tar.gz clientdata-5e3b3ca60fd86cc0872901dcd888d20077c040a0.tar.bz2 clientdata-5e3b3ca60fd86cc0872901dcd888d20077c040a0.tar.xz clientdata-5e3b3ca60fd86cc0872901dcd888d20077c040a0.zip | |
Merge branch 'real-master' into fresh-master
Conflicts:
graphics/sprites/head-deserthat.xml
Diffstat (limited to 'maps/013-1.tmx')
| -rw-r--r-- | maps/013-1.tmx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/maps/013-1.tmx b/maps/013-1.tmx index 295ad7f4..3ab3c883 100644 --- a/maps/013-1.tmx +++ b/maps/013-1.tmx @@ -59,8 +59,8 @@ <object name="ToWoodlandHills" type="warp" x="640" y="2368" width="32" height="128"> <properties> <property name="dest_map" value="012-1"/> - <property name="dest_x" value="4768"/> - <property name="dest_y" value="2520"/> + <property name="dest_x" value="4736"/> + <property name="dest_y" value="1920"/> </properties> </object> <object name="ToWoodland" type="warp" x="1408" y="672" width="96" height="32"> |