Clean up main scripts

8 files changed, 83 insertions, 32 deletions

diff --git a/world/map/npc/021-1/bakery.txt b/world/map/npc/021-1/bakery.txt
index 12c352bc..2a4fb127 100644
--- a/world/map/npc/021-1/bakery.txt
+++ b/world/map/npc/021-1/bakery.txt
@@ -16,4 +16,5 @@ OnTimer300000:
 OnInit:
     if (debug >= 2) end;
     initnpctimer;
+    end;
 }
diff --git a/world/map/npc/021-1/banu.txt b/world/map/npc/021-1/banu.txt
index 2bff70e2..6e5cc51b 100644
--- a/world/map/npc/021-1/banu.txt
+++ b/world/map/npc/021-1/banu.txt
@@ -20,9 +20,10 @@
     mes "\"Ah, hello. You've come at just the right moment. The field work is hard and the sun is burning.";
     mes "Would you mind refilling an old woman's Empty Bottle with water?\"";
     menu
-        "Sure!",-,
+        "Sure!",L_Next,
         "Sorry, I'm busy.",L_Close;
 
+L_Next:
     getinventorylist;
     if (@inventorylist_count == 100)
         goto L_FullInv;
@@ -59,8 +60,10 @@ L_Knife:
     mes "[Banu]";
     mes "\"Hello dear. Did you get the knife for me?\"";
     menu
-        "Yeah, here is it.",-,
+        "Yeah, here is it.",L_Next1,
         "Not yet.",L_Close;
+
+L_Next1:
     if (countitem("Knife") < 1)
         goto L_NoKnife;
     delitem "Knife", 1;
diff --git a/world/map/npc/021-1/eurni.txt b/world/map/npc/021-1/eurni.txt
index 8659c6cd..8983c596 100644
--- a/world/map/npc/021-1/eurni.txt
+++ b/world/map/npc/021-1/eurni.txt
@@ -18,8 +18,7 @@
     next;
     menu
         "Please do, my dear...", L_Change,
-        "Leave alone my family treasure!", -;
-    close;
+        "Leave alone my family treasure!", L_Close;
 
 L_Change:
     if (Zeny < 10000)
@@ -37,4 +36,7 @@ L_NoMoney:
     mes "[Eurni the Surgeon]";
     mes "\"You don't have enough to pay for my services.\"";
     close;
+
+L_Close:
+    close;
 }
diff --git a/world/map/npc/021-1/hetchel.txt b/world/map/npc/021-1/hetchel.txt
index f4072c01..5023c06d 100644
--- a/world/map/npc/021-1/hetchel.txt
+++ b/world/map/npc/021-1/hetchel.txt
@@ -29,9 +29,7 @@
     mes "\"Hello I am Hetchel, I weave fine textiles, what can I do for you?\"";
     menu
         "Sorry to bother, I'm just visiting.", L_end,
-        "I am looking for silk sheets, Lora Tay told me that I could find some in this market. Can you help?", -;
-    next;
-    goto L_main_menu;
+        "I am looking for silk sheets, Lora Tay told me that I could find some in this market. Can you help?", L_main_menu;
 
 L_WG_quest_not_done:
     mes "[Hetchel the weaver]";
@@ -40,17 +38,18 @@ L_WG_quest_not_done:
     mes "What can I do for you?\"";
     menu
         "Sorry to bother, I'm new to this country, just visting.", L_end,
-        "What are you selling?", -;
-    next;
+        "What are you selling?", L_main_menu;
 
 L_main_menu:
     mes "[Hetchel]";
     mes "\"I have some silk sheets: double-elbow squares.\"";
     menu
         "I'm not interested at the moment, maybe later; thanks anyway.", L_end,
-        "Can I buy some?", -;
-//        "Do you have any silk robe I could buy?", L_robe,
+        "Can I buy some?", L_Next;
+//        "Do you have a silk robe I could buy?", L_robe,
 //        "Goodbye.", L_end;
