Clean up main scripts

17 files changed, 123 insertions, 117 deletions

diff --git a/world/map/npc/001-1/barber.txt b/world/map/npc/001-1/barber.txt
index e58ee880..94525bd5 100644
--- a/world/map/npc/001-1/barber.txt
+++ b/world/map/npc/001-1/barber.txt
@@ -9,8 +9,4 @@
     mes "[Nicolas the Barber]";
     mes "\"Come again!\"";
     close;
-
-// OnInit doesn't work for functions, they need our help
-OnInit:
-    callfunc "OnInitBarber";
 }
diff --git a/world/map/npc/001-1/bard.txt b/world/map/npc/001-1/bard.txt
index 2de20249..99287a77 100644
--- a/world/map/npc/001-1/bard.txt
+++ b/world/map/npc/001-1/bard.txt
@@ -1,6 +1,5 @@
 //
 
-//001-1.gat,46,76,0|script|Bard|152,
 001-1.gat,40,73,0|script|Bard|152,
 {
     setarray @songs$, "\"There once was a bard, who had it hard, because a man in dark green, was very mean.\"",
@@ -13,14 +12,14 @@
     if (!Sex)
         mes "\"Greetings, fair lady!  Well met, on such a lovely day!  Might I entertain you with a tale or two?\"";
     next;
+    goto L_Main;
 
 L_Main:
     menu
         "Sing me a song, lute man!", L_Song,
         "Have you heard any news?", L_News,
         "What do you know about...", L_Question,
-        "Farewell!", -;
-    goto L_Close;
+        "Farewell!", L_Close;
 
 L_News:
 //     mes "[" + @name$ + "]";
diff --git a/world/map/npc/001-1/bernard.txt b/world/map/npc/001-1/bernard.txt
index 25364698..c152f673 100644
--- a/world/map/npc/001-1/bernard.txt
+++ b/world/map/npc/001-1/bernard.txt
@@ -13,8 +13,8 @@
     if(@state == 1) goto L_Progress;
 
     set @TEMP, rand(2);
-    if(@TEMP == 0) goto L_Opening0;
     if(@TEMP == 1) goto L_Opening1;
+    goto L_Opening0;
 
 L_Opening0:
     mes "[Bernard]";
@@ -35,8 +35,8 @@ L_Ask:
 
 L_Yes:
     set @TEMP, rand(2);
-    if(@TEMP == 0) goto L_Req0;
     if(@TEMP == 1) goto L_Req1;
+    goto L_Req0;
 
 L_Req0:
     mes "[Bernard]";
diff --git a/world/map/npc/001-1/bleacher.txt b/world/map/npc/001-1/bleacher.txt
index e681f8c0..b43f0505 100644
--- a/world/map/npc/001-1/bleacher.txt
+++ b/world/map/npc/001-1/bleacher.txt
@@ -12,7 +12,7 @@
     if (Zeny < 5000) goto L_no_money;
 
     menu
-        "I'd like to bleach something.", -,
+        "I'd like to bleach something.", L_bleach_menu,
         "No thanks.", L_Close;
 
 L_bleach_menu:
@@ -42,8 +42,7 @@ L_bleach_menu:
         "Bowler hat (brown).", L_bowler_hat_brown,
         "Fine dress.", L_fine_dress,
         "Cotton cloth.", L_cotton_cloth,
-        "Nevermind.", -;
-    goto L_Close;
+        "Nevermind.", L_Close;
 
 L_cottonshirt:
     set @normal, 1202;
@@ -146,8 +145,7 @@ L_sorcerer_robe:
         "A purple lined one.", L_purple_lined_sorcerer_robe,
         "A dark green lined one.", L_dark_green_lined_sorcerer_robe,
         "A white lined one.", L_white_lined_sorcerer_robe,
-        "Nevermind.", -;
-    goto L_Close;
+        "Nevermind.", L_Close;
 
 L_red_lined_sorcerer_robe:
     set @normal, 798;
@@ -225,17 +223,18 @@ L_choose_color:
     next;
 
     menu
-        "Red.", -,
-        "Green.", -,
-        "Dark Blue.", -,
-        "Yellow.", -,
-        "Light Blue.", -,
-        "Pink.", -,
-        "Black.", -,
-        "Orange.", -,
-        "Purple.", -,
-        "Dark Green.", -;
-
+        "Red.", L_MenuItems,
+        "Green.", L_MenuItems,
+        "Dark Blue.", L_MenuItems,
+        "Yellow.", L_MenuItems,
+        "Light Blue.", L_MenuItems,
+        "Pink.", L_MenuItems,
+        "Black.", L_MenuItems,
+        "Orange.", L_MenuItems,
+        "Purple.", L_MenuItems,
+        "Dark Green.", L_MenuItems;
+
+L_MenuItems:
     set @del, @dyeBase + @menu - 1;
 
     if (countitem(@del) == 0) goto L_no_item;
@@ -248,6 +247,7 @@ L_choose_color:
     getitem @normal, 1;
     delitem "PileOfAsh", 3;
     set Zeny, Zeny - 5000;
+    goto L_again;
 
 L_again:
     mes "[Candide]";
diff --git a/world/map/npc/001-1/children.txt b/world/map/npc/001-1/children.txt
index 16c2d10a..60477015 100644
--- a/world/map/npc/001-1/children.txt
+++ b/world/map/npc/001-1/children.txt
@@ -3,7 +3,6 @@
 001-1.gat,95,29,0|script|Aisha|108,
 {
     set @TEMP,rand(9);
-    if(@TEMP == 0) goto L_1;
     if(@TEMP == 1) goto L_1;
     if(@TEMP == 2) goto L_2;
     if(@TEMP == 3) goto L_3;
@@ -12,6 +11,7 @@
     if(@TEMP == 6) goto L_6;
     if(@TEMP == 7) goto L_7;
     if(@TEMP == 8) goto L_8;
+    goto L_1;
 
 L_1:
     mes "[Aisha]";
@@ -110,8 +110,7 @@ L_9:
     next;
     menu
         "A bad word?", L_tell,
-        "Oh, you better keep it for yourself then.", -;
-    goto L_Close;
+        "Oh, you better keep it for yourself then.", L_Close;
 
 L_tell:
     mes "[Nina]";
@@ -120,8 +119,7 @@ L_tell:
     menu
         "If I promise to never tell anyone, can you tell me the word?", L_keepword,
         "I understand, you do not need to tell me...", L_giveword,
-        "Goodbye!", -;
-    goto L_Close;
+        "Goodbye!", L_Close;
 
 L_keepword:
     mes "[Nina]";
diff --git a/world/map/npc/001-1/elanore.txt b/world/map/npc/001-1/elanore.txt
index 34b30766..2a5a0095 100644
--- a/world/map/npc/001-1/elanore.txt
+++ b/world/map/npc/001-1/elanore.txt
@@ -48,10 +48,10 @@ function|script|ElanoreFix|,
     if (sc_check(sc_poison)) goto L_CurePoison;
     if (BaseLevel > 10) goto L_NoHeal;
     set @TEMP,rand(4);
-    if(@TEMP == 0) goto Heal1;
     if(@TEMP == 1) goto Heal2;
     if(@TEMP == 2) goto Heal3;
     if(@TEMP == 3) goto Heal4;
+    goto Heal1;
 
 Heal1:
 
@@ -82,12 +82,11 @@ Heal4:
     goto Heal_L;
 
 Heal_L:
-    set @TEMP,rand(3);
-
-    if(@TEMP == 0) goto Heal_1;
+    set @TEMP,rand(4);
     if(@TEMP == 1) goto Heal_2;
     if(@TEMP == 2) goto Heal_3;
     if(@TEMP == 3) goto Heal_4;
+    goto Heal_1;
 
 Heal_1:
 
@@ -120,6 +119,7 @@ Heal_4:
 L_NoHeal:
     if (MAGIC_FLAGS)
         goto L_Chat;
+    goto L_NoHealMessage;
 
 L_NoHealMessage:
     mes "[Elanore the Healer]";
@@ -132,6 +132,7 @@ L_Chat:
     mes "[Elanore the Healer]";
     mes "\"Hello!  Can I help you?\"";
     next;
+    goto L_Main;
 
 L_Main:
     if (@has_magic && (@Q_status == @STATUS_INITIAL))
@@ -164,6 +165,7 @@ OnPCKillEvent:
 
 L_OnPcKillWipe:
         set @Q_heal_exp, 0;
+    goto L_OnPcKillFinish;
 
 L_OnPcKillFinish:
     set MAGIC_EXPERIENCE, (MAGIC_EXPERIENCE & ~(255 << 24)) | (@Q_heal_exp << 24);
@@ -174,11 +176,10 @@ L_Lifestones:
     mes "\"I always need components for my own healing spells.  If you bring me ten gamboge leaves, ten alizarin leaves, ten mauve leaves and ten cobalt leaves, I can make ten lifestones; I will give you half of them.\"";
     next;
     menu
-        "OK, I will get them.", -,
-        "No way!", -,
+        "OK, I will get them.", L_Close,
+        "No way!", L_Close,
         "Here you are!", L_Lifestones_Trade,
         "Can I make them myself?", L_Lifestones_MakeSelf;
-    goto L_Close;
 
 L_Lifestones_Trade:
     if (countitem("MauveHerb") < 10) goto L_Lifestones_Trade_Missing;
@@ -224,6 +225,7 @@ L_Lifestones_Trade_Missing:
 L_Lifestones_MakeSelf:
     mes "[Elanore the Healer]";
     if (@has_magic < 2) goto L_Lifestones_MakeSelf_no;
+    goto L_Lifestones_MakeSelf_yes;
 
 L_Lifestones_MakeSelf_yes:
     mes "\"Oh, but of course!  You are powerful enough to make your own lifestones, using the enchantment '" + getspellinvocation("enchant-lifestone") + "'.  This will consume a bug leg or a maggot slime or one of each of the four healing herbs, though.\"";
@@ -300,6 +302,7 @@ L_Teach_AdvanceTo2_warn:
     mes "[Elanore the Healer]";
     mes "\"But be warned:  you won't be able to use advanced healing magic until you are more capable in your regular magic usage.\"";
     next;
+    goto L_Teach_AdvanceTo2_skip;
 
 L_Teach_AdvanceTo2_skip:
     mes "[Elanore the Healer]";
@@ -376,16 +379,15 @@ L_Teach_Explain3:
     mes "[Elanore the Healer]";
     mes "\"But his daugher has contracted Mopox, so she needs help.  He doesn't trust me, but perhaps he will trust you; you have been helping quite a few people, after all.\"";
     next;
+    goto L_3_menu;
 
 L_3_menu:
     menu
         "What should I do?", L_3_what_to_do,
         "Where can I find the sick girl?", L_3_where,
         "How did you mess up?", L_3_messup,
-        "I will get started right away.", -,
-        "Maybe later.", -;
-
-        goto L_Main;
+        "I will get started right away.", L_Main,
+        "Maybe later.", L_Main;
 
 L_3_what_to_do:
     mes "[Elanore the Healer]";
diff --git a/world/map/npc/001-1/entertainer.txt b/world/map/npc/001-1/entertainer.txt
index ea8e0870..f98b7d31 100644
--- a/world/map/npc/001-1/entertainer.txt
+++ b/world/map/npc/001-1/entertainer.txt
@@ -8,8 +8,7 @@
     mes "\"Yes how can I help you?\"";
     menu
         "How are you showing emotions above your head?", L_Learn,
-        "Never mind", -;
-    goto L_Close;
+        "Never mind", L_Close;
 
 L_Learn:
     mes "[Entertainer]";
@@ -17,8 +16,7 @@ L_Learn:
     mes "I can teach you if you'd like?\"";
     menu
         "Yes please.", L_Learn2,
-        "I don't see the point right now.", -;
-    goto L_Close;
+        "I don't see the point right now.", L_Close;
 
 L_Learn2:
     setskill SKILL_EMOTE, 1;
@@ -39,8 +37,10 @@ L_Close:
 OnTimer3000:
     emotion rand(EMOTE_DISGUST, EMOTE_TEARS);
     setnpctimer 0;
+    end;
 
 OnInit:
     if (debug >= 2) end;
     initnpctimer;
+    end;
 }
diff --git a/world/map/npc/001-1/guards.txt b/world/map/npc/001-1/guards.txt
index cce350c7..1c783f67 100644
--- a/world/map/npc/001-1/guards.txt
+++ b/world/map/npc/001-1/guards.txt
@@ -11,13 +11,13 @@
 
 L_Tip:
     set @TEMP,rand(7);
-    if(@TEMP == 0) goto L_0;
     if(@TEMP == 1) goto L_1;
     if(@TEMP == 2) goto L_2;
     if(@TEMP == 3) goto L_3;
     if(@TEMP == 4) goto L_4;
     if(@TEMP == 5) goto L_5;
     if(@TEMP == 6) goto L_6;
+    goto L_0;
 
 L_1:
     mes "[Ekinu the Town Guard]";
diff --git a/world/map/npc/001-1/guide.txt b/world/map/npc/001-1/guide.txt
index f50e3eda..5c738539 100644
--- a/world/map/npc/001-1/guide.txt
+++ b/world/map/npc/001-1/guide.txt
@@ -10,11 +10,13 @@
 
     if ((TUT_var != 0) && !(FLAGS & FLAG_GOT_GRADUATIONCAP) && BaseLevel >= 10)
         goto L_Grad;
+    goto L_DoneGrad;
 
 L_DoneGrad:
     mes "[Ian the Guide]";
     mes "\"Would you like to know about something?\"";
     next;
+    goto L_Menu_A;
 
 L_Menu_A:
     menu
@@ -30,7 +32,6 @@ L_Menu_A:
         "Quick Keys", L_Key,
         "Laws", L_Laws,
         "I know everything!", L_Know;
-    close;
 
 L_Fight:
     mes "[Ian the Guide]";
diff --git a/world/map/npc/001-1/luca.txt b/world/map/npc/001-1/luca.txt
index 55502e35..4312e822 100644
--- a/world/map/npc/001-1/luca.txt
+++ b/world/map/npc/001-1/luca.txt
@@ -47,8 +47,10 @@ L_teach:
     mes "\"If you want, I can help with that!\"";
     next;
     menu
-        "Sure, that sounds fun!", -,
+        "Sure, that sounds fun!", L_Next,
         "I'm not interested.", L_Nev;
+
+L_Next:
     mes "[Luca the Hunter]";
     mes "\"All right! It's not all that easy, though. First you have to learn how to focus. That's because you can learn many skills, but you can't focus on all of them all the time.\"";
     next;
@@ -58,9 +60,10 @@ L_teach:
     menu
         "Yeah!", L_teach0_follow,
         "Certainly!", L_teach0_follow,
-        "Wait... what do you mean?", -,
-        "Please explain some more.", -,
+        "Wait... what do you mean?", L_CallExplain,
+        "Please explain some more.", L_CallExplain,
         "No.", L_Nev;
+L_CallExplain:
     callsub S_explain;
 
 L_teach0_follow:
@@ -138,13 +141,15 @@ S_explain:
     mes "[Luca the Hunter]";
     mes "\"Alright, what do you want to know?\"";
     next;
+    goto L_Explain_loop;
 
-S_explain_loop:
+L_Explain_loop:
     menu
         "What's skill focus?", L_explain_focus,
         "What skills are there?", L_explain_skills,
         "How do skills work?", L_explain_work,
-        "Thanks, I think I got it!", -;
+        "Thanks, I think I got it!", L_Return;
+L_Return:
     return;
 
 L_explain_focus:
@@ -170,7 +175,7 @@ L_explain_focus:
     next;
     mes "\"For unfocusing you need to bring a potion; a special potion. That potion is not the easiest to get, but I am sure you are able to.\"";
     next;
-    goto S_explain_loop;
+    goto L_Explain_loop;
 
 L_explain_skills:
     mes "[Luca the Hunter]";
@@ -185,7 +190,7 @@ L_explain_skills:
     mes "[Luca the Hunter]";
     mes "\"Other than that, just ask around! There have to be some people who can teach you something...\"";
     next;
-    goto S_explain_loop;
+    goto L_Explain_loop;
 
 L_explain_work:
     mes "[Luca the Hunter]";
@@ -205,12 +210,13 @@ L_explain_work:
     mes "\"She always would have one cactus potion too many... but she was an amazing teacher.\"";
     mes "He nods emphatically.";
     next;
-    goto S_explain_loop;
+    goto L_Explain_loop;
 
 L_teachmore:
     mes "[Luca the Hunter]";
     mes "\"Good to see you again!\"";
     next;
+    goto L_teachmore2;
 
 L_teachmore2:
     setarray @choices, 0,0,0,0,0;
@@ -232,6 +238,7 @@ L_teachmore2:
     set @choices[@choice_nr], @C_focus;
     set @choice$[@choice_nr], "I would like to focus.";
     set @choice_nr, @choice_nr + 1;
+    goto L_teachmore2_nof;
 
 L_teachmore2_nof:
     getactivatedpoolskilllist;
@@ -239,6 +246,7 @@ L_teachmore2_nof:
     set @choices[@choice_nr], @C_unfocus;
     set @choice$[@choice_nr], "I would like to unfocus.";
     set @choice_nr, @choice_nr + 1;
+    goto L_teachmore2_nounf;
 
 L_teachmore2_nounf:
     if (!(getskilllv(SKILL_BRAWLING)))
@@ -256,6 +264,7 @@ L_teachmore2_nounf:
     set @choices[@choice_nr], @C_focusoverview;
     set @choice$[@choice_nr], "Can you tell me what skills I'm currently focused on?";
     set @choice_nr, @choice_nr + 1;
+    goto L_teachmore2_noovv;
 
 L_teachmore2_noovv:
     set @choices[@choice_nr], @C_nvm;
@@ -263,12 +272,13 @@ L_teachmore2_noovv:
     set @choice_nr, @choice_nr + 1;
 
     menu
-        @choice$[0],-,
-        @choice$[1],-,
-        @choice$[2],-,
-        @choice$[3],-,
-        @choice$[4],-;
+        @choice$[0],L_MenuItems,
+        @choice$[1],L_MenuItems,
+        @choice$[2],L_MenuItems,
+        @choice$[3],L_MenuItems,
+        @choice$[4],L_MenuItems;
 
+L_MenuItems:
     set @menu, @menu - 1;
     if (@choices[@menu] == 0) goto L_Close;
     if (@choices[@menu] == @C_focus) goto L_focus;
@@ -290,15 +300,16 @@ L_focus:
     set @skilllist_name$[@skilllist_count], "Nevermind";
     set @skilllist_name$[@skilllist_count + 1], "";
     menu
-        @skilllist_name$[0], -,
-        @skilllist_name$[1], -,
-        @skilllist_name$[2], -,
-        @skilllist_name$[3], -,
-        @skilllist_name$[4], -,
-        @skilllist_name$[5], -,
-        @skilllist_name$[6], -,
-        @skilllist_name$[7], -;
-
+        @skilllist_name$[0], L_MenuItems1,
+        @skilllist_name$[1], L_MenuItems1,
+        @skilllist_name$[2], L_MenuItems1,
+        @skilllist_name$[3], L_MenuItems1,
+        @skilllist_name$[4], L_MenuItems1,
+        @skilllist_name$[5], L_MenuItems1,
+        @skilllist_name$[6], L_MenuItems1,
+        @skilllist_name$[7], L_MenuItems1;
+
+L_MenuItems1:
     set @menu, @menu - 1;
     if (@skilllist_id[@menu] == 0) goto L_teachmore2;
 
@@ -322,9 +333,8 @@ L_unfocus:
     mes "\"The potion is called Grimace of Dementia. So the alchemist will know for sure.\"";
     set MAGIC_FLAGS, MAGIC_FLAGS | MFLAG_KNOWS_UNFOCUS_RECIPE;
     menu
-        "Ok, I will get a Grimace of Dementia potion", -,
-        "Alright, be right back!", -;
-    goto L_Close;
+        "Ok, I will get a Grimace of Dementia potion", L_Close,
+        "Alright, be right back!", L_Close;
 
 L_nopotion:
     mes "[Luca the Hunter]";
@@ -346,15 +356,16 @@ L_unfocus_menu:
     set @skilllist_name$[@skilllist_count], "Nevermind";
     set @skilllist_name$[@skilllist_count + 1], "";
     menu
-        @skilllist_name$[0], -,
-        @skilllist_name$[1], -,
-        @skilllist_name$[2], -,
-        @skilllist_name$[3], -,
-        @skilllist_name$[4], -,
-        @skilllist_name$[5], -,
-        @skilllist_name$[6], -,
-        @skilllist_name$[7], -;
-
+        @skilllist_name$[0], L_MenuItems2,
+        @skilllist_name$[1], L_MenuItems2,
+        @skilllist_name$[2], L_MenuItems2,
+        @skilllist_name$[3], L_MenuItems2,
+        @skilllist_name$[4], L_MenuItems2,
+        @skilllist_name$[5], L_MenuItems2,
+        @skilllist_name$[6], L_MenuItems2,
+        @skilllist_name$[7], L_MenuItems2;
+
+L_MenuItems2:
     set @menu, @menu - 1;
     if (@skilllist_id[@menu] == 0) goto L_teachmore2;
 
@@ -376,6 +387,7 @@ L_focus_overview:
 L_focus_overview1:
     mes "[Luca the Hunter]";
     set @message$, "\"At the moment you are focused on ";
+    goto L_focus_overview2;
 
 L_focus_overview2:
     set @skilllist_count, @skilllist_count-1;
diff --git a/world/map/npc/001-1/mikhail.txt b/world/map/npc/001-1/mikhail.txt
index c82dd89f..d0ec2f3d 100644
--- a/world/map/npc/001-1/mikhail.txt
+++ b/world/map/npc/001-1/mikhail.txt
@@ -10,7 +10,8 @@
     if (@state >= 6) goto L_Done;
     if (@state == 5) goto L_Progress;
     if (@state == 4) goto L_Start;
-    if (@state < 4) goto L_Convince_Mikhail_First;
+    //else
+                    goto L_Convince_Mikhail_First;
 
 L_Convince_Mikhail_First:
     mes "[Mikhail]";
diff --git a/world/map/npc/001-1/monster_guide.txt b/world/map/npc/001-1/monster_guide.txt
index 0aca7e41..7df38189 100644
--- a/world/map/npc/001-1/monster_guide.txt
+++ b/world/map/npc/001-1/monster_guide.txt
@@ -11,6 +11,7 @@ Register:
     mes "[Aidan the Monster Guide]";
     mes "Oh my, you don't seem to be registered as a Quest Participant. Would you like to register?";
     next;
+    goto Choice;
 
 Choice:
     menu
diff --git a/world/map/npc/001-1/rewards_master.txt b/world/map/npc/001-1/rewards_master.txt
index 7ebc12f5..e581b907 100644
--- a/world/map/npc/001-1/rewards_master.txt
+++ b/world/map/npc/001-1/rewards_master.txt
@@ -17,19 +17,20 @@
     callsub SUB_prep_menu;
 
     menu
-        @Menu$[0], -,
-        @Menu$[1], -,
-        @Menu$[2], -,
-        @Menu$[3], -,
-        @Menu$[4], -,
-        @Menu$[5], -,
-        @Menu$[6], -,
-        @Menu$[7], -,
-        @Menu$[8], -,
-        @Menu$[9], -,
-        @Menu$[10], -,
-        @Menu$[11], -;
-
+        @Menu$[0], L_MenuItems,
+        @Menu$[1], L_MenuItems,
+        @Menu$[2], L_MenuItems,
+        @Menu$[3], L_MenuItems,
+        @Menu$[4], L_MenuItems,
+        @Menu$[5], L_MenuItems,
+        @Menu$[6], L_MenuItems,
+        @Menu$[7], L_MenuItems,
+        @Menu$[8], L_MenuItems,
+        @Menu$[9], L_MenuItems,
+        @Menu$[10], L_MenuItems,
+        @Menu$[11], L_MenuItems;
+
+L_MenuItems:
     // this is for the last entry "No thanks":
     if (@menu > @i) goto L_Close;
     // this is for the "Give all" entry:
@@ -37,6 +38,7 @@
 
     set @req, @menu;
     set @rec, 0;
+    goto L_Item_Loop;
 
 L_Item_Loop:
     if (@rec == @req || Mobpt < tvis) goto L_Item_Done;
@@ -66,6 +68,7 @@ L_Give_all:
     // since the server complains about more than 250 (70 according to Jaxad0127)
     // gotos without interrupting next statement.
     set @gotocounter, 50;
+    goto L_Give_all_loop;
 
 L_Give_all_loop:
     set @gotocounter, @gotocounter - 1;
@@ -100,6 +103,7 @@ L_Close:
 SUB_prep_menu:
     set @pts, Mobpt;
     set @dif, tvis;
+    goto L_Menu_Loop;
 
 L_Menu_Loop:
     if (@pts < @dif || @i == 10) goto L_Menu_Check;
@@ -117,6 +121,7 @@ L_Menu_Check:
     if (@i != 10) goto L_Menu_Done;
         set @Menu$[@i], "Please give me as many as I deserve!";
         set @i, @i + 1;
+    goto L_Menu_Done;
 
 L_Menu_Done:
     set @Menu$[@i], "No thanks";
diff --git a/world/map/npc/001-1/sandra.txt b/world/map/npc/001-1/sandra.txt
index 50e302db..14d71621 100644
--- a/world/map/npc/001-1/sandra.txt
+++ b/world/map/npc/001-1/sandra.txt
@@ -15,10 +15,10 @@
     next;
 
     set @TEMP, rand(4);
-    if(@TEMP == 0) goto L_Opening0;
     if(@TEMP == 1) goto L_Opening1;
     if(@TEMP == 2) goto L_Opening2;
     if(@TEMP == 3) goto L_Opening3;
+    goto L_Opening0;
 
 L_Opening0:
     mes "\"In the outskirts of Tulimshar, there are some scorpions...  I need  help!  Will you help?\"";
@@ -47,9 +47,9 @@ L_Ask:
 
 L_Yes:
     set @TEMP, rand(3);
-    if(@TEMP == 0) goto L_Req0;
     if(@TEMP == 1) goto L_Req1;
     if(@TEMP == 2) goto L_Req2;
+    goto L_Req0;
 
 L_Req0:
     mes "[Sandra]";
diff --git a/world/map/npc/001-1/sarah.txt b/world/map/npc/001-1/sarah.txt
index 9f61fc19..5ed5289c 100644
--- a/world/map/npc/001-1/sarah.txt
+++ b/world/map/npc/001-1/sarah.txt
@@ -15,8 +15,8 @@
     next;
 
     set @TEMP, rand(2);
-    if(@TEMP == 0) goto L_Opening0;
     if(@TEMP == 1) goto L_Opening1;
+    goto L_Opening0;
 
 L_Opening0:
     mes "\"Cherry Cake is the best!\"";
diff --git a/world/map/npc/001-1/trader.txt b/world/map/npc/001-1/trader.txt
index cf2854ef..eaf95ffd 100644
--- a/world/map/npc/001-1/trader.txt
+++ b/world/map/npc/001-1/trader.txt
@@ -15,9 +15,8 @@
     mes "\"Hello. I came here to trade wares with the people of Tulimshar. Unfortunately for you, I've traded everything I had.\"";
     next;
     menu
-        "Oh. I'll go then.", -,
+        "Oh. I'll go then.", L_Close,
         "You don't have anything?", L_More;
-    goto L_Close;
 
 L_More:
     mes "[Trader]";
@@ -25,8 +24,7 @@ L_More:
     next;
     menu
         "Yes?", L_Except,
-        "Ok then.",  -;
-    goto L_Close;
+        "Ok then.",  L_Close;
 
 L_Except:
     mes "[Trader]";
@@ -34,8 +32,7 @@ L_Except:
     next;
     menu
         "Sure.", L_Teach,
-        "No thank you.", -;
-    goto L_Close;
+        "No thank you.", L_Close;
 
 L_Teach:
     if (Zeny < 5) goto L_NotEnoughMoney;
@@ -67,32 +64,28 @@ L_Trademenu:
         "Do you have Iron Powder?", L_Iron,
         "How about Sulphur Powder?", L_Sulphur,
         "I need Medium Healing Potions.", L_Healpots,
-        "I think I have everything I need, thanks.", -;
-    goto L_Close;
+        "I think I have everything I need, thanks.", L_Close;
 
 L_Iron:
     mes "[Trader]";
     mes "\"I do have a few of those.  I will give you 4 Iron Powders for 1 Iron Ore and " + @Ironprice + "gp.\"";
     menu
         "Sure.", L_Ipowder,
-        "What a ripoff!  No way!", -;
-    goto L_Close;
+        "What a ripoff!  No way!", L_Close;
 
 L_Sulphur:
     mes "[Trader]";
     mes "\"I can trade you 5 Sulphur Powders for 1 Pile of Ash and " + @Sulphurprice + "gp.\"";
     menu
         "Here you go.", L_Spowder,
-        "Are you nuts?! Forget it!", -;
-    goto L_Close;
+        "Are you nuts?! Forget it!", L_Close;
 
 L_Healpots:
     mes "[Trader]";
     mes "\"Healing potions are always useful, but I rarely need anything larger than the small ones.  I will happily trade you 1 Medium Healing Potion for 3 Small Healing Potions and " + @Potionprice + "gp.\"";
     menu
         "Alright.", L_Pots,
-        "Whoa, that's way too much.", -;
-    goto L_Close;
+        "Whoa, that's way too much.", L_Close;
 
 L_Ipowder:
     if (countitem("IronOre") < 1) goto L_Missing;
@@ -107,7 +100,6 @@ L_Ipowder:
     menu
         "Yes.", L_Trademenu,
         "No.", L_No;
-    goto L_Close;
 
 L_Spowder:
     if (countitem("PileOfAsh") < 1) goto L_Missing;
@@ -122,7 +114,6 @@ L_Spowder:
     menu
         "Yes.", L_Trademenu,
         "No.", L_No;
-    goto L_Close;
 
 L_Pots:
     if (countitem("SmallHealingPotion") < 3) goto L_Missing;
@@ -137,7 +128,6 @@ L_Pots:
     menu
         "Yes.", L_Trademenu,
         "No.", L_No;
-    goto L_Close;
 
 L_Full:
     mes "[Trader]";
diff --git a/world/map/npc/001-1/vincent.txt b/world/map/npc/001-1/vincent.txt
index 1a64b055..74ee26cc 100644
--- a/world/map/npc/001-1/vincent.txt
+++ b/world/map/npc/001-1/vincent.txt
@@ -9,6 +9,7 @@
 
     if (@state >= 2) goto L_Done;
     if (@state == 1) goto L_Progress;
+    goto L_Convince_Vincent_First;
 
 L_Convince_Vincent_First:
     mes "[Vincent]";
@@ -16,10 +17,10 @@ L_Convince_Vincent_First:
     next;
 
     set @TEMP, rand(4);
-    if(@TEMP == 0) goto L_Opening1;
     if(@TEMP == 1) goto L_Opening2;
     if(@TEMP == 2) goto L_Opening3;
     if(@TEMP == 3) goto L_Opening4;
+    goto L_Opening1;
 
 L_Opening1:
     mes "\"I just need 10 more Bug Legs to finish my action figure!\"";
@@ -52,10 +53,10 @@ L_Sure:
     set @state, 1;
     callsub S_Update_Var;
     set @TEMP, rand(4);
-    if(@TEMP == 0) goto L_Req1;
     if(@TEMP == 1) goto L_Req2;
     if(@TEMP == 2) goto L_Req3;
     if(@TEMP == 3) goto L_Req4;
+    goto L_Req1;
 
 L_Req1:
     mes "[Vincent]";