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

Tile map fixes sprite travel

1 files changed, 21 insertions, 3 deletions

diff --git a/world/map/npc/029-1/dock.txt b/world/map/npc/029-1/dock.txt
index a049d68e..8df50b9d 100644
--- a/world/map/npc/029-1/dock.txt
+++ b/world/map/npc/029-1/dock.txt
@@ -1,8 +1,26 @@
 // The ferry dock
 
-029-1.gat,22,37,0|script|#candordock|45,2,1,
+// Ferry Sign
+029-1.gat,27,36,0|script|Ferry Schedule#8|397,
 {
-    set @loc, DOCK_candor;
-    callfunc "Ferry";
+    callfunc "FerryManifest";
+    end;
+}
+
+029-1.gat,16,36,0|script|Candor Koga|395,6,2,
+{
+    callfunc "BoardCandorFerry";
+    close;
+}
+
+029-1.gat,22,37,0|script|#CandorDock|45,
+{
+    end;
+OnCommandArrive:
+    enablenpc "Candor Koga";
+    end;
+
+OnCommandWarp:
+    disablenpc "Candor Koga";
     end;
 }