Merge pull request #79 from wushin/Tile-Fixes-Map-Travelv2014.4.16

Tile map fixes sprite travel

4 files changed, 7 insertions, 5 deletions

diff --git a/world/map/npc/002-4/_import.txt b/world/map/npc/002-4/_import.txt
index 09530371..1e4dad6c 100644
--- a/world/map/npc/002-4/_import.txt
+++ b/world/map/npc/002-4/_import.txt
@@ -3,6 +3,7 @@
 map: 002-4.gat
 npc: npc/002-4/_mobs.txt
 npc: npc/002-4/_warps.txt
+npc: npc/002-4/mapflags.txt
 npc: npc/002-4/mine_triggerone.txt
 npc: npc/002-4/mine_triggerthree.txt
 npc: npc/002-4/mine_triggertwo.txt
diff --git a/world/map/npc/002-4/_warps.txt b/world/map/npc/002-4/_warps.txt
index 072d2ba2..900b8d5e 100644
--- a/world/map/npc/002-4/_warps.txt
+++ b/world/map/npc/002-4/_warps.txt
@@ -1,4 +1,4 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 // Desert Mines warps
 
-002-4.gat,37,29|warp|To Mining camp|-1,-1,002-3.gat,82,30
+002-4.gat,37,29|warp|To Mining Camp|-1,-1,002-3.gat,82,30
diff --git a/world/map/npc/002-4/mapflags.txt b/world/map/npc/002-4/mapflags.txt
new file mode 100644
index 00000000..7fdafe55
--- /dev/null
+++ b/world/map/npc/002-4/mapflags.txt
@@ -0,0 +1 @@
+002-4.gat|mapflag|resave|002-3,72,66
diff --git a/world/map/npc/002-4/naem.txt b/world/map/npc/002-4/naem.txt
index 398ef514..1d3b1d2c 100644
--- a/world/map/npc/002-4/naem.txt
+++ b/world/map/npc/002-4/naem.txt
@@ -132,14 +132,14 @@ L_Naem_Gloves:
     mes "\"Hey, good job on getting that together!  Take these gloves, they might prove useful in the underground palace.\"";
     goto L_Close;
 
-L_Naem_TooMany:
+L_Naem_Complete:
     mes "[Naem]";
-    mes "\"You have too many items for me to give you a reward.\"";
+    mes "\"Yo-ho-ho, a miner's life for me!\"";
     goto L_Close;
 
-L_Naem_Complete:
+L_Naem_TooMany:
     mes "[Naem]";
-    mes "\"Yo-ho-ho, a miner's life for me!\"";
+    mes "\"You have too many items for me to give you a reward.\"";
     goto L_Close;
 
 L_Close: