Clean up main scripts

3 files changed, 166 insertions, 114 deletions

diff --git a/world/map/npc/011-1/alchemist.txt b/world/map/npc/011-1/alchemist.txt
index 6b47eb07..9b0dc795 100644
--- a/world/map/npc/011-1/alchemist.txt
+++ b/world/map/npc/011-1/alchemist.txt
@@ -44,6 +44,7 @@
     set @menuitems$[@c], "Mana potion.";
     set @menuID[@c], @CHOICE_MANA_POTION;
     set @c, @c + 1;
+    goto L_post_mana_potion_c;
 
 L_post_mana_potion_c:
     if (QUEST_clothdyer_knowsdye >= @QUEST_CAN_GET_DYE_HERE)
@@ -71,6 +72,7 @@ L_pre_dyeing:
     set @menuitems$[@c], "Actually, can you make dye?";
     set @menuID[@c], @CHOICE_DYEING_INTRO;
     set @c, @c + 1;
+    goto L_certain_condition;
 
 L_certain_condition:
     if (!@wants_sulphur)
@@ -78,6 +80,7 @@ L_certain_condition:
     set @menuitems$[@c], "Can you make sulphur powder?";
     set @menuID[@c], @CHOICE_SULPHUR_POWDER;
     set @c, @c + 1;
+    goto L_post_sulphur_option;
 
 L_post_sulphur_option:
     if (!@wants_ironpowder)
@@ -85,6 +88,7 @@ L_post_sulphur_option:
     set @menuitems$[@c], "Can you make iron powder?";
     set @menuID[@c], @CHOICE_IRON_POWDER;
     set @c, @c + 1;
+    goto L_post_ironpowder_option;
 
 L_post_ironpowder_option:
     if (@Q_status == @SETZER_INITIAL)
@@ -92,24 +96,27 @@ L_post_ironpowder_option:
     set @menuitems$[@c], "Can you make monster oil?";
     set @menuID[@c], @CHOICE_MONSTER_OIL;
     set @c, @c + 1;
+    goto L_post_monster_oil;
 
 L_post_monster_oil:
     set @menuitems$[@c], "No thanks.";
     set @menuID[@c], @CHOICE_ABORT;
     set @c, @c + 1;
+    goto L_main_menu;
 
 L_main_menu:
 
     menu
-        @menuitems$[0], -,
-        @menuitems$[1], -,
-        @menuitems$[2], -,
-        @menuitems$[3], -,
-        @menuitems$[4], -,
-        @menuitems$[5], -,
-        @menuitems$[6], -,
-        @menuitems$[7], -;
-
+        @menuitems$[0], L_MenuItems,
+        @menuitems$[1], L_MenuItems,
+        @menuitems$[2], L_MenuItems,
+        @menuitems$[3], L_MenuItems,
+        @menuitems$[4], L_MenuItems,
+        @menuitems$[5], L_MenuItems,
+        @menuitems$[6], L_MenuItems,
+        @menuitems$[7], L_MenuItems;
+
+L_MenuItems:
     set @menu, @menu - 1;
 
     if (@menu >= @c)
@@ -140,7 +147,9 @@ L_iron_powder:
     next;
     menu
         "Never mind.", L_abort,
-        "Here you are!", -;
+        "Here you are!", L_Next;
+
+L_Next:
     if (countitem("IronOre") < 1)
         goto L_iron_powder_noore;
     if (Zeny < 100)
@@ -183,8 +192,9 @@ L_sulphur:
     menu
         "I will be back.", L_abort,
         "No, I won't!", L_abort,
-        "Here you are!", -;
+        "Here you are!", L_Next1;
 
+L_Next1:
     if (countitem("PileOfAsh") < 3)
         goto L_sulphur_noash;
     if (countitem("MauveHerb") < 3)
@@ -234,7 +244,6 @@ L_mana_potion:
     menu
         "Here you are!", L_get_mana_potion,
         "Never mind.", L_main_menu;
-    goto L_main_menu;
 
 L_get_mana_potion:
     if(countitem("MauveHerb") < 30)
