Clean up main scripts

3 files changed, 190 insertions, 138 deletions

diff --git a/world/map/npc/010-2/chef.txt b/world/map/npc/010-2/chef.txt
index 0a295d65..20ef0dcf 100644
--- a/world/map/npc/010-2/chef.txt
+++ b/world/map/npc/010-2/chef.txt
@@ -15,6 +15,7 @@
 //    if (QUEST_Easter12 == 7) goto L_Easter2012_Wait;
 //    if (QUEST_Easter12 == 8) goto L_Easter2012Foolplayers;
 //    if (QUEST_Easter12 == 9) goto OnEaster2012Out;
+    goto L_Begin;
 
 L_Begin:
     mes "[Chef]";
@@ -32,7 +33,9 @@ L_lace_chococake:
     next;
     menu
         "Sorry.", L_end,
-        "I need your help with a sick young girl!", -;
+        "I need your help with a sick young girl!", L_Next;
+
+L_Next:
     mes "[Chef]";
     mes "";
     mes "You explain Kadiya's situation to him.";
@@ -43,7 +46,9 @@ L_lace_cupcake:
     next;
     menu
         "Sorry.", L_end,
-        "I need your help with a sick young girl!", -;
+        "I need your help with a sick young girl!", L_Next1;
+
+L_Next1:
     mes "[Chef]";
     mes "";
     mes "You explain Kadiya's situation to him.";
@@ -51,7 +56,9 @@ L_lace_cupcake:
     next;
     menu
         "No, sorry.", L_bringit,
-        "Yes, here you are.", -;
+        "Yes, here you are.", L_Next2;
+
+L_Next2:
     if (countitem ("MopoxCurePotion") < 1)
         goto L_bringit;
     mes "[Chef]";
@@ -66,9 +73,10 @@ L_lace_cupcake:
     next;
     menu
         "I'll go and get it.", L_end,
-        "Here you are!", -,
+        "Here you are!", L_Next3,
         "Not now.", L_end;
 
+L_Next3:
     if (countitem ("GingerBreadMan") < 3)
         goto L_no_gingerbread;
     if (countitem ("Orange") < 1)
@@ -130,6 +138,7 @@ L_bringit:
     mes "";
     mes "\"Bring it here when you do.\"";
     next;
+    goto L_End;
 
 L_End:
     close;
@@ -143,9 +152,12 @@ L_JellyBean:
     next;
     mes "\"Even though I am really busy this time of year, I will help you make some Jelly Beans to put in the basket if you wish. Just to keep the tradition alive...\"";
     menu
-        "I would really appreciate that!", -,
+        "I would really appreciate that!", L_Next4,
         "Nah, I decided not to do that stupid quest.", L_End;
+
+L_Next4:
     set QUEST_Easter11, 8;
+    goto L_MakeJellyBean;
 
 L_MakeJellyBean:
     mes "[Chef]";
@@ -155,10 +167,11 @@ L_MakeJellyBean:
     mes "\"Sea slimes seem to have those, so try them.\"";
     mes "\"And because it's the holidays, I'll add in the other ingredient for free.\"";
     menu
-        "I have some candies!", -,
+        "I have some candies!", L_Next5,
         "Ok, I will be back soon.", L_End,
         "I changed my mind, forget about it.", L_End;
 
+L_Next5:
     if(countitem("Candy") < 15)
         goto L_EasterNotEnough;
     if(countitem("Candy") >= 15)
@@ -201,7 +214,6 @@ L_SeeBunny:
     mes "\"Oh yeah, you need to return to the Easter Bunny now.\"";
     next;
     goto L_Begin;
-    close;
 
 // Lines below here belong to Easter 2012:
 
@@ -209,8 +221,9 @@ L_Easter2012_Begin:
     mes "[Chef]";
     mes "\"Ahh, " + strcharinfo(0) + "! I really need to talk to you. Did the Easter Bunny give you a very thick and heavy pan?\"";
     menu
