Clean up main scripts

2 files changed, 24 insertions, 9 deletions

diff --git a/world/map/npc/042-1/hasan.txt b/world/map/npc/042-1/hasan.txt
index 581eb83a..fa27b305 100644
--- a/world/map/npc/042-1/hasan.txt
+++ b/world/map/npc/042-1/hasan.txt
@@ -27,11 +27,14 @@
     mes "\"Hey! You can't pass here.\"";
     next;
     menu
-        "Why not?",-,
-        "Who says that?",-;
+        "Why not?",L_Next,
+        "Who says that?",L_Next;
+
+L_Next:
     mes "[Unfriendly Guy]";
     mes "\"I, Hasan the Mighty, have decided to put a toll on this path.\"";
     next;
+    goto L_Toll;
 
 L_Toll:
     mes "[Hasan]";
@@ -87,7 +90,9 @@ L_Trick:
     next;
     menu
         "I don't have that much money!",L_NoPay,
-        "No. (Scratch your head.)",-;
+        "No. (Scratch your head.)",L_ScratchHead;
+
+L_ScratchHead:
     if ($@ScorpionFighter)
         goto L_Wait;
     mes "While you're scratching your head, you see Kaan coming nearer to the cliff above you.";
@@ -117,8 +122,10 @@ L_Thank:
     mes "\"You want to go to the bazaar, right? Shall I tell you how to get there?\"";
     next;
     menu
-        "Sure, thanks.",-,
+        "Sure, thanks.",L_HasanThanks,
         "I'll try to find the way myself.",L_Explore;
+
+L_HasanThanks:
     mes "[Hasan]";
     mes "\"Ok, when you leave here follow the road past the docks until you reach the old city gates.\"";
     next;
diff --git a/world/map/npc/042-1/kaan.txt b/world/map/npc/042-1/kaan.txt
index 027e5895..a5f9f530 100644
--- a/world/map/npc/042-1/kaan.txt
+++ b/world/map/npc/042-1/kaan.txt
@@ -39,8 +39,9 @@ L_Tanisha:
         goto L_Close;
     next;
     menu
-        "Yes, I helped her with the maggots.",-,
-        "Yeah, and she's done with the maggots.",-;
+        "Yes, I helped her with the maggots.",L_Tanisha3,
+        "Yeah, and she's done with the maggots.",L_Tanisha3;
+
 L_Tanisha3:
     mes "[Kaan]";
     mes "\"Ah, that is good news.";
@@ -56,8 +57,10 @@ L_Tanisha3:
     mes "\"I built the fence down south of here to keep them out.\"";
     next;
     menu
-        "Impressive! Just a bit... skewed.",-,
-        "Wow, it looks very - ahm, unconventional.",-;
+        "Impressive! Just a bit... skewed.",L_Next,
+        "Wow, it looks very - ahm, unconventional.",L_Next;
+
+L_Next:
     mes "[Kaan]";
     mes "\"Well, it keeps the scorpions out. That's all that matters.\"";
     next;
@@ -74,6 +77,7 @@ L_Tanisha3:
         menu
             "A guy named Hasan won't let me enter Tulimshar.",L_Hasan,
             "Thanks for the advice.",L_Close;
+    goto L_Out;
 
 L_Out:
     mes "[Kaan]";
@@ -97,6 +101,7 @@ L_Hasan:
     mes "\"We should think about some kind of trick. Ah, if only I knew his weak point.\"";
     set kaan, 3;
     next;
+    goto L_Trick;
 
 L_Trick:
     mes "[Kaan]";
@@ -106,12 +111,15 @@ L_Trick:
         goto L_Close;
     next;
     menu
-        "He's afraid of scorpions.",-,
+        "He's afraid of scorpions.",L_Continue,
         "No idea.",L_Close;
+
+L_Continue:
     mes "[Kaan]";
     mes "\"Scorpions?! Right! How could I forget?";
     mes "When he was a child, he nearly died because he fell into a scorpion nest.\"";
     next;
+    goto L_Explain;
 
 L_Explain:
     mes "\"Ok, then here's the plan:";