@@ -344,10 +353,12 @@ L_dyeing_intro:
     mes "Rauk seems to be lost in his thoughts.";
     next;
     menu
-        "I only want to dye clothes, though...", -,
+        "I only want to dye clothes, though...", L_Next2,
         "What's a 'Wumpus egg'?", L_wumpus_egg_intro,
         "What's an 'Obsidian Spork'?", L_obsidian_spork_intro,
         "Er, never mind...", L_abort;
+
+L_Next2:
     mes "[Rauk the Alchemist]";
     mes "\"Oh, just for clothes? Well, that is easy. I can make red, yellow, light blue, orange, pink, green, dark blue, black and purple dye, if you can get me the ingredients for it.\"";
     next;
@@ -385,7 +396,6 @@ L_pick_colour:
         "Purple", L_purple,
         "Dark Green", L_dark_green,
         "Nothing, really.", L_abort;
-    close;
 
 L_description:
     mes "[Rauk the Alchemist]";
@@ -395,6 +405,7 @@ L_description:
     mes "\"Some of the colors need more ingredients, including some that you can't find here, so I have to charge money for them.";
     mes "Oh, and for a proper dark blue and purple I also need a pearl; without pearl dust they would not shimmer properly.\"";
     next;
+    goto L_description_quick;
 
 L_description_quick:
     menu
@@ -408,7 +419,9 @@ L_description_quick:
         "What do you need for black dye?", L_d_black,
         "What do you need for purple dye?", L_d_purple,
         "What do you need for dark green dye?", L_d_dark_green,
-        "Actually...", -;
+        "Actually...", L_NextMenu;
+
+L_NextMenu:
     menu
         "Can you make some dye for me, please?", L_pick_colour,
         "Where can I get the herbs?", L_d_herbs,
@@ -417,7 +430,6 @@ L_description_quick:
         "Where can I find a pearl?", L_d_pearl,
         "Where can I find maggot slime?", L_d_maggot_slime,
         "I see. Thank you, and a good day to you!", L_abort;
-    close;
 
 L_d_herbs:
     mes "[Rauk the Alchemist]";
@@ -454,7 +466,6 @@ L_intermediate:
         "Can you make some dye for me?", L_pick_colour,
         "Can you describe the ingredients?", L_description_quick,
         "Never mind.", L_abort;
-    close;
 
 L_ok:
     mes "[Rauk the Alchemist]";
@@ -810,6 +821,7 @@ L_d_dark_green_quest:
     next;
     if (QUEST_clothdyer_knowsdye == @QUEST_CAN_GET_DYE_HERE)
         set QUEST_clothdyer_knowsdye, (rand(1000) + @QUEST_GUESS_BASE);
+    goto L_d_dark_green_q_main;
 
 L_d_dark_green_q_main:
     menu
@@ -817,7 +829,6 @@ L_d_dark_green_q_main:
         "So nobody else can wear clothes I dye?", L_dark_green_q_wear,
         "OK, what should I do?", L_dark_green_q_explain,
         "Let's figure it out!", L_dark_green_q_guess_0;
-    close;
 
 L_dark_green_q_wear:
     mes "[Rauk the Alchemist]";
@@ -841,7 +852,6 @@ L_dark_green_q_explain2:
         "Er... can you explain that again?", L_dark_green_q_explain2,
         "Let's do it!", L_dark_green_q_guess_0,
         "I don't have time for this.", L_intermediate;
-    close;
 
 L_dark_green_q_explain:
     mes "[Rauk the Alchemist]";
@@ -861,7 +871,7 @@ L_dark_green_q_explain:
     menu
         "Er... can you explain that again?", L_dark_green_q_explain,
         "Errr... what?", L_dark_green_q_explain2,
-        "Let's do it!", -,
+        "Let's do it!", L_dark_green_q_guess_0,
         "I don't have time for this.", L_intermediate;
 
 L_dark_green_q_guess_0:
