Clean up main scripts

1 files changed, 22 insertions, 7 deletions

diff --git a/world/map/npc/021-1/pauline.txt b/world/map/npc/021-1/pauline.txt
index b87e4db9..d28370c4 100644
--- a/world/map/npc/021-1/pauline.txt
+++ b/world/map/npc/021-1/pauline.txt
@@ -44,9 +44,11 @@ L_Magic:
     mes "\"Ah. I see you are skilled in the Art of Astral Magic.\"";
     mes "\"Who taught you?\"";
     menu
-        "I learnt it myself!", -,
+        "I learnt it myself!", L_Next,
         "Sagatha is my teacher.", L_Sagatha,
         "You must be mistaken.", L_Close;
+
+L_Next:
     mes "\"You did? Not bad. I guess then there is nothing I can teach you. Or are you interested in sharing knowledge?\"";
     menu
         "Yes, please.", L_Spells,
@@ -85,7 +87,9 @@ L_Spells:
     next;
     menu
         "Yes. I thought you had something new to tell. [Walk Away]", L_Close,
-        "No, tell me more.", -;
+        "No, tell me more.", L_Next1;
+
+L_Next1:
     mes "[Pauline]";
     mes "\"Well I could only read the invocations. So I don't exactly know what kind of ingredients you are going to need.\"";
     mes "\"The first one for the mouboo was " + getspellinvocation("summon-mouboo") + " and the one for the pinkie was " + getspellinvocation("summon-pinkie") +".\"";
@@ -105,15 +109,19 @@ L_Ingredients:
     mes "\"Hello, have you found out what ingredients to use yet?\"";
     menu
         "Yes.", L_KnowIngredientsMouboo,
-        "No.", -;
+        "No.", L_Next2;
+
+L_Next2:
     mes "\"Okay. Come back as soon as you know.\"";
     goto L_Close;
 
 L_KnowIngredientsMouboo:
     mes "\"Did you bring them?\"";
     menu
-        "Yes." , -,
+        "Yes." , L_Next3,
         "No.", L_ComeBackLater;
+
+L_Next3:
     mes "\"Then tell me the ingredients for the mouboo summoning spell and give them to me. Start with the first ingredient and then tell me the second one separately.\"";
     next;
     mes "This is case sensitive. Also do not enter whitespaces.";
@@ -132,7 +140,9 @@ L_KnowIngredientsMouboo:
     mes "\"Do you want to give me these items?\"";
     menu
         "No.", L_ComeBackLater,
-        "Yes.", -;
+        "Yes.", L_Next4;
+
+L_Next4:
     delitem @pauline_ingredient1$, 1;
     delitem @pauline_ingredient2$, 1;
     mes "\"Okay let me try this.\"";
@@ -188,7 +198,9 @@ L_KnowIngredientsPinkie:
     mes "\"Do you want to give me these items?\"";
     menu
         "No.", L_ComeBackLater,
-        "Yes.", -;
+        "Yes.", L_Next5;
+
+L_Next5:
     delitem @pauline_ingredient1$, 1;
     delitem @pauline_ingredient2$, 1;
     mes "\"Okay, let me try this.\"";
@@ -273,8 +285,10 @@ S_Update_Mask:
     mes "Reset Quest State";
     mes @pauline_state;
     menu
-        "Yes.", -,
+        "Yes.", L_Next,
         "No.", L_Close;
+
+L_Next:
     set @pauline_state, 0;
     callsub S_Update_Mask;
     mes "Done";
@@ -293,4 +307,5 @@ S_Update_Mask:
 OnInit:
     if (!debug)
         disablenpc "PaulineDebug";
+    end;
 }