-        "Yes, he did. Why?", -;
+        "Yes, he did. Why?", L_Next12;
 
+L_Next12:
     mes "[Chef]";
     mes "\"Good to know! I am asking because now you are my only hope. I have invented the ultimate culinary wonder, a recipe for the most incredibly tasty food you can imagine!\"";
     next;
@@ -221,8 +234,9 @@ L_Easter2012_Begin:
     mes "\"Oh, and I will need to keep it with me for a while, as the ingredients need to rest in the acid solution for a long time, but you can always come here to see how it is going.\"";
     menu
         "Ok, but I want my pan back when it is done!", L_Accept_Cooking,
-        "No way, I won't let you fill my hat with corrosive yeti saliva!", -;
+        "No way, I won't let you fill my hat with corrosive yeti saliva!", L_Next6;
 
+L_Next6:
     mes "[Chef]";
     mes "\"Ahh, don't say that! Please, think about it and come back if you change your mind.\"";
     close;
@@ -231,8 +245,10 @@ L_Accept_Cooking:
     mes "[Chef]";
     mes "\"Great! But I can't promise anything regarding your hat. What I can promise is: IF it works, you will eat the most spectacular food of all time! I won't say what it is, but it is going to be great! What do you say, are you sure?\"";
     menu
-        "Ahh, just take the pan and do your thing.", -,
+        "Ahh, just take the pan and do your thing.", L_Next7,
         "No way!", L_Close;
+
+L_Next7:
     if (countitem("PanHat") < 1)
         goto L_No_PanHat;
     delitem "PanHat", 1;
@@ -255,11 +271,14 @@ L_Easter2012_Result:
     mes "[Chef]";
     mes "\"Hey! I have some good news and some bad news... Which one do you want to hear first?\"";
     menu
-        "The good one.", -,
-        "The bad one.", -,
+        "The good one.", L_Next8,
+        "The bad one.", L_Next8,
         "Oh no, I don't even want to hear!", L_Close;
+
+L_Next8:
     if (@temp < 15) goto L_Easter2012_Lucky;
-    if (@temp >= 15) goto L_Easter2012_Unlucky;
+    //else
+                     goto L_Easter2012_Unlucky;
     close;
 
 L_Easter2012_Lucky:
@@ -277,16 +296,22 @@ L_Easter2012_Unlucky:
     mes "\"Ahh, actually, it doesn't matter! The important thing is that the recipe was a success! I just can't believe how something can be so tasty!\"";
     next;
     menu
-        "Nice! Now, what about my hat?", -;
+        "Nice! Now, what about my hat?", L_Next9;
+
+L_Next9:
     mes "\"Oh, that... Ehh, unfortunately, the pan is not anymore. It was completely destroyed by the time the pickled beets were ready! But don't worry, I will keep my promise and give you a jar of this culinary masterpiece!\"";
     next;
     menu
-        "Wait, wait... Are you saying I lost my hat?", -;
+        "Wait, wait... Are you saying I lost my hat?", L_Next10;
+
+L_Next10:
     mes "[Chef]";
     mes "\"Hmm, yes. But I must say I really appreciate your effort to help me! You sacrificed your cool hat in the name of the culinary arts, only a great person would do that!\"";
     next;
     menu
-        "But... I... My hat...", -;
+        "But... I... My hat...", L_Next11;
+
+L_Next11:
     mes "[Chef]";
     mes "\"Here, take your pickled beets!\"";
     getitem "PickledBeets", 1;
@@ -301,7 +326,6 @@ OnEaster2012Out:
     menu
         "A chef hat for a jar of pickled beets? Of course I want!", L_GetChefhat,
         "Ahh, keep you silly hat! The pickled beets are way better!", L_KeepBeets;
-    close;
 
 L_GetChefhat:
     if (countitem("PickledBeets") < 1)
