Clean up main scripts

4 files changed, 43 insertions, 15 deletions

diff --git a/world/map/npc/009-1/jack.txt b/world/map/npc/009-1/jack.txt
index d822c1d7..48c9a26b 100644
--- a/world/map/npc/009-1/jack.txt
+++ b/world/map/npc/009-1/jack.txt
@@ -49,48 +49,66 @@ L_NotInspector:
     if (@Q_Forestbow < 1)
         goto L_Close;
     menu
-        "I heard you aren't delivering any more living wood. Why not?", -;
+        "I heard you aren't delivering any more living wood. Why not?", L_Next;
+
+L_Next:
     mes "[Jack Lumber]";
     mes "\"Why not?! I value my life, that's why!.\"";
     next;
     menu
-        "What do you mean?", -;
+        "What do you mean?", L_Next1;
+
+L_Next1:
     mes "[Jack Lumber]";
     mes "\"A week ago I was going to chop down one of those twigleaf trees in the forest to the southwest. These twigleafs are the trees that give me the living wood you speak of. I was just chopping away with my axe and what happened? One of its branches hit me! I thought it fell down or the wind blew it. It hurt! I shook it off and struck it again with my axe and another branch hit me! I got angry and started to chop off all the branches near the ground so this couldn't happen anymore. But I still can't believe what happened next.\"";
     next;
     menu
-        "What happened? ", -;
+        "What happened? ", L_Next2;
+
+L_Next2:
     mes "[Jack Lumber]";
     mes "\"You'll think I am insane when I tell you.\"";
     next;
     menu
-        "I won't. I promise.", -;
+        "I won't. I promise.", L_Next3;
+
+L_Next3:
     mes "[Jack Lumber]";
     mes "\"OK. After I chopped off a few branches the whole tree started to move. Its roots tore out of the earth, all the branches started to wave around and a face appeared on the trunk. The whole tree CAME TO LIFE! It was mad!\"";
     next;
     menu
-        "Did you run away?", -,
-        "Did you fight it?", -;
+        "Did you run away?", L_Next4,
+        "Did you fight it?", L_Next4;
+
+L_Next4:
     mes "[Jack Lumber]";
     mes "\"I fought, of course! I took my axe and attacked the beast! It hit me here *points at a bruise at his shoulder*, here *lifts his trouser leg to show another bruise* and here *lifts his shirt and reveals some even worse bruises*. But I didn't give up. I chopped away at it, branch after branch, and in the end I chopped off its roots and it fell to the ground motionless.\"";
     next;
     menu
-        "So you beat the monster? Then why are you so scared?", -;
+        "So you beat the monster? Then why are you so scared?", L_Next5;
+
+L_Next5:
     mes "[Jack Lumber]";
     mes "\"Well, I was exhausted and had to rest. A few minutes passed and suddenly I was surrounded by a dozen or more of these living trees!\"";
     next;
     menu
-        "Did you fight them, too? ", -;
+        "Did you fight them, too? ", L_Next6;
+
+L_Next6:
     mes "[Jack Lumber]";
     mes "\"Are you crazy? I barely destroyed one of those beasts. I was in no shape to fight again. I ran away as fast as I could. Lucky for me the monsters aren't that fast on their tiny root legs. Ha!\"";
     next;
     menu
-        "So you aren't chopping down trees anymore?", -;
+        "So you aren't chopping down trees anymore?", L_Next7;
+
+L_Next7:
     mes "[Jack Lumber]";
     mes "\"I still do. It's my job. But I no longer chop those twigleafs, I'll tell you that. I know the bowyer master wants some wood from them, but I don't care. I won't risk my life for a few gold pieces. If you want to, just go to the southwest. But I won't go there ever again.\"";
     next;
     menu
-        "Southwest you say? OK, thank you.", -;
+        "Southwest you say? OK, thank you.", L_Next8;
+
+L_Next8:
     set @Q_Forestbow, 2;
     callsub S_Update_Mask;
     goto L_Close;