+
+L_Next:
     mes "[Hetchel]";
     mes "\"Sure but you need to provide raw materials.";
     mes "I'll need " + @SHEET_COCOONS_NR +" silk cocoons per sheet,";
@@ -58,13 +57,15 @@ L_main_menu:
     next;
     if (countitem("SilkCocoon") == 0)
         goto L_sheet_no_cocoon;
+    goto L_sheet_menu;
 
 L_sheet_menu:
     menu
-        "I have what you asked for.", -,
+        "I have what you asked for.", L_Next1,
         "Sorry I didn't pay attention enough, what do you need?", L_how_many_cocoons,
         "Oops! Sorry, I'll come back soon with them.", L_end;
-    next;
+
+L_Next1:
     mes "[Hetchel]";
     mes "\"How many would you like?\"";
     input @SheetCount;
@@ -109,8 +110,9 @@ L_sheet_no_cocoon:
     mes "\"You don't have any cocoon? I'm sorry I can't do anything for you.\"";
     menu
         "I'll seek for them.", L_end,
-        "Where can I get cocoons?", -;
-    next;
+        "Where can I get cocoons?", L_Next2;
+
+L_Next2:
     mes "[Hetchel]";
     mes "\"Silk cocoons come from Silkworms. Silkworms live in the woodland area around Hurnscald.";
     mes "Silkworms like especially woods and dark areas. You can go there by ferry.\"";
@@ -135,6 +137,7 @@ L_zero_sheet:
 L_TooMany:
     mes "[Hetchel]";
     mes "\"Your bag hasn't room enough. Store some things and come back.\"";
+    goto L_end;
 
 L_end:
     set @SHEET_COCOONS_NR, 0;