diff --git a/world/map/npc/010-2/dimonds.txt b/world/map/npc/010-2/dimonds.txt
index 300891c3..d422cf03 100644
--- a/world/map/npc/010-2/dimonds.txt
+++ b/world/map/npc/010-2/dimonds.txt
@@ -210,7 +210,9 @@
     next;
     mes "\"Well, that was the poem.  What do you think of it?\"";
     menu
-        "It was a bit long and kind of hard to understand, but thanks for reading.", -;
+        "It was a bit long and kind of hard to understand, but thanks for reading.", L_Next;
+
+L_Next:
     mes "[Shannon]";
     mes "\"Well, thanks for coming to the supper.  Also, thanks for helping me make it through the poem.  Here, take this hat.  When you wear it, wear it with the class you showed me today.  Happy Burns' Supper!\"";
     getinventorylist;
@@ -380,8 +382,7 @@ event_done:
     next;
     mes "\"Well, that was the poem.  What do you think of it?\"";
     menu
-        "It was a bit long and kind of hard to understand, but thanks for reading.", -;
-    close;
+        "It was a bit long and kind of hard to understand, but thanks for reading.", leave;
 
 L_Full_Inv:
     mes "[Shannon]";
@@ -408,6 +409,7 @@ food_menu:
     set @choice_idx[@choices_nr], @C_steak;
     set @choice$[@choices_nr], "Offer him a steak.";
     set @choices_nr, @choices_nr + 1;
+    goto L_nosteaks;
 
 L_nosteaks:
     if (countitem("ChickenLeg") == 0)
@@ -415,6 +417,7 @@ L_nosteaks:
     set @choice_idx[@choices_nr], @C_chickenleg;
     set @choice$[@choices_nr], "Offer him a chicken leg.";
     set @choices_nr, @choices_nr + 1;
+    goto L_nochickenleg;
 
 L_nochickenleg:
     if (countitem("RedApple") == 0)
@@ -422,6 +425,7 @@ L_nochickenleg:
     set @choice_idx[@choices_nr], @C_redapple;
     set @choice$[@choices_nr], "Offer him a red apple.";
     set @choices_nr, @choices_nr + 1;
+    goto L_noredapple;
 
 L_noredapple:
     if (countitem("GreenApple") == 0)
@@ -429,6 +433,7 @@ L_noredapple:
     set @choice_idx[@choices_nr], @C_greenapple;
     set @choice$[@choices_nr], "Offer him a green apple.";
     set @choices_nr, @choices_nr + 1;
+    goto L_nogreenapple;
 
 L_nogreenapple:
     if (countitem("Beer") == 0)
@@ -436,24 +441,26 @@ L_nogreenapple:
     set @choice_idx[@choices_nr], @C_beer;
     set @choice$[@choices_nr], "Offer him a beer.";
     set @choices_nr, @choices_nr + 1;
+    goto L_nobeer;
 
 L_nobeer:
     set @choice_idx[@choices_nr], @C_nevermind;
     set @choice$[@choices_nr], "Leave";
 
     menu
-        @choice$[0],-,
-        @choice$[1],-,
-        @choice$[2],-,
-        @choice$[3],-,
-        @choice$[4],-,
-        @choice$[5],-,
-        @choice$[6],-,
-        @choice$[7],-,
-        @choice$[8],-,
-        @choice$[9],-,
-        @choice$[10],-;
-
+        @choice$[0],L_MenuItems,
+        @choice$[1],L_MenuItems,
+        @choice$[2],L_MenuItems,
+        @choice$[3],L_MenuItems,
+        @choice$[4],L_MenuItems,
+        @choice$[5],L_MenuItems,
+        @choice$[6],L_MenuItems,
+        @choice$[7],L_MenuItems,
+        @choice$[8],L_MenuItems,
+        @choice$[9],L_MenuItems,
+        @choice$[10],L_MenuItems;
+
+L_MenuItems:
     set @choose, @menu - 1;
     if (@choice_idx[@choose] == 0)
         goto leave;
@@ -572,5 +579,6 @@ leave:
     set @npcname$, "Basil the Inn Keeper";
     set @cost, 200;
     callfunc "Inn";
