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

Tile map fixes sprite travel

1 files changed, 5 insertions, 11 deletions

diff --git a/world/map/npc/001-1/luca.txt b/world/map/npc/001-1/luca.txt
index 61d27cd4..84d9491b 100644
--- a/world/map/npc/001-1/luca.txt
+++ b/world/map/npc/001-1/luca.txt
@@ -60,12 +60,9 @@ L_Next:
     menu
         "Yeah!", L_teach0_follow,
         "Certainly!", L_teach0_follow,
-        "Wait... what do you mean?", L_CallExplain,
-        "Please explain some more.", L_CallExplain,
+        "Wait... what do you mean?", L_Explain,
+        "Please explain some more.", L_Explain,
         "No.", L_Nev;
-L_CallExplain:
-    callsub S_explain;
-    goto L_teach0_follow;
 
 L_teach0_follow:
     mes "[Luca the Hunter]";
@@ -138,7 +135,7 @@ L_wronganswer:
     mes "\"No, that was wrong. I suppose you're not as experienced as I thought you'd be.\"";
     goto L_Close;
 
-S_explain:
+L_Explain:
     mes "[Luca the Hunter]";
     mes "\"Alright, what do you want to know?\"";
     next;
@@ -149,9 +146,7 @@ L_Explain_loop:
         "What's skill focus?", L_explain_focus,
         "What skills are there?", L_explain_skills,
         "How do skills work?", L_explain_work,
-        "Thanks, I think I got it!", L_Return;
-L_Return:
-    return;
+        "Thanks, I think I got it!", L_Next;
 
 L_explain_focus:
     mes "[Luca the Hunter]";
@@ -292,8 +287,7 @@ L_MenuItems:
     goto L_Close;
 
 L_teachmore_explain:
-    callsub S_explain;
-    goto L_teachmore2;
+    goto L_Explain;
 
 L_focus:
     getunactivatedpoolskilllist;