@@ -874,17 +884,18 @@ L_dark_green_q_guess_0:
     mes "\"Now we need to figure out just how many thousandths you need. First, tell me how many tenths of an ounce you want to put in.\"";
     next;
     menu
-        "none", -,
-        "1 tenth", -,
-        "2 tenths", -,
-        "3 tenths", -,
-        "4 tenths", -,
-        "5 tenths", -,
-        "6 tenths", -,
-        "7 tenths", -,
-        "8 tenths", -,
-        "9 tenths", -;
-
+        "none", L_MenuItems1,
+        "1 tenth", L_MenuItems1,
+        "2 tenths", L_MenuItems1,
+        "3 tenths", L_MenuItems1,
+        "4 tenths", L_MenuItems1,
+        "5 tenths", L_MenuItems1,
+        "6 tenths", L_MenuItems1,
+        "7 tenths", L_MenuItems1,
+        "8 tenths", L_MenuItems1,
+        "9 tenths", L_MenuItems1;
+
+L_MenuItems1:
     set @menu, @menu - 1;
     set @guess_accumulator, @menu * 100;
 
@@ -894,17 +905,18 @@ L_dark_green_q_guess_0:
     mes "\"We now have " + @guess_accumulator + " thousandths of an ounce. How many hundredths of an ounce should I add?\"";
     next;
     menu
-        "none", -,
-        "1 hundredth", -,
-        "2 hundredths", -,
-        "3 hundredths", -,
-        "4 hundredths", -,
-        "5 hundredths", -,
-        "6 hundredths", -,
-        "7 hundredths", -,
-        "8 hundredths", -,
-        "9 hundredths", -;
-
+        "none", L_MenuItems2,
+        "1 hundredth", L_MenuItems2,
+        "2 hundredths", L_MenuItems2,
+        "3 hundredths", L_MenuItems2,
+        "4 hundredths", L_MenuItems2,
+        "5 hundredths", L_MenuItems2,
+        "6 hundredths", L_MenuItems2,
+        "7 hundredths", L_MenuItems2,
+        "8 hundredths", L_MenuItems2,
+        "9 hundredths", L_MenuItems2;
+
+L_MenuItems2:
     set @menu, @menu - 1;
     set @guess_accumulator, @guess_accumulator + (@menu * 10);
 
@@ -914,17 +926,18 @@ L_dark_green_q_guess_0:
     mes "\"These are now " + @guess_accumulator + " thousandths of an ounce. How many thousands more?\"";
     next;
     menu
-        "none", -,
-        "1 thousandth", -,
-        "2 thousandths", -,
-        "3 thousandths", -,
-        "4 thousandths", -,
-        "5 thousandths", -,
-        "6 thousandths", -,
-        "7 thousandths", -,
-        "8 thousandths", -,
-        "9 thousandths", -;
-
+        "none", L_MenuItems3,
+        "1 thousandth", L_MenuItems3,
+        "2 thousandths", L_MenuItems3,
+        "3 thousandths", L_MenuItems3,
+        "4 thousandths", L_MenuItems3,
+        "5 thousandths", L_MenuItems3,
+        "6 thousandths", L_MenuItems3,
+        "7 thousandths", L_MenuItems3,
+        "8 thousandths", L_MenuItems3,
+        "9 thousandths", L_MenuItems3;
+
+L_MenuItems3:
     set @menu, @menu - 1;
     set @guess_accumulator, @guess_accumulator + @menu;
 
@@ -976,8 +989,7 @@ L_dark_green_q_again:
     next;
     menu
         "Yes!", L_dark_green_q_guess_0,
-        "No, I've had enough.", -;
-    close;
+        "No, I've had enough.", L_abort;
 
 L_dark_green_q_noslime:
     mes "[Rauk the Alchemist]";
@@ -991,8 +1003,10 @@ L_monster_oil:
     mes "\"I know how to create it, but you won't get it from me. It's far too dangerous; even the best alchemist may need multiple attempts and will risk blowing up! I can give you a recipe though, if you still are wanton.\"";
     next;
     menu