+    end;
 }
 
diff --git a/world/map/npc/010-2/loratay.txt b/world/map/npc/010-2/loratay.txt
index 906bd874..a6b4c06f 100644
--- a/world/map/npc/010-2/loratay.txt
+++ b/world/map/npc/010-2/loratay.txt
@@ -36,6 +36,7 @@ L_intro_0:
 
 L_intro_1:
     mes "You see a middle-aged woman cautiously but surprisingly swiftly cutting out shapes from a huge cotton sheet.  The scissors glide along the cloth as if it were butter, never leaving the premarked lines.";
+    goto L_intro_over;
 
 L_intro_over:
     next;
@@ -156,14 +157,16 @@ L_agostine_2:
     if (countitem("BottleOfWater"))
         menu
             "(sneak out of the room)", L_end,
-            "Are you alright?", -,
+            "Are you alright?", L_Next,
             "Here, have a bottle of water...", L_give_water,
-            "Can I help you?", -;
-    if (countitem("BottleOfWater") == 0)
+            "Can I help you?", L_Next;
+    //else
         menu
             "(sneak out of the room)", L_end,
-            "Are you alright?", -,
-            "Can I help you?", -;
+            "Are you alright?", L_Next,
+            "Can I help you?", L_Next;
+
+L_Next:
     mes "[Lora Tay the Seamstress]";
     mes "She holds out your gloves for you to pick up, then waves you out of the room.  Fortunately, her cough seems to be slowly subsiding.";
     close;
@@ -231,12 +234,14 @@ L_main_menu:
         "Can you make me a shirt?", L_shirt,
         "Can you make me a tank top?", L_tanktop,
         "Can you make me a cape?", L_cape,
-        "Can you make fur boots for me?", -,
-        "Can you make winter gloves me?", -,
+        "Can you make fur boots for me?", L_Fur,
+        "Can you make winter gloves me?", L_Fur,
         "Can you sew a robe for me?", L_robe,
         "Can you make a desert hat for me?", L_desert_hat,
         "Can you enhance a sorcerer robe with another line color?", L_sorcerer_robe_linecolor,
         "Goodbye for now.", L_end;
+
+L_Fur:
     mes "[Lora Tay the Seamstress]";
     mes "\"From what?  Fluffy fur?  I won't work with such lowly materials.\"";
     next;
@@ -249,12 +254,14 @@ L_main_menu2:
         "Can you make me a shirt?", L_shirt,
         "Can you make me a tank top?", L_tanktop,
         "Can you make me a cape?", L_cape,
-        "Can you make fur boots for me?", -,
-        "Can you make winter gloves me?", -,
+        "Can you make fur boots for me?", L_Fur1,
+        "Can you make winter gloves me?", L_Fur1,
         "Can you sew a robe for me?", L_robe,
         "Can you make a desert hat for me?", L_desert_hat,
         "Actually...I have a proposal for you...", L_agostine_proposal,
         "Goodbye for now.", L_end;
+
+L_Fur1:
     mes "[Lora Tay the Seamstress]";
     mes "\"From what?  Fluffy fur?  I won't work with such lowly materials.\"";
     next;
@@ -266,18 +273,20 @@ L_agostine_proposal:
     next;
 
     menu
-        "I have talked to Agostine and he needs your help.", -,
+        "I have talked to Agostine and he needs your help.", L_Next1,
         "I forgot...", L_main_menu2;
 
+L_Next1:
     mes "[Lora Tay the Seamstress]";
     mes "\"That cheat! What could he possibly want from me?";
     mes "We don't even have the same style in seaming. Is this a joke?\"";
     next;
 
     menu
-        "It's no joke. He needs your help in creating a new fashion!", -,
+        "It's no joke. He needs your help in creating a new fashion!", L_Next2,
         "Yeah you're right, he was probably joking.", L_end;
 
