Clean up main scripts

1 files changed, 18 insertions, 12 deletions

diff --git a/world/map/npc/020-1/well.txt b/world/map/npc/020-1/well.txt
index 1bd1fafb..05db5265 100644
--- a/world/map/npc/020-1/well.txt
+++ b/world/map/npc/020-1/well.txt
@@ -27,18 +27,18 @@
     mes "...";
     menu
         "Throw something in the well.", L_trew,
-        "Leave it alone.", -;
-    close;
+        "Leave it alone.", L_Close;
 
 L_trew:
     mes "What do you want to throw?";
     menu
-        "Maggot slime", -,
-        "A raw log", -,
-        "Pile of ash", -,
-        "Bottle of water", -,
+        "Maggot slime", L_MenuItems,
+        "A raw log", L_MenuItems,
+        "Pile of ash", L_MenuItems,
+        "Bottle of water", L_MenuItems,
         "Leave it alone", L_Close;
 
+L_MenuItems:
     set @menu, @menu - 1;
 
     // little IF to do @quote$ & @Item_ID
@@ -62,10 +62,11 @@ L_trew:
     mes "\" "+ @quote$ +"\"";
     next;
     menu
-        "Who are you?", -,
-        "How did you get there?", -,
-        "Do you need help?", -;
+        "Who are you?", L_MenuItems1,
+        "How did you get there?", L_MenuItems1,
+        "Do you need help?", L_MenuItems1;
 
+L_MenuItems1:
     set @menu, @menu - 1;
         if (@menu == 0)
             set @quote$, "I'll talk about who I am after leaving the well.";
@@ -108,14 +109,16 @@ S_Update_Var:
     if(@Q_status == 2) close;
     if(@Q_status == 1)
         menu
-            "Hello.", -,
+            "Hello.", L_Close,
             "Hello, Can you help me?", L_HELP;
-    close;
+    goto L_Close;
 
 L_HELP:
     mes "[Miler]";
     mes "\"What's the problem?\"";
-    menu "Someone has fallen in the well.", -;
+    menu "Someone has fallen in the well.", L_Next;
+
+L_Next:
     mes "[Miler]";
     mes "\"Ho! I'll help him!\"";
     getexp (BaseLevel * 111), 0;
@@ -123,6 +126,9 @@ L_HELP:
     callsub S_Update_Var;
     close;
 
+L_Close:
+    close;
+
 S_Update_Var:
     set QUEST_Nivalis_state,
         (QUEST_Nivalis_state & ~(@Q_MASK)