-        "Yes, tell me!", -,
+        "Yes, tell me!", L_Next3,
         "No, that sounds too dangerous.", L_abort;
+
+L_Next3:
     mes "[Rauk the Alchemist]";
     mes "You will need a pearl, a pair of snake skins, two piles of volcanic ash, three black scorpion stingers-- and a golden scorpion stinger. In addition you must have plenty of herbs to stabilise the concoction; mauve, alizarin, cobalt and gamboge will do just fine.";
     next;
diff --git a/world/map/npc/011-1/auldsbel.txt b/world/map/npc/011-1/auldsbel.txt
index 8fb16e2c..5b300e71 100644
--- a/world/map/npc/011-1/auldsbel.txt
+++ b/world/map/npc/011-1/auldsbel.txt
@@ -53,10 +53,7 @@
         "What are you talking about?", L_intro_explain,
         "I don't have any obsidian salt.", L_intro_nopowder,
         "Do I know you?", L_intro_identity,
-        "Goodbye.", -;
-    close;
-
-    set @name_complaint, 0;
+        "Goodbye.", L_Close;
 
 L_intro_explain:
     mes "[Robed Man]";
@@ -85,20 +82,19 @@ L_intro_identity:
         @xmsg$, L_intro_wrongperson,
         "You're not very good with faces, are you?", L_intro_nogood,
         "Who are you?", L_intro_who_are_you,
-        "Goodbye.", -;
-    close;
+        "Goodbye.", L_Close;
 
 L_intro_wrongperson:
     mes "[Robed Man]";
     mes "He laughs.";
     mes "\"Ah, I knew it... you're not the first one today, either.  I should apologize, I am horrible with faces.  Well, if you don't mind, please hurry along, I should go back to my experiments.\"";
     next;
+    goto L_intro_primary_menu;
 
 L_intro_primary_menu:
     menu
         "Who are you?", L_intro_who_are_you,
-        "Goodbye.", -;
-    close;
+        "Goodbye.", L_Close;
 
 L_intro_nogood:
     mes "[Robed Man]";
@@ -108,8 +104,7 @@ L_intro_nogood:
     menu
         "Who are you?", L_intro_who_are_you,
         "What is obsidian salt, anyway?", L_intro_obsidian_salt,
-        "Goodbye.", -;
-    close;
+        "Goodbye.", L_Close;
 
 L_intro_obsidian_salt:
     mes "[Robed Man]";
@@ -149,8 +144,7 @@ L_main_menu:
         "Where are you from?", L_about_auldsbel,
         "Do you need help with your experiments?", L_quest,
         "What do you know about...", L_question,
-        "Goodbye.", -;
-    close;
+        "Goodbye.", L_Close;
 
 L_main_menu_magic:
     if (@wants_sulphur && @wants_ironpowder)
@@ -162,7 +156,7 @@ L_main_menu_magic:
              "What do you know about...", L_question,
              "Can you make sulphur powder?", L_sulphur,
              "Can you make iron powder?", L_ironpowder,
-             "Goodbye.", -;
+             "Goodbye.", L_Close;
     if (@wants_sulphur && !@wants_ironpowder)
         menu
             "How does magic work?", L_about_magic,
@@ -171,16 +165,15 @@ L_main_menu_magic:
             "Do you need help with your experiments?", L_quest,
             "What do you know about...", L_question,
             "Can you make sulphur powder?", L_sulphur,
-            "Goodbye.", -;
-    if (!@wants_sulphur)
+            "Goodbye.", L_Close;
+    //else
         menu
             "How does magic work?", L_about_magic,
             "Can you teach me a spell?", L_learn_spell,
             "Where are you from?", L_about_auldsbel,
             "Do you need help with your experiments?", L_quest,
             "What do you know about...", L_question,
-            "Goodbye.", -;
-    close;
+            "Goodbye.", L_Close;
 
 L_ironpowder:
     mes "[Auldsbel the Wizard]";
@@ -198,16 +191,15 @@ L_sulphur:
     next;
     if (@Q_main_status >= @Q_STATUS_STUDENT)
         menu