diff --git a/world/map/npc/021-1/hideandseek.txt b/world/map/npc/021-1/hideandseek.txt
index 5945c01c..0896f727 100644
--- a/world/map/npc/021-1/hideandseek.txt
+++ b/world/map/npc/021-1/hideandseek.txt
@@ -8,6 +8,8 @@
 
 -|script|#hideandseekNTconfig|-1,
 {
+    end;
+
 OnInit:
     set $@hideandseekNT_MASK, BYTE_0_MASK;
     set $@hideandseekNT_SHIFT, BYTE_0_SHIFT;
@@ -40,14 +42,18 @@ OnInit:
     mes "\"98... 99... 100!\"";
     mes "She takes away her hands and looks up.";
     menu
-        "Hello, what are you doing?",-,
+        "Hello, what are you doing?",L_Next,
         "(Leave)",L_Close;
+
+L_Next:
     mes "[Ayasha]";
     mes "\"I'm playing hide and seek with my friends!";
     mes "Do you want to play with us?\"";
     menu
-        "Sure, sounds like fun.",-,
+        "Sure, sounds like fun.",L_Next1,
         "I'm busy with more important things!",L_Close;
+
+L_Next1:
     mes "[Ayasha]";
     mes "\"Great! You can take my turn with searching. You need to find all five of my friends.";
     mes "They're hiding somewhere in this part of the city, you don't have to pass an archway to find them. But they're allowed to hide on the rooftops.\"";
@@ -67,7 +73,9 @@ L_Reward:
     getexp @EXP, 0;
     set QUEST_NorthTulimshar, QUEST_NorthTulimshar | $@hideandseekNT_ended;
     menu
-        "I think I need to do other things now.",-;
+        "I think I need to do other things now.",L_Next2;
+
+L_Next2:
     mes "[Ayasha]";
     mes "\"Oh, ok.";
     mes "Have you already seen the bazaar? It's a very exciting place! I love the entertainer. She can make so many funny faces.\"";
@@ -99,13 +107,17 @@ L_Close:
 
     mes "You see a kid hiding behind a box.";
     menu
-        "What are you doing there?",-,
+        "What are you doing there?",L_Next,
         "(Leave)",L_Close;
+
+L_Next:
     mes "[Latif]";
     mes "\"Hiding. We're playing hide and seek. Don't say that is boring. It's fun.\"";
     menu
         "I agree, it's fun.",L_Agree,
-        "Hide and seek? Lame.",-;
+        "Hide and seek? Lame.",L_Next1;
+
+L_Next1:
     mes "[Latif]";
     mes "\"My friend Vincent thinks so too. He doesn't want to join us playing. Do you know what he does instead?";
     mes "He builds action figures out of Bug Legs! That is lame.\"";
@@ -211,8 +223,10 @@ L_Close:
     mes "[Faris]";
     mes "\"Oh, hi there. What are you doing here on the roof?\"";
     menu
-        "I'm just having a look around.",-,
-        "It's nice place here, isn't it?",-;
+        "I'm just having a look around.",L_Next,
+        "It's nice place here, isn't it?",L_Next;
+
+L_Next:
     mes "[Faris]";
     mes "\"He, you're cool. I'm hiding here from Ayasha, we're playing hide and seek. This is the best hiding place ever.\"";
     goto L_Close;
@@ -301,8 +315,10 @@ L_Close:
 
     mes "You see a girl standing behind the building. She has a look of intense concentration on her face.";
     menu
-        "Hi, what are you doing there?",-,
+        "Hi, what are you doing there?",L_Next,
         "(Leave)",L_Close;
+
+L_Next:
     mes "[Ghada]";
     mes "\"Oh, hello. I'm hiding. We're playing hide and seek.\"";
     goto L_Close;
diff --git a/world/map/npc/021-1/imec.txt b/world/map/npc/021-1/imec.txt
index ee46d688..7a5eb975 100644
--- a/world/map/npc/021-1/imec.txt
+++ b/world/map/npc/021-1/imec.txt
@@ -5,6 +5,8 @@
 
 -|script|#ImecShopConfig|-1,
 {
+    end;
+
 OnInit:
     set $@ImecShopNT_MASK, 0x300;
     set $@ImecShopNT_SHIFT, 8;
@@ -30,11 +32,15 @@ OnInit:
     mes "[Imec]";
     mes "\"You can do an errand for me. I just finished writing a petition to the Council about my shop.";
     mes "If you bring it to the government building near the bazaar, I'll give you a small reward.\"";
+    goto L_Offer;
+
 L_Offer:
     menu
         "What is in that government building and where is it?",L_Explain,
-        "Ok, sounds good.",-,
+        "Ok, sounds good.",L_Next,
         "No!",L_Close;
+
+L_Next:
     mes "[Imec]";
     mes "\"Very good. Here is the paper.\"";
     mes "Imec gives you a sealed letter. You put it away in a pocket separated from your inventory, so it won't get lost.";
@@ -70,7 +76,9 @@ L_Return:
     next;
     mes "It seems Imec doesn't notice you anymore.";
     menu
-        "You mentioned a reward.",-;
+        "You mentioned a reward.",L_Next1;
+
+L_Next1:
     mes "[Imec]";
     mes "\"What? Ah, right. Here, have this.\"";
     set Zeny, Zeny + @money;
@@ -79,6 +87,8 @@ L_Return:
     next;
     mes "\"Actually, you could be of further help to me.\"";
     next;
+    goto L_Stingers;
+
 L_Stingers:
     mes "[Imec]";
     set @dq_level, 10;
diff --git a/world/map/npc/021-1/north_shops.txt b/world/map/npc/021-1/north_shops.txt
index b7c2b65a..80e34433 100644
--- a/world/map/npc/021-1/north_shops.txt
+++ b/world/map/npc/021-1/north_shops.txt
@@ -8,6 +8,7 @@
 021-1.gat,129,40,0|script|Well|400,
 {
     callfunc "WaterBottle";
+    end;
 }
 
 // An officer (for security)
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;
 }