+L_Next2:
     mes "[Lora Tay the Seamstress]";
     mes "\"Well it depends what he wants from me.";
     mes "Go see Agostine, ask him what he's planning and I will think about it.\"";
@@ -291,16 +300,16 @@ L_proposal_intro:
     menu
         "Sorry to disturb you, but...", L_main_menu,
         "I better go talk to Agostine.", L_end;
-    close;
 
 L_proposal_show_materials:
     mes "[Lora Tay the Seamstress]";
     mes "\"Did you talk to Agostine about his idea?\"";
     next;
     menu
-        "Yes, he explained he saw a dress in a dream and gave me these materials.", -,
+        "Yes, he explained he saw a dress in a dream and gave me these materials.", L_Next3,
         "No, that guy is a total wacko.", L_end;
 
+L_Next3:
     mes "[Lora Tay the Seamstress]";
     mes "\"Wow these are such fine materials!";
     mes "These are certainly not for just any ordinary clothes...";
@@ -308,8 +317,9 @@ L_proposal_show_materials:
     next;
 
     menu
-        "He said this garment would be his first dress creation and he wanted it to be fabulous!", -;
+        "He said this garment would be his first dress creation and he wanted it to be fabulous!", L_Next4;
 
+L_Next4:
     mes "[Lora Tay the Seamstress]";
     mes "\"Fine I will accept his offer...";
     mes "But the materials he has given you need some sewing on the edges.\"";
@@ -328,9 +338,11 @@ L_proposal_search_items:
     next;
 
     menu
-        "I will go get them right away!", -,
+        "I will go get them right away!", L_Next5,
         "Here you are.", L_proposal_give_items,
         @FINEDRESS_COCOONS+" silk cocoons for a dress? Find somebody else.", L_end;
+
+L_Next5:
     set QUEST_WG_state, 15;
     close;
 
@@ -357,17 +369,17 @@ L_proposal_retrieve_design:
     mes "\"May you go retrieve the design from Agostine?\"";
     next;
     menu
-        "Certainly I'll be back soon!", -,
+        "Certainly I'll be back soon!", L_Close,
         "Actually I want something else...", L_main_menu;
-    close;
 
 L_proposal_bringing_design:
     mes "[Lora Tay the Seamstress]";
     mes "\"Welcome back, did you get the drawings I requested?\"";
     next;
     menu
-        "Here they are!", -;
+        "Here they are!", L_Next6;
 
+L_Next6:
     mes "[Lora Tay the Seamstress]";
     mes "\"Wonderful, this dress design is magnificent!";
     mes "I am done with the threading but I will now need to sew these materials together into the design.\"";
@@ -394,8 +406,9 @@ L_proposal_dress_finished:
     next;
 
     menu
-        "Wow it looks great, but what's missing?", -;
+        "Wow it looks great, but what's missing?", L_Next7;
 
+L_Next7:
     mes "[Lora Tay the Seamstress]";
     mes "\"Well there are white flare designs on the bottom of the dress.";
     mes "I'm not great with fine cloth design so this might be something Agostine must do on his own.";
@@ -406,19 +419,18 @@ L_proposal_dress_finished:
     next;
 
     menu
-        "Okay, can't wait to see the finished product! Thanks for your help!", -;
+        "Okay, can't wait to see the finished product! Thanks for your help!", L_Next8;
 
+L_Next8:
     set QUEST_WG_state, 20;
-
     close;
 
 L_proposal_deliver_dress:
     mes "[Lora Tay the Seamstress]";
     mes "\"Please take the unfinished dress to him so he may finish the edges with the cloth.\"";
     menu
-        "I'm on my way.", -,
+        "I'm on my way.", L_Close,
         "I have a request...", L_main_menu;
-    close;
 
 L_desert_hat:
     mes "[Lora Tay the Seamstress]";