-            "No, thank you.", -,
-            "I will see what I can find.", -,
+            "No, thank you.", L_Close,
+            "I will see what I can find.", L_Close,
             "Can you teach me how to make it myself?", L_sulphur_teach_spell,
             "Here you are.", L_sulphur_buy;
-    if (@Q_main_status < @Q_STATUS_STUDENT)
+    //else
         menu
-            "No, thank you.", -,
-            "I will see what I can find.", -,
+            "No, thank you.", L_Close,
+            "I will see what I can find.", L_Close,
             "Here you are.", L_sulphur_buy;
-    close;
 
 L_sulphur_buy:
     if (Zeny < @cost)
@@ -266,7 +258,9 @@ L_sulphur_teach_spell_no:
     next;
     menu
         "Very well, I will help you.", L_quest,
-        "No.", -;
+        "No.", L_Next;
+
+L_Next:
     mes "[Auldsbel the Wizard]";
     mes "\"Then I fear that I shall not reveal the spell to you either.\"";
     next;
@@ -279,6 +273,7 @@ L_about_magic:
     mes "[Auldsbel the Wizard]";
     mes "\"Most spells are claimed by one of the five schools of magic.  To properly use them, a magic user need not only have sufficient prowess in magic overall, but also in the specifics of that particular school.\"";
     next;
+    goto L_about_magic_minimenu;
 
 L_about_magic_minimenu:
     menu
@@ -286,13 +281,13 @@ L_about_magic_minimenu:
         "How can I advance in magic?", L_about_magic_advance,
         "How do spells work?", L_about_magic_spells,
         "Where can I learn spells?", L_about_magic_learn,
-        "Never mind.", -;
-    goto L_main_menu;
+        "Never mind.", L_main_menu;
 
 L_about_magic_schools:
     mes "[Auldsbel the Wizard]";
     mes "\"With few exceptions, all spells belong to one of the five schools of magic:  Transmutation, War, Astral, Life, and Nature.\"";
     next;
+    goto L_about_schools_minimenu;
 
 L_about_schools_minimenu:
     menu
@@ -302,8 +297,7 @@ L_about_schools_minimenu:
         "What's Life magic?", L_about_life,
         "What's Nature magic?", L_about_nature,
         "Are there other spells?", L_about_other_spells,
-        "Thank you.", -;
-    goto L_about_magic_minimenu;
+        "Thank you.", L_about_magic_minimenu;
 
 L_about_transmutation:
     mes "[Auldsbel the Wizard]";
@@ -397,6 +391,7 @@ L_about_magic_spells:
     mes "[Auldsbel the Wizard]";
     mes "\"Some spells require catalysts on top of components, others vary in power depending on whom they are cast on or under what conditions.  However, all spells are affected by the caster's astral power.\"";
     next;
+    goto L_about_spells_minimenu;
 
 L_about_spells_minimenu:
     menu
@@ -407,7 +402,6 @@ L_about_spells_minimenu:
         "Where can I learn spells?", L_about_magic_learn,
         "How often can I cast spells?", L_about_speed,
         "Never mind.", L_about_magic_minimenu;
-    close;
 
 L_about_astral_power:
     mes "[Auldsbel the Wizard]";
@@ -469,8 +463,7 @@ L_about_auldsbel:
     next;
     menu
         "All right, but what about you?.", L_about_auldsbel_2,
-        "Never mind.", -;
-    goto L_main_menu;
+        "Never mind.", L_main_menu;
 
 L_about_auldsbel_2:
     mes "[Auldsbel the Wizard]";
@@ -540,8 +533,7 @@ L_Q_astralsoul_L:
     mes "\"It is about... erm, 11300 GP. Do you have so much money?\"";
     menu
         "Here you are", L_Q_astralsoul_L1,
-        "I will get it.", -;
-    goto L_main_menu;
+        "I will get it.", L_main_menu;
 
 L_Q_astralsoul_L1:
     if (Zeny < 11300)
