Clean up main scripts

1 files changed, 21 insertions, 21 deletions

diff --git a/world/map/npc/009-2/alan.txt b/world/map/npc/009-2/alan.txt
index 22f2fbc1..ba9e1f30 100644
--- a/world/map/npc/009-2/alan.txt
+++ b/world/map/npc/009-2/alan.txt
@@ -32,21 +32,22 @@
     next;
     if (@inspector == 1)
         menu
-            "OK, thanks.", -,
+            "OK, thanks.", L_Close,
             "Can you make me a really good bow?", L_State_0_1,
             "Have you seen anything strange recently that might be connected to the robberies?", L_NohMask_Answer;
-    if (@inspector != 1)
+    //else
         menu
-            "OK, thanks.", -,
+            "OK, thanks.", L_Close,
             "Can you make me a really good bow?", L_State_0_1;
-    goto L_Close;
 
 L_State_0_1:
     mes "[Alan]";
     mes "\"You mean like one of my legendary forest bows?\"";
     next;
     menu
-        "Yes, that would be nice.", -;
+        "Yes, that would be nice.", L_Next;
+
+L_Next:
     mes "[Alan]";
     mes "\"Sorry, I am not making these anymore.\"";
     next;
@@ -72,7 +73,7 @@ L_State_0_3:
     next;
     menu
         "OK, I'll ask him.", L_Close,
-        "I am sure he got his reasons.", -;
+        "I am sure he got his reasons.", L_State_1;
 
 L_State_1:
     mes "[Alan]";
@@ -80,14 +81,13 @@ L_State_1:
     next;
     if (@inspector == 1)
         menu
-            "No, I haven't had the time yet.", -,
+            "No, I haven't had the time yet.", L_Close,
             "No, I didn't find him yet.", L_State_1_1,
             "Have you seen anything strange recently that might be connected to the robberies?", L_NohMask_Answer;
-    if (@inspector != 1)
+    //else
         menu
-            "No, I haven't had the time yet.", -,
+            "No, I haven't had the time yet.", L_Close,
             "No, I didn't find him yet.", L_State_1_1;
-    goto L_Close;
 
 L_State_1_1:
     mes "[Alan]";
@@ -100,11 +100,12 @@ L_State_2:
     next;
     if (@inspector == 1)
         menu
-            "Yes, I did. He said that the trees turned into dangerous monsters.", -,
+            "Yes, I did. He said that the trees turned into dangerous monsters.", L_Foo,
             "Have you seen anything strange recently that might be connected to the robberies?", L_NohMask_Answer;
-    if (@inspector != 1)
+    //else
         menu
-            "Yes, I did. He said that the trees turned into dangerous monsters.", -;
+            "Yes, I did. He said that the trees turned into dangerous monsters.", L_Foo;
+L_Foo:
     mes "[Alan]";
     mes "\"Oh, that's really bad news. Maybe you can do his job?";
     mes "When you kill some of these tree monsters and bring me their wood I can take a look at them.";
@@ -122,13 +123,12 @@ L_State_3:
     if (@inspector == 1)
         menu
             "Here, take a look!", L_State_3_try,
-            "Yes, but I need it for something else.", -,
+            "Yes, but I need it for something else.", L_Close,
             "Have you seen anything strange recently that might be connected to the robberies?", L_NohMask_Answer;
-    if (@inspector != 1)
+    //else
         menu
             "Here, take a look!", L_State_3_try,
-            "Yes, but I need it for something else.", -;
-    goto L_Close;
+            "Yes, but I need it for something else.", L_Close;
 
 L_State_3_try:
     if (countitem("RawLog") < 1)
@@ -160,6 +160,7 @@ L_State_3_success:
     next;
     set @Q_status, 4;
     callsub S_Update_Var;
+    goto L_State_4;
 
 L_State_4:
     mes "[Alan]";
@@ -167,14 +168,13 @@ L_State_4:
     next;
     if (@inspector == 1)
         menu
-            "10,000??? What a ripoff!", -,
+            "10,000??? What a ripoff!", L_Close,
             "Sure, here you go!", L_State_4_pay,
             "Have you seen anything strange recently that might be connected to the robberies?", L_NohMask_Answer;
-    if (@inspector != 1)
+    //else
         menu
-            "10,000??? What a ripoff!", -,
+            "10,000??? What a ripoff!", L_Close,
             "Sure, here you go!", L_State_4_pay;
-    goto L_Close;
 
 L_State_4_pay:
     if (Zeny < 10000)