@@ -618,6 +630,7 @@ L_tanktop:
     mes "\"A tank top?  Well, hardly a challenge, but I suppose I could do that.  Please get me some cloth-- plain cotton will do-- and, let's see, how does 100,000 GP for my efforts sound?\"";
     mes "\"Wait, I keep forgetting, you are just an adventurer... let's make that 1000 GP, then.\"";
     next;
+    goto L_tanktop_menu;
 
 L_tanktop_menu:
     menu
@@ -688,21 +701,26 @@ L_robe:
     next;
     if (countitem("SilkCocoon")== 0 && countitem("SilkSheet")== 0)
         goto L_robe_nosilk;
+    goto L_robe_menu;
 
 L_robe_menu:
     menu
-        "Here, I have some silk cocoons!", -,
+        "Here, I have some silk cocoons!", L_Next9,
         "Here, I have some silk sheets!", L_robe_sheets,
         "Where can I find silk?", L_where_silk,
         "How much silk do you need?", L_how_much_silk,
         "Oh, never mind.", L_main_menu;
+
+L_Next9:
     mes "[Lora Tay the Seamstress]";
     mes "The seamstress stares at you as if you had gone out of your mind.";
     mes "\"And what precisely do you expect me to do with Silk Cocoons?  String them together in some baubly chain?  Somehow remove the thread and spin and weave it so that some random person can have their robe?\"";
     next;
     menu
-        "Will you trade cocoons for sheets?", -,
+        "Will you trade cocoons for sheets?", L_Next10,
         "Never mind.", L_main_menu;
+
+L_Next10:
     mes "[Lora Tay the Seamstress]";
     mes "Lora frowns.";
     mes "\"It's not all that easy to get properly processed silk around here.  Easier for me than for you, I admit...\"";
@@ -716,7 +734,9 @@ L_robe_menu:
     next;
     menu
         "I'm not interested.", L_main_menu,
-        "Very well then, here you are.", -;
+        "Very well then, here you are.", L_Next11;
+
+L_Next11:
     if (countitem("SilkCocoon") < @ROBE_COCOONS_NR)
         goto L_robe_missing_cocoons;
     if (Zeny < @ROBE_ZENY)
@@ -738,7 +758,9 @@ L_robe_sheets:
     next;
     menu
         "I'm not interested.", L_main_menu,
-        "Very well then, here you are.", -;
+        "Very well then, here you are.", L_Next12;
+
+L_Next12:
     if (countitem("SilkSheet") < @ROBE_SHEETS_NR)
         goto L_robe_missing_sheets;
     if (Zeny < @ROBE_SHEETS_ZENY)
@@ -751,6 +773,7 @@ L_robe_sheets:
     mes "[Lora Tay the Seamstress]";
     mes "The seamstress puts your GP away, takes your measurements and puts the silk sheets on the table.  She asks you to stretch out your arms, then pins the silk sheets in place all over your body.";
     next;
+    goto L_get_robe;
 
 L_get_robe:
     mes "[Lora Tay the Seamstress]";
@@ -843,6 +866,7 @@ SUB_pick_one_of_many_items:
                              "", "", "", "", "", "", "", "",
                              "", "", "", "", "", "", "", "",
                              "", "", "", "", "", "", "", "";
+    goto L_SUB_pick_choice_loop;
 
 L_SUB_pick_choice_loop:
     if (@i >= @items_nr)
@@ -865,77 +889,73 @@ L_SUB_choice_init_done:
 
     if (@c < 10)
         menu
-            @choice_n$[0], -,
-            @choice_n$[1], -,
-            @choice_n$[2], -,
-            @choice_n$[3], -,
-            @choice_n$[4], -,
-            @choice_n$[5], -,
-            @choice_n$[6], -,
-            @choice_n$[7], -,
-            @choice_n$[8], -,
-            @choice_n$[9], -;
-    if (@c < 10)
-        goto L_SUB_choice_join;
+            @choice_n$[0], L_SUB_choice_join,
+            @choice_n$[1], L_SUB_choice_join,
+            @choice_n$[2], L_SUB_choice_join,
+            @choice_n$[3], L_SUB_choice_join,
+            @choice_n$[4], L_SUB_choice_join,
+            @choice_n$[5], L_SUB_choice_join,
+            @choice_n$[6], L_SUB_choice_join,
+            @choice_n$[7], L_SUB_choice_join,
+            @choice_n$[8], L_SUB_choice_join,
+            @choice_n$[9], L_SUB_choice_join;
 
     if (@c < 20)
         menu