@@ -645,13 +637,13 @@ L_Q_manaseed_touched:
     mes "\"Legend has it that you can substitute for such control by imbibing a Mana Potion.  I am not sure whether that legend is true, but for you it might be worth trying it out.\"";
     next;
     set MAGIC_FLAGS, MAGIC_FLAGS | MFLAG_KNOWS_MANAPOTION;
+    goto L_Q_manaseed_touched_short;
 
 L_Q_manaseed_touched_short:
     menu
         "Where can I get a Mana Potion?", L_where_mana_potion,
         "Can you make a Mana Potion?", L_make_mana_potion,
-        "Thank you.", -;
-    goto L_main_menu;
+        "Thank you.", L_main_menu;
 
 L_where_mana_potion:
     mes "[Auldsbel the Wizard]";
@@ -664,9 +656,11 @@ L_make_mana_potion:
     mes "\"Well, I can transmute some components into a Mana Potion for you.  Let's see... I will need one pearl, 10,000 GP, about twenty Mauve leaves, and some Gamboge ones... ten should do, I think.  Oh, and a bottle of water, of course.\"";
     next;
     menu
-        "Here you are.", -,
+        "Here you are.", L_Next1,
         "I will look for those items.", L_main_menu,
         "I'm not interested.", L_Q_manaseed_touched_short;
+
+L_Next1:
     if (Zeny < 10000)
         goto L_make_mana_potion_missing;
     if (countitem("GambogeHerb") < 10)
@@ -701,7 +695,9 @@ L_make_mana_potion:
     next;
     menu
         "Thank you!", L_main_menu,
-        "What about the pearl and GP?", -;
+        "What about the pearl and GP?", L_Next2;
+
+L_Next2:
     mes "[Auldsbel the Wizard]";
     mes "Auldsbel raises his eyebrows in surprise.";
     mes "\"Those were payment.  You don't expect me to work for free, now do you?\"";
@@ -768,8 +764,10 @@ L_component_quest_0:
     mes "\"There are plenty of Mauve plants around, so I'm sure that you won't have a hard time finding the leaves.\"";
     next;
     menu
-        "I have them here.", -,
+        "I have them here.", L_Next3,
         "Sure, I will look for them.", L_main_menu;
+
+L_Next3:
     if (countitem ("MauveHerb") < 20)
         goto L_component_quest_missing;
     delitem "MauveHerb", 20;
@@ -791,9 +789,11 @@ L_component_quest_1:
     mes "\"Please be a good " + @address$ + " and get me an iron potion, a concentration potion, and three small and three medium healing potions.\"";
     next;
     menu
-        "Here you are.", -,
+        "Here you are.", L_Next4,
         "I'm not your 'good " + @address$ + "'!", L_main_menu,
         "I'll see what I can do.", L_main_menu;
+
+L_Next4:
     if (countitem ("SmallHealingPotion") < 3)
         goto L_component_quest_missing;
     if (countitem ("MediumHealingPotion") < 3)
@@ -824,8 +824,10 @@ L_component_quest_2:
     mes "\"I would like to run the next batch of experiments on a larger scale, though.  Would you be so kind as to fetch me one hundred silk cocoons, please?\"";
     next;
     menu
-        "One hundred cocoons, here you are.", -,
+        "One hundred cocoons, here you are.", L_Next5,
         "That's a lot; I'll see what I can do.", L_main_menu;
+
+L_Next5:
     if (countitem ("SilkCocoon") < 100)
         goto L_component_quest_missing;
     delitem "SilkCocoon", 100;
@@ -848,8 +850,10 @@ L_component_quest_3:
     mes "\"I'm still not sure how to integrate it into the spell...  but leave that to me.  Can you get me twenty-five red scorpion stingers and twenty-five lumps of maggot slime?  Those should be just what I need.\"";
     next;
     menu
-        "Here are your stingers and slimes.", -,
+        "Here are your stingers and slimes.", L_Next6,
         "I will get back to you once I have them.", L_main_menu;
