Clean up main scripts

1 files changed, 41 insertions, 37 deletions

diff --git a/world/map/npc/functions/barber.txt b/world/map/npc/functions/barber.txt
index dc7f0329..76b06dd7 100644
--- a/world/map/npc/functions/barber.txt
+++ b/world/map/npc/functions/barber.txt
@@ -26,6 +26,7 @@ function|script|Barber|,
     mes "Your current style is " + @style$ + " and your current color is " + @color$ + ".";
     set @style$, "";
     set @color$, "";
+    goto L_Main;
 
 L_Main:
     menu
@@ -35,29 +36,30 @@ L_Main:
 
 L_Style:
     menu
-        "Bald", -,
-        "Flat ponytail", -,
-        "Bowl cut", -,
-        "Combed back", -,
-        "Emo", -,
-        "Mohawk", -,
-        "Pompadour", -,
-        "Center parting/Short and slick", -,
-        "Long and slick", -,
-        "Short and curly", -,
-        "Pigtails", -,
-        "Long and curly", -,
-        "Parted", -,
-        "Perky ponytail", -,
-        "Wave", -,
-        "Mane", -,
-        "Bun", -,
-        "Shoulder Length Flick", -,
-        "Fizzy", -,
-        "Long and Clipped", -,
+        "Bald", L_MenuItems,
+        "Flat ponytail", L_MenuItems,
+        "Bowl cut", L_MenuItems,
+        "Combed back", L_MenuItems,
+        "Emo", L_MenuItems,
+        "Mohawk", L_MenuItems,
+        "Pompadour", L_MenuItems,
+        "Center parting/Short and slick", L_MenuItems,
+        "Long and slick", L_MenuItems,
+        "Short and curly", L_MenuItems,
+        "Pigtails", L_MenuItems,
+        "Long and curly", L_MenuItems,
+        "Parted", L_MenuItems,
+        "Perky ponytail", L_MenuItems,
+        "Wave", L_MenuItems,
+        "Mane", L_MenuItems,
+        "Bun", L_MenuItems,
+        "Shoulder Length Flick", L_MenuItems,
+        "Fizzy", L_MenuItems,
+        "Long and Clipped", L_MenuItems,
         "Surprise me", L_RandomStyle,
         "Nah, I'm fine", L_Done;
 
+L_MenuItems:
     if (@menu - 1 == @style)
         goto L_SameStyle;
 
@@ -74,22 +76,23 @@ L_SameStyle:
 
 L_Color:
     menu
-        "Brunette", -,
-        "Green", -,
-        "Dark red", -,
-        "Light purple", -,
-        "Gray", -,
-        "Blonde", -,
-        "Teal", -,
-        "Light red", -,
-        "Blue", -,
-        "Dark purple", -,
-        "Black", -,
-        "Pink", -,
-        "Brown", -,
+        "Brunette", L_MenuItems1,
+        "Green", L_MenuItems1,
+        "Dark red", L_MenuItems1,
+        "Light purple", L_MenuItems1,
+        "Gray", L_MenuItems1,
+        "Blonde", L_MenuItems1,
+        "Teal", L_MenuItems1,
+        "Light red", L_MenuItems1,
+        "Blue", L_MenuItems1,
+        "Dark purple", L_MenuItems1,
+        "Black", L_MenuItems1,
+        "Pink", L_MenuItems1,
+        "Brown", L_MenuItems1,
         "Surprise me", L_RandomColor,
         "Nah, I'm fine", L_Done;
 
+L_MenuItems1:
     if (@menu - 1 == @color)
         goto L_SameColor;
 
@@ -112,10 +115,11 @@ L_Done:
     return;
 }
 
-// Since this is a function, not an NPC, OnInit doesn't work
-// So call this from a real NPC's OnInit (001-1/barber.txt)
-function|script|OnInitBarber|,
+-|script|#BarberConfig|-1,
 {
+    end;
+
+OnInit:
     setarray $@HairStyles$,
         "Bald", "Flat ponytail", "Bowl cut", "Combed back", "Emo", "Mohawk",
         "Pompadour", "Center parting/Short and slick", "Long and slick",
@@ -126,5 +130,5 @@ function|script|OnInitBarber|,
         "Brunette", "Green", "Dark red", "Light purple", "Gray", "Blonde",
         "Teal", "Light red", "Blue", "Dark purple", "Black", "Pink",
         "Brown";
-    return;
+    end;
 }