-            @choice_n$[0], -,
-            @choice_n$[1], -,
-            @choice_n$[2], -,
-            @choice_n$[3], -,
-            @choice_n$[4], -,
-            @choice_n$[5], -,
-            @choice_n$[6], -,
-            @choice_n$[7], -,
-            @choice_n$[8], -,
-            @choice_n$[9], -,
-            @choice_n$[10], -,
-            @choice_n$[11], -,
-            @choice_n$[12], -,
-            @choice_n$[13], -,
-            @choice_n$[14], -,
-            @choice_n$[15], -,
-            @choice_n$[16], -,
-            @choice_n$[17], -,
-            @choice_n$[18], -,
-            @choice_n$[19], -;
-    if (@c < 20)
-        goto L_SUB_choice_join;
+            @choice_n$[0], L_SUB_choice_join,
+            @choice_n$[1], L_SUB_choice_join,
+            @choice_n$[2], L_SUB_choice_join,
+            @choice_n$[3], L_SUB_choice_join,
+            @choice_n$[4], L_SUB_choice_join,
+            @choice_n$[5], L_SUB_choice_join,
+            @choice_n$[6], L_SUB_choice_join,
+            @choice_n$[7], L_SUB_choice_join,
+            @choice_n$[8], L_SUB_choice_join,
+            @choice_n$[9], L_SUB_choice_join,
+            @choice_n$[10], L_SUB_choice_join,
+            @choice_n$[11], L_SUB_choice_join,
+            @choice_n$[12], L_SUB_choice_join,
+            @choice_n$[13], L_SUB_choice_join,
+            @choice_n$[14], L_SUB_choice_join,
+            @choice_n$[15], L_SUB_choice_join,
+            @choice_n$[16], L_SUB_choice_join,
+            @choice_n$[17], L_SUB_choice_join,
+            @choice_n$[18], L_SUB_choice_join,
+            @choice_n$[19], L_SUB_choice_join;
 
     menu
-        @choice_n$[0], -,
-        @choice_n$[1], -,
-        @choice_n$[2], -,
-        @choice_n$[3], -,
-        @choice_n$[4], -,
-        @choice_n$[5], -,
-        @choice_n$[6], -,
-        @choice_n$[7], -,
-        @choice_n$[8], -,
-        @choice_n$[9], -,
-        @choice_n$[10], -,
-        @choice_n$[11], -,
-        @choice_n$[12], -,
-        @choice_n$[13], -,
-        @choice_n$[14], -,
-        @choice_n$[15], -,
-        @choice_n$[16], -,
-        @choice_n$[17], -,
-        @choice_n$[18], -,
-        @choice_n$[19], -,
-        @choice_n$[20], -,
-        @choice_n$[21], -,
-        @choice_n$[22], -,
-        @choice_n$[23], -,
-        @choice_n$[24], -,
-        @choice_n$[25], -,
-        @choice_n$[26], -,
-        @choice_n$[27], -,
-        @choice_n$[28], -,
-        @choice_n$[29], -,
-        @choice_n$[30], -,
-        @choice_n$[31], -;
+        @choice_n$[0], L_SUB_choice_join,
+        @choice_n$[1], L_SUB_choice_join,
+        @choice_n$[2], L_SUB_choice_join,
+        @choice_n$[3], L_SUB_choice_join,
+        @choice_n$[4], L_SUB_choice_join,
+        @choice_n$[5], L_SUB_choice_join,
+        @choice_n$[6], L_SUB_choice_join,
+        @choice_n$[7], L_SUB_choice_join,
+        @choice_n$[8], L_SUB_choice_join,
+        @choice_n$[9], L_SUB_choice_join,
+        @choice_n$[10], L_SUB_choice_join,
+        @choice_n$[11], L_SUB_choice_join,
+        @choice_n$[12], L_SUB_choice_join,
+        @choice_n$[13], L_SUB_choice_join,
+        @choice_n$[14], L_SUB_choice_join,
+        @choice_n$[15], L_SUB_choice_join,
+        @choice_n$[16], L_SUB_choice_join,
+        @choice_n$[17], L_SUB_choice_join,
+        @choice_n$[18], L_SUB_choice_join,
+        @choice_n$[19], L_SUB_choice_join,
+        @choice_n$[20], L_SUB_choice_join,
+        @choice_n$[21], L_SUB_choice_join,
+        @choice_n$[22], L_SUB_choice_join,
+        @choice_n$[23], L_SUB_choice_join,
+        @choice_n$[24], L_SUB_choice_join,
+        @choice_n$[25], L_SUB_choice_join,
+        @choice_n$[26], L_SUB_choice_join,
+        @choice_n$[27], L_SUB_choice_join,
+        @choice_n$[28], L_SUB_choice_join,
+        @choice_n$[29], L_SUB_choice_join,
+        @choice_n$[30], L_SUB_choice_join,
+        @choice_n$[31], L_SUB_choice_join;
 
 L_SUB_choice_join:
     set @menu, @menu - 1;