+
+L_Next6:
     if (countitem ("RedScorpionStinger") < 25)
         goto L_component_quest_missing;
     if (countitem ("MaggotSlime") < 25)
@@ -881,8 +885,10 @@ L_component_quest_4:
     mes "\"Could you get me twenty regular, cave, and mountain snake tongues, please?  So a total of sixty tongues.  This is where most of their life force is concentrated, incidentally.\"";
     next;
     menu
-        "Here are your tongues.", -,
+        "Here are your tongues.", L_Next7,
         "I will hunt some snakes for you.", L_main_menu;
+
+L_Next7:
     if (countitem ("SnakeTongue") < 20)
         goto L_component_quest_missing;
     if (countitem ("CaveSnakeTongue") < 20)
@@ -920,8 +926,10 @@ L_component_quest_5:
     mes "\"I do have another assignment for you, but this one will be tricky.  I will need fifty grass snake tongues.  I believe that this may be just enough life force to return the silkworm back to its original shape.\"";
     next;
     menu
-        "Here they are.", -,
+        "Here they are.", L_Next8,
         "That's quite a challenge.", L_main_menu;
+
+L_Next8:
     if (countitem ("GrassSnakeTongue") < 50)
         goto L_component_quest_missing;
     delitem "GrassSnakeTongue", 50;
@@ -1020,13 +1028,12 @@ LL_initiation:
     next;
     if (countitem("MoubooFigurine"))
         menu
-            "Not yet.", -,
+            "Not yet.", L_main_menu,
             "How about this mouboo figurine?", LL_initiation_check;
-    if (!(countitem("MoubooFigurine")))
+    //else
         menu
-            "Not yet.", -,
+            "Not yet.", L_main_menu,
             "What was the spell again?", LL_repeat_spell;
-    goto L_main_menu;
 
 LL_initiation_fail:
     mes "[Auldsbel the Wizard]";
@@ -1080,8 +1087,10 @@ LL_student_start:
     mes "\"Bring me ten bug legs, and I will reveal its invocation to you.\"";
     next;
     menu
-        "Here you are.", -,
+        "Here you are.", L_Next9,
         "I'll be back with them.", L_main_menu;
+
+L_Next9:
     if (countitem("BugLeg") < 10)
         goto L_component_quest_missing;
     delitem "BugLeg", 10;
@@ -1118,8 +1127,10 @@ LL_student_0:
     mes "\"Bring me twenty mauve leaves, and I will reveal its invocation.\"";
     next;
     menu
-        "Here you are.", -,
+        "Here you are.", L_Next10,
         "I'll be back with them.", L_main_menu;
+
+L_Next10:
     if (countitem("MauveHerb") < 20)
         goto L_component_quest_missing;
     delitem "MauveHerb", 20;
@@ -1146,8 +1157,10 @@ LL_student_1:
     mes "\"For this, I would like ten scorpion stingers.\"";
     next;
     menu
-        "Here you are.", -,
+        "Here you are.", L_Next11,
         "I'll be back with them.", L_main_menu;
+
+L_Next11:
     if (countitem("ScorpionStinger") < 10)
             goto L_component_quest_missing;
     delitem "ScorpionStinger", 10;
@@ -1174,8 +1187,10 @@ LL_student_2:
     mes "\"Bring me twenty wooden logs, and I will teach you.\"";
     next;
     menu
-        "Here you are.", -,
+        "Here you are.", L_Next12,
         "I'll be back with them.", L_main_menu;
+
+L_Next12:
     if (countitem("RawLog") < 20)
             goto L_component_quest_missing;
     delitem "RawLog", 20;
@@ -1220,7 +1235,9 @@ LL_student_4:
     menu
         "What was the invocation again?", LL_student_3_repeat,
         "No, still working on it...", L_main_menu,
-        "Yes.", -;
+        "Yes.", L_Next13;
+
+L_Next13:
     if (countitem("ConcentrationPotion") < 1)
         goto LL_student_4_no_potion;
     if (!(MAGIC_FLAGS & MFLAG_MADE_CONC_POTION))