@@ -112,9 +130,10 @@ L_Bow_state_4:
     menu
         "I couldn't afford the bow, though...", L_Shield_state_0,
         "No, I'm still looking.", L_Bow_state_4_reaffirm,
-        "Yes, I've got the Forest bow now.", -,
+        "Yes, I've got the Forest bow now.", L_Next9,
         "I'm a melee warrior, I don't need bows.", L_Shield_state_0;
 
+L_Next9:
     // Check if the player tells the truth (continue on in any case)
     if (@Q_Forestbow > 4) goto L_Shield_state_0;
 
@@ -167,8 +186,10 @@ L_Shield_state_2:
     mes "[Jack Lumber]";
     mes "\"Do you have the " + @RAWLOGS_AMOUNT + " raw logs and " + @SHIELD_COST + " GP for the shield?\"";
     menu
-        "Here it is.", -,
+        "Here it is.", L_Next10,
         "I'll come back later.", L_Close;
+
+L_Next10:
     if (countitem("RawLog") < @RAWLOGS_AMOUNT)
         goto L_Not_enough_logs;
     if (Zeny < @SHIELD_COST)
@@ -231,7 +252,7 @@ L_Shield_state_3:
 S_NohMask_Ask:
     next;
     menu
-        "I'll keep that in mind.", -,
+        "I'll keep that in mind.", L_Close,
         "Have you seen anything that might be connected to the recent robberies in town?", L_NohMask_Answer;
     return;
 
@@ -247,6 +268,7 @@ L_Made_Shield:
     mes "\"It has put me behind on all these new Nivalis orders, now that the ship is running there.\"";
     next;
     mes "\"Care to help out? I'll pay you for your time.\"";
+    goto L_Daily;
 
 L_Daily:
     set @dq_level, 30;
diff --git a/world/map/npc/009-1/milly.txt b/world/map/npc/009-1/milly.txt
index c195d9eb..4dc99cce 100644
--- a/world/map/npc/009-1/milly.txt
+++ b/world/map/npc/009-1/milly.txt
@@ -332,9 +332,10 @@ L_FinishedBad:
     callsub S_InspectorMaybe;
     mes "\"Won't you continue your travels soon?\"";
     menu
-        "That's what I'm going to do.", -,
+        "That's what I'm going to do.", L_Next,
         "I'm really sorry. Of course I want your hat!", L_Apologize;
 
+L_Next:
     mes "Milly looks away sadly.";
     goto L_Close;
 
@@ -458,4 +459,5 @@ L_Close:
 OnInit:
     if (!debug)
         disablenpc "MillyDebugHelper";
+    end;
 }
diff --git a/world/map/npc/009-1/old_woman.txt b/world/map/npc/009-1/old_woman.txt
index 7e33e034..2d70cc6d 100644
--- a/world/map/npc/009-1/old_woman.txt
+++ b/world/map/npc/009-1/old_woman.txt
@@ -17,6 +17,7 @@ L_Lower:
     mes "[Old Woman]";
     mes "\"Watch out for these flowers. They don't like to be messed with.\"";
     next;
+    goto L_Continue;
 
 L_Continue:
     if ((@inspector >= 1  && @inspector <= 7) || @inspector == 9)
@@ -47,7 +48,9 @@ L_NohMask_FirstAsk:
 
 L_NohMask_Alibi:
     menu
-        "Was your husband with you at home all night the last night that the troupe was in town?", -;
+        "Was your husband with you at home all night the last night that the troupe was in town?", L_Next;
+
+L_Next:
     mes "[Old Woman]";
     mes "\"Yes, we were both at home all night.\"";
     set @inspector, 8;
diff --git a/world/map/npc/009-1/water_pump.txt b/world/map/npc/009-1/water_pump.txt
index b582b312..8d7d5c8d 100644
--- a/world/map/npc/009-1/water_pump.txt
+++ b/world/map/npc/009-1/water_pump.txt
@@ -3,4 +3,5 @@
 009-1.gat,76,33,0|script|Water Pump|203,
 {
     callfunc "WaterBottle";
+    end;
 }