@@ -976,8 +996,7 @@ L_ExamineSorcererRobe:
         goto L_NotSorcererRobe;
     menu
         "Yes, that's fine. Take this one.", L_ChooseSorcererLineColor,
-        "No, I changed my mind.", -;
-    goto L_CleanSorcererRobe;
+        "No, I changed my mind.", L_CleanSorcererRobe;
 
 L_NotSorcererRobe:
     mes "\"This isn't a Sorcerer Robe dear. Stop taking me for a fool.\"";
@@ -989,19 +1008,20 @@ L_ChooseSorcererLineColor:
     mes "[Lora Tay the Seamstress]";
     mes "\"And which Cotton Cloth color will you give me?\"";
     menu
-        "A " + @item_colors$[0] + " one.", -,
-        "A " + @item_colors$[1] + " one.", -,
-        "A " + @item_colors$[2] + " one.", -,
-        "A " + @item_colors$[3] + " one.", -,
-        "A " + @item_colors$[4] + " one.", -,
-        "A " + @item_colors$[5] + " one.", -,
-        "A " + @item_colors$[6] + " one.", -,
-        "A " + @item_colors$[7] + " one.", -,
-        "A " + @item_colors$[8] + " one.", -,
-        "A " + @item_colors$[9] + " one.", -,
-        "A " + @item_colors$[10] + " one.", -,
+        "A " + @item_colors$[0] + " one.", L_ItemMenus2,
+        "A " + @item_colors$[1] + " one.", L_ItemMenus2,
+        "A " + @item_colors$[2] + " one.", L_ItemMenus2,
+        "A " + @item_colors$[3] + " one.", L_ItemMenus2,
+        "A " + @item_colors$[4] + " one.", L_ItemMenus2,
+        "A " + @item_colors$[5] + " one.", L_ItemMenus2,
+        "A " + @item_colors$[6] + " one.", L_ItemMenus2,
+        "A " + @item_colors$[7] + " one.", L_ItemMenus2,
+        "A " + @item_colors$[8] + " one.", L_ItemMenus2,
+        "A " + @item_colors$[9] + " one.", L_ItemMenus2,
+        "A " + @item_colors$[10] + " one.", L_ItemMenus2,
         "Hum. I changed my mind. Later maybe.", L_end;
 
+L_ItemMenus2:
     set @chosen_color, @menu - 1;
     set @cotton_cloth_id, 2250 + @chosen_color;
     // The White Cotton Cloth is in fact the undyed one.