@@ -1269,6 +1286,8 @@ LL_magic_skill_insufficient:
     next;
     goto L_main_menu;
 
+L_Close:
+    close;
 
 S_update_var:
     set @Q_status, @Q_main_status | (@Q_component_quest << 5);
diff --git a/world/map/npc/011-1/oscar.txt b/world/map/npc/011-1/oscar.txt
index c9ee88da..e3901a12 100644
--- a/world/map/npc/011-1/oscar.txt
+++ b/world/map/npc/011-1/oscar.txt
@@ -80,8 +80,10 @@ L_Introduce:
     next;
     mes "\"I just came back from a long trip... Really tiring, but so interesting.\"";
     menu
-        "Oh? Where did you go?", -,
+        "Oh? Where did you go?", L_Next,
         "Well... I believe.", L_End;
+
+L_Next:
     mes "[Oscar]";
     mes "\"Well, I travelled to the economic center of this continent.";
     mes "It's north-east of here. Quite far I must say.\"";
@@ -96,8 +98,10 @@ L_Introduce:
     mes "\"They taste really good you see, but ahah, they weren't really for eating at that moment!";
     mes "Anyway, I wondered if I could grow some here. Until now I only grow apples and oranges.\"";
     menu
-        "That's an interesting idea!", -,
+        "That's an interesting idea!", L_Next1,
         "Really, I hate pumpkins.", L_End;
+
+L_Next1:
     mes "[Oscar]";
     mes "\"However, I couldn't get any seeds, but I heard rumors in that city, saying we could find pumpkins in the forests north-east of here.";
     mes "Most likely there are pumpkin seeds laying around them.\"";
@@ -110,8 +114,10 @@ L_Introduce:
 
     mes "\"Do you think you can get some for me?\"";
     menu
-        "Sure. Leave it to me!", -,
+        "Sure. Leave it to me!", L_Next2,
         "Well, I don't have time for that right now.", L_End;
+
+L_Next2:
     mes "[Oscar]";
     mes "\"Thanks so much " + strcharinfo(0) + "!";
     mes "I can't wait to try them!\"";
@@ -164,8 +170,10 @@ L_HelpGrowSeeds:
         goto L_ProposeUseKaflosh;
     set @nature_magic, 0;
     menu
-        "Yeah sure!", -,
+        "Yeah sure!", L_Next3,
         "That sounds boring to do. No thanks.", L_End;
+
+L_Next3:
     getinventorylist;
     if (@inventorylist_count == 100 && countitem("EmptyBottle") == 0)
         goto L_InventoryFull;
@@ -176,9 +184,11 @@ L_HelpGrowSeeds:
 L_ProposeUseKaflosh:
     set @nature_magic, 0;
     menu
-        "Yeah sure!", -,
+        "Yeah sure!", L_Next4,
         "Maybe I can help you water them with magic!", L_WaterWithKaflosh,
         "That sounds boring to do. No thanks.", L_End;
+
+L_Next4:
     getinventorylist;
     if (@inventorylist_count == 100 && countitem("EmptyBottle") == 0)
         goto L_InventoryFull;
@@ -212,8 +222,10 @@ L_HelpFillWaters:
         goto L_WateringBusy;
     mes "\"So do you have the " + $@halloween_num_water_bottles + " bottles filled with fresh water?\"";
     menu
-        "Yes! Fresh and clear water.", -,
+        "Yes! Fresh and clear water.", L_Next5,
         "Oh, not yet. I'm on my way.", L_End;
+
+L_Next5:
     if (countitem("BottleOfWater") < $@halloween_num_water_bottles)
         goto L_NotEnoughWaters;
 
@@ -306,8 +318,15 @@ OnInit:
     end;
 
 OnTimer1000:
+    goto L_TimerFunction;
+
 OnTimer2000:
+    goto L_TimerFunction;
+
 OnTimer3000:
+    goto L_TimerFunction;
+
+L_TimerFunction:
     if ($@HalloweenQuest_PumpkinsState != 1)
         end;
     callsub S_CheckPlayer;