Clear (most) new warnings

38 files changed, 120 insertions, 775 deletions

diff --git a/world/map/npc/001-1/elanore.txt b/world/map/npc/001-1/elanore.txt
index 8f52e771..87ef060d 100644
--- a/world/map/npc/001-1/elanore.txt
+++ b/world/map/npc/001-1/elanore.txt
@@ -512,13 +512,6 @@ L_Teach_dunno:
     next;
     goto L_Main;
 
-L_NoMagicNoTeach:
-    mes "[Elanore the Healer]";
-    mes "Elanore shakes her head.";
-    mes "\"I am sorry, but you don't have any magical abilities.  I can only teach those who already have the power to do magic.\"";
-    next;
-    goto L_Main;
-
 L_Question:
     callfunc "MagicTalkOptionsSetup";
     set @ignore, @QQ_ELANORE;
diff --git a/world/map/npc/001-1/luca.txt b/world/map/npc/001-1/luca.txt
index 4312e822..61d27cd4 100644
--- a/world/map/npc/001-1/luca.txt
+++ b/world/map/npc/001-1/luca.txt
@@ -65,6 +65,7 @@ L_Next:
         "No.", L_Nev;
 L_CallExplain:
     callsub S_explain;
+    goto L_teach0_follow;
 
 L_teach0_follow:
     mes "[Luca the Hunter]";
diff --git a/world/map/npc/001-1/monster_guide.txt b/world/map/npc/001-1/monster_guide.txt
index eb2b10ce..d0313645 100644
--- a/world/map/npc/001-1/monster_guide.txt
+++ b/world/map/npc/001-1/monster_guide.txt
@@ -2,12 +2,12 @@
 
 001-1.gat,48,52,0|script|Aidan|102,
 {
-    if(MPQUEST == 0) goto Register;
+    if(MPQUEST == 0) goto L_Register;
     mes "[Aidan the Monster Guide]";
     mes "You currently have " +Mobpt+ " Monster Points. These points are acquired while killing monsters";
     close;
 
-Register:
+L_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;
diff --git a/world/map/npc/001-1/rewards_master.txt b/world/map/npc/001-1/rewards_master.txt
index f078c62b..0e8fbe1f 100644
--- a/world/map/npc/001-1/rewards_master.txt
+++ b/world/map/npc/001-1/rewards_master.txt
@@ -14,7 +14,7 @@
 
     set @i, 0;
     setarray @Menu$, "", "", "", "", "", "", "", "", "", "", "", "";
-    callsub SUB_prep_menu;
+    callsub S_prep_menu;
 
     menu
         @Menu$[0], L_MenuItems,
@@ -43,7 +43,7 @@ L_MenuItems:
 L_Item_Loop:
     if (@rec == @req || Mobpt < tvis) goto L_Item_Done;
 
-    callsub SUB_give_item;
+    callsub S_give_item;
     set @rec, @rec + 1;
     goto L_Item_Loop;
 
@@ -72,7 +72,7 @@ L_Give_all_loop:
     set @gotocounter, @gotocounter - 1;
     if (@gotocounter < 1) goto L_Give_all_next;
     set @itemgiveerror, 0;
-    callsub SUB_give_item;
+    callsub S_give_item;
     if (@itemgiveerror != 0) goto L_Close;
     goto L_Give_all_loop;
 
@@ -98,7 +98,7 @@ L_Close:
 // Subroutines
 //////////////////////////////////////////////////
 
-SUB_prep_menu:
+S_prep_menu:
     set @pts, Mobpt;
     set @dif, tvis;
     goto L_Menu_Loop;
@@ -125,11 +125,11 @@ L_Menu_Done:
     set @Menu$[@i], "No thanks";
     return;
 
-SUB_give_item:
+S_give_item:
     set @itemgiveerror, 0;
     getinventorylist;
-    if (@inventorylist_count == 100) goto SUB_give_noinv;
-    if (Mobpt < tvis) goto SUB_give_nomobpts;
+    if (@inventorylist_count == 100) goto S_give_noinv;
+    if (Mobpt < tvis) goto S_give_nomobpts;
     set Mobpt, Mobpt - tvis;
     set tvis, tvis + 1;
     set @item$, @Items$[rand(getarraysize(@Items$))];
@@ -139,12 +139,12 @@ SUB_give_item:
     mes "You received one " + getitemname(@item$) + "!";
     return;
 
-SUB_give_noinv:
+S_give_noinv:
     mes "Your inventory is full!";
     set @itemgiveerror, 1;
     return;
 
-SUB_give_nomobpts:
+S_give_nomobpts:
     mes "It looks like your Monster Points were over estimated.";
     set @itemgiveerror, 1;
     return;
diff --git a/world/map/npc/001-2/omar.txt b/world/map/npc/001-2/omar.txt
index 1adfa796..22e0b87d 100644
--- a/world/map/npc/001-2/omar.txt
+++ b/world/map/npc/001-2/omar.txt
@@ -309,11 +309,6 @@ L_do_cure:
     mes "\"You should get some sleep now, sweetheart.  I'm sure that you will be better soon.\"";
     goto L_Close;
 
-L_goodbye:
-    mes "[Kadiya]";
-    mes "Goodbye!";
-    goto L_Close;
-
 L_cured:
     mes "[Kadiya]";
     mes "Kadiya seems to be sleeping calmly.  She looks much less sweaty than earlier; unless you are very much mistaken, her fever has disappeared.";
diff --git a/world/map/npc/002-4/naem.txt b/world/map/npc/002-4/naem.txt
index 04818ebf..398ef514 100644
--- a/world/map/npc/002-4/naem.txt
+++ b/world/map/npc/002-4/naem.txt
@@ -125,7 +125,7 @@ L_Naem_Code:
 L_Naem_Gloves:
     getinventorylist;
     if (@inventorylist_count == 100)
-        goto L_Nathan_TooMany;
+        goto L_Naem_TooMany;
     set FLAGS, FLAGS | FLAG_GOT_NAEM_GLOVES;
     getitem "MinerGloves", 1;
     mes "[Naem]";
diff --git a/world/map/npc/006-1/pachua.txt b/world/map/npc/006-1/pachua.txt
index a40f4ebf..9ed34c06 100644
--- a/world/map/npc/006-1/pachua.txt
+++ b/world/map/npc/006-1/pachua.txt
@@ -114,7 +114,7 @@ L_Chaps_store:
 L_BuyChaps:
     if (Zeny < 10000) goto L_NoMoney;
     if (countitem("JeansShorts") < 1) goto L_NoJeans;
-    if (countitem("SnakeSkin") < 10) goto L_NoSkin;
+    if (countitem("SnakeSkin") < 10) goto L_NoSkins;
     set Zeny, Zeny - 10000;
     delitem "SnakeSkin", 10;
     delitem "JeansShorts", 1;
@@ -124,7 +124,7 @@ L_BuyChaps:
 L_BuyCowboy:
     if (Zeny < 5000) goto L_NoMoney;
     if (countitem("FancyHat") < 1) goto L_NoFancy;
-    if (countitem("SnakeSkin") < 2) goto L_NoSkin;
+    if (countitem("SnakeSkin") < 2) goto L_NoSkins;
     set Zeny, Zeny - 5000;
     delitem "SnakeSkin", 2;
     delitem "FancyHat", 1;
@@ -239,81 +239,4 @@ L_warp_cheat:
     message strcharinfo(0), "Pachua releases a ring of smoke towards the sky! But, by the look on his face, you can tell he is suspicious about your methods...";
     set @warp_cheat, 1;
     end;
-
-L_Basket:
-    mes "[Chief Pachua]";
-    mes "";
-    mes "\"For generations my tribe has been crafting special clothes out of different items.\"";
-    mes "\"Maybe if you bring me the right materials I can make something for you.\"";
-    next;
-    menu
-        "Do you work only with clothes? Because I was looking for a basket.", L_Next1;
-
-L_Next1:
-    mes "\"A basket? In our tribe, we craft baskets of all kinds using only reeds. This basket, you need it to carry your items?\"";
-    menu
-        "No. It is for the Easter Bunny. I offered to get him one.", L_Next2;
-
-L_Next2:
-    mes "\"I appreciate your attitude. Maybe I can help you with that.\"";
-    menu
-        "I would be really grateful if you could do that!", L_Next3,
-        "Nah, I decided not to do that stupid quest.", L_Close,
-        "I would prefer to talk to you about other stuff.", L_Begin; //should go to pachuas's regular chat
-
-L_Next3:
-    set QUEST_Easter11, 2;
-    goto L_MakeBasket;
-
-L_MakeBasket:
-    mes "[Chief Pachua]";
-    mes "";
-    mes "\"I will need you to gather reeds for me.\"";
-    mes "\"5 bundles should do it.\"";
-    mes "\"You should be able to get those from mouboos as they graze.\"";
-    menu
-        "I have the Reeds!", L_Next4,
-        "Ok, I will be back soon", L_Close,
-        "I changed my mind, forget about it", L_Close,
-        "Can I talk to you about another stuff?", L_Begin; //should go to pachuas's regular chat
-
-L_Next4:
-    if(countitem("ReedBundle") < 5) goto L_EasterNotEnough;
-    goto L_EasterEnough;
-
-L_EasterNotEnough:
-    mes "[Chief Pachua]";
-    mes "";
-    mes "\"You do not have enough Reed Bundles for me to work with.\"";
-    mes "\"Go gather more.\"";
-    goto L_Close;
-
-L_EasterEnough:
-    getinventorylist;
-    if (@inventorylist_count == 100 && countitem("ReedBundle") > 5) goto L_EasterTooMany;
-    if(countitem("ReedBundle") < 5) goto L_EasterNotEnough;
-    delitem "ReedBundle", 5;
-    getitem "EasterBasket", 1;
-    set QUEST_Easter11, 3;
-    mes "[Chief Pachua]";
-    mes "";
-    mes "\"You have gathered enough reeds for me to make the basket.\"";
-    mes "He skillfully soaks the reeds you brought him,";
-    mes "then swiftly weaves them into a basket shape.";
-    mes "Next, he places the damp basket in the sun to dry for a minute before handing it over to you.";
-    mes "\"Here is your Easter Basket.\"";
-    goto L_Close;
-
-L_EasterTooMany:
-    mes "[Chief Pachua]";
-    mes "";
-    mes "\"You don't have room for the Easter Basket. Come back later.\"";
-    goto L_Close;
-
-L_SeeBunny:
-    mes "[Chief Pachua]";
-    mes "";
-    mes "\"You need to return to the Easter Bunny now.\"";
-    next;
-    goto L_Begin;
 }
diff --git a/world/map/npc/008-1/george.txt b/world/map/npc/008-1/george.txt
index b7c3ce5b..92215420 100644
--- a/world/map/npc/008-1/george.txt
+++ b/world/map/npc/008-1/george.txt
@@ -23,40 +23,4 @@ L_EyePatch:
     mes "[George the Pirate]";
     mes "\"Arrrrh! Looks like ye lost an eye there!\"";
     close;
-
-L_George_Easter2012:
-    mes "[George the Pirate]";
-    mes "\"Aaarrrrh mate! That scarab armlet was a present from my grandfather, I swear! That is all I have to say...\"";
-    next;
-    menu
-        "What? What are you talking about?", L_Next;
-
-L_Next:
-    mes "[George the Pirate]";
-    mes "\"Uh? Ahh, hehe... Arrrh, what crime are ye talking about?\"";
-    next;
-    menu
-        "The Easter Bunny was kidnapped. I heard you know the person behind this crime.", L_Next1;
-
-L_Next1:
-    mes "[George the Pirate]";
-    mes "\"Arrrrh, I know, I know... But it's such a sad thing. My old mate Pink Boots Hank. He was a great treasure hunter, but now he is just a criminal.\"";
-    next;
-    mes "\"I remember like it was yesterday! Pink Boots Hank was not the same, he had those crazy eyes and would not stop talking about this man, or monster, or spirit, I don't know, I think his name is Galvanes or Gilbenos, I don't know.\"";
-    next;
-    mes "\What I know is from that day, he just started doing crazy things, like stealing money, present boxes, even chocolate cake!\"";
-    next;
-    menu
-        "But what about the Easter Bunny?", L_Next2;
-
-L_Next2:
-    mes "[George the Pirate]";
-    mes "\"Yes, yes... Hank is not a very smart guy. I remember he had a secret place, a big house in the desert. When he could find a treasure he would always run to this house and hide his things in the basement. I am sure he must be using this same place to hide the Easter Bunny.\"";
-    next;
-    menu
-        "Thank you George, I will check this information right now!", L_Next3;
-
-L_Next3:
-    set QUEST_Easter12, 4;
-    close;
 }
diff --git a/world/map/npc/009-1/jack.txt b/world/map/npc/009-1/jack.txt
index 48c9a26b..1cafe780 100644
--- a/world/map/npc/009-1/jack.txt
+++ b/world/map/npc/009-1/jack.txt
@@ -40,9 +40,9 @@
 
     mes "[Jack Lumber]";
     mes "\"Hello there, my name is Jack Lumber, the enemy of all trees.  If you need some firewood just let me know.\"";
-    if (@inspector != 1)
-        goto L_NotInspector;
-    callsub S_NohMask_Ask;
+    if (@inspector == 1)
+        goto L_NohMask_Ask;
+    goto L_NotInspector;
 
 L_NotInspector:
     next;
@@ -120,8 +120,7 @@ L_Bow_state_2:
     mes "\"Good luck hunting those tree monsters - you will need it.\"";
     if (@inspector != 1)
         goto L_Close;
-    callsub S_NohMask_Ask;
-    goto L_Close;
+    goto L_NohMask_Ask;
 
 L_Bow_state_4:
     mes "[Jack Lumber]";
@@ -247,14 +246,10 @@ L_Shield_state_3:
         "Me too.", L_Made_Shield,
         "Have you seen anything that might be connected to the recent robberies in town?", L_NohMask_Answer;
 
-// This is an ugly violation of the scripting standards,
-// but it's somewhat complicated to fix.
-S_NohMask_Ask:
-    next;
+L_NohMask_Ask:
     menu
         "I'll keep that in mind.", L_Close,
         "Have you seen anything that might be connected to the recent robberies in town?", L_NohMask_Answer;
-    return;
 
 L_NohMask_Answer:
     mes "[Jack Lumber]";
diff --git a/world/map/npc/009-2/airlia.txt b/world/map/npc/009-2/airlia.txt
index 0071c7e7..b02627c8 100644
--- a/world/map/npc/009-2/airlia.txt
+++ b/world/map/npc/009-2/airlia.txt
@@ -58,7 +58,6 @@ L_Caretaker:
         "Sorry, no.", L_Next,
         "I have a letter from your father.", L_Caretaker_first_reward,
         "My what?", L_Caretaker_mount;
-    goto L_Next;
 
 L_Next:
     mes "[Airlia]";
diff --git a/world/map/npc/009-2/nicholas.txt b/world/map/npc/009-2/nicholas.txt
index edcb2321..258e7088 100644
--- a/world/map/npc/009-2/nicholas.txt
+++ b/world/map/npc/009-2/nicholas.txt
@@ -172,11 +172,6 @@ L_NoItem:
     mes "\"It appears you don't have enough Coal and Iron Ingots for me to work with.  Please do come back when you have more, though.\"";
     close;
 
-L_ComeBack:
-    mes "[Nicholas]";
-    mes "\"Come back any time.\"";
-    close;
-
 L_NoMoney:
     mes "[Nicholas]";
     mes "\"Oh dear, it seems you don't have enough money.\"";
diff --git a/world/map/npc/009-2/nurse.txt b/world/map/npc/009-2/nurse.txt
index 2320297e..4a432db4 100644
--- a/world/map/npc/009-2/nurse.txt
+++ b/world/map/npc/009-2/nurse.txt
@@ -45,14 +45,14 @@
 
     set @inspector, ((QUEST_Hurnscald & NIBBLE_3_MASK) >> NIBBLE_3_SHIFT);
 
-    if (@Q_poison == 7) goto state7;
-    if (@Q_poison == 6) goto state6;
-    if (@Q_poison == 5) goto state5;
-    if (@Q_poison == 4) goto state4;
-    if (@Q_poison == 3) goto state3;
-    if (@Q_poison == 2) goto state2;
-    if (@Q_poison == 1) goto state1;
-    if (getskilllv(SKILL_POOL)) goto state0;
+    if (@Q_poison == 7) goto L_state7;
+    if (@Q_poison == 6) goto L_state6;
+    if (@Q_poison == 5) goto L_state5;
+    if (@Q_poison == 4) goto L_state4;
+    if (@Q_poison == 3) goto L_state3;
+    if (@Q_poison == 2) goto L_state2;
+    if (@Q_poison == 1) goto L_state1;
+    if (getskilllv(SKILL_POOL)) goto L_state0;
     goto L_Usual;
 
 L_Usual:
@@ -101,7 +101,7 @@ L_NohMask:
     mes "\"I'm too busy here to observe the town.\"";
     goto L_Close;
 
-state0:
+L_state0:
     mes "[Nurse]";
     mes "\"Welcome! You really look like a competent person. Maybe you can help to deal with a problem we have.\"";
     next;
@@ -131,7 +131,7 @@ L_ExplainAgain1:
     mes "\"Please bring me five tongues of snakes and ten stingers of black scorpions.\"";
     goto L_Close;
 
-state1:
+L_state1:
     mes "[Nurse]";
     mes "\"You are back, wonderful! Did you get what we need for the antidote?\"";
     next;
@@ -160,7 +160,7 @@ L_ExplainAgain2:
     mes "\"Please bring me ten acorns, five red apples, five green apples and also five oranges. And we need some small healing potions. They will be useful to hold off the baneful effects. Three of them will be enough, I guess.\"";
     goto L_Close;
 
-state2:
+L_state2:
     mes "You look at the nurse, who seems to be really tired, with shadows under her eyes. When she recognizes you, she smiles.";
     mes "[Nurse]";
     mes "\"I managed to extract the poisonous components. We should be able to create an antidote, if you have everything else we need.\"";
@@ -212,7 +212,7 @@ L_Chemistry:
     mes "\"Come back when you feel ready for that task.\"";
     goto L_Close;
 
-state3:
+L_state3:
     mes "[Nurse]";
     mes "\"Hello my friend. You feel prepared to test the antidote?\"";
     next;
@@ -331,22 +331,22 @@ L_choosePut:
     next;
 
     if ( (@hlPut >  @hlNeed) && (@vnPut >  @vnNeed) )
-        goto m_hl_m_vn;
+        goto L_m_hl_m_vn;
     if ( (@hlPut >  @hlNeed) && (@vnPut <= @vnNeed) )
-        goto m_hl_l_vn;
+        goto L_m_hl_l_vn;
     if ( (@hlPut <= @hlNeed) && (@vnPut >  @vnNeed) )
-        goto l_hl_m_vn;
+        goto L_l_hl_m_vn;
     if ( (@hlPut <  @hlNeed) && (@vnPut <  @vnNeed) )
-        goto l_hl_l_vn;
+        goto L_l_hl_l_vn;
 
     mes "You feel quite normal.";
     mes "[Nurse]";
     mes "\"Oh yes, the concentration of the healing potions and the venom extracts seem to be right.\"";
     next;
     set @hl_vn_ok, 1;
-    goto check_st;
+    goto L_check_st;
 
-m_hl_m_vn:
+L_m_hl_m_vn:
     //poison for 3 minutes
     sc_start sc_poison, 1, 20;
     mes "You begin to feel really dizzy. And you feel so light - you can't help yourself and burst out with laughter. What a strange feeling!";
@@ -354,9 +354,9 @@ m_hl_m_vn:
     mes "The nurse looks at you with a really worried look on her face. As you open your mouth to tell her that you feel alright, the content of your stomach finds its way out through your throat and on the floor.";
     next;
     mes "The feeling of happiness disappears, but you seem to be still poisoned.";
-    goto check_st;
+    goto L_check_st;
 
-m_hl_l_vn:
+L_m_hl_l_vn:
     //poison for 1 minute
     sc_start sc_poison, 1, 20;
     mes "You feel the pain of the poison weaken. This seems promising. The thought that you might have been successful makes you feel enormously happy.";
@@ -375,9 +375,9 @@ m_hl_l_vn:
     next;
     mes "\"Very well, you are sober again.\"";
     next;
-    goto check_st;
+    goto L_check_st;
 
-l_hl_m_vn:
+L_l_hl_m_vn:
     // first poison for 10 minutes, player will die anyway
     sc_start sc_poison, 1, 20;
     mes "You feel a sting in your stomach and your heart starts pounding loudly.";
@@ -391,40 +391,40 @@ l_hl_m_vn:
     heal -Hp, 0;
     // close instead of telling how much stabilizer is needed
     goto L_Close;
-    // goto check_st;
+    // goto L_check_st;
 
-l_hl_l_vn:
+L_l_hl_l_vn:
     //poison for 1 minute
     sc_start sc_poison, 1, 20;
     mes "The antidote seems to have no effect.";
-    goto check_st;
+    goto L_check_st;
 
-check_st:
+L_check_st:
     if ( (@stPut < @stNeed) )
-        goto l_st;
+        goto L_l_st;
     if ( (@stPut > @stNeed) )
-        goto m_st;
+        goto L_m_st;
     if (@hl_vn_ok == 1)
-        goto allcorrect;
+        goto L_allcorrect;
 
     mes "[Nurse]";
     mes "\"The amount of the stabilizer seems alright, but we have to think again about the other ingredients.\"";
     next;
-    goto notallcorrect;
+    goto L_notallcorrect;
 
-l_st:
+L_l_st:
     mes "[Nurse]";
     mes "\"It looks like we used not enough of the stabilizer. The antidote will lose its effect after some time.\"";
     next;
-    goto notallcorrect;
+    goto L_notallcorrect;
 
-m_st:
+L_m_st:
     mes "[Nurse]";
     mes "\"It looks like we used too much of the stabilizer. The antidote will turn into venom again after some time.\"";
     next;
-    goto notallcorrect;
+    goto L_notallcorrect;
 
-allcorrect:
+L_allcorrect:
     mes "You feel totally normal again.";
     next;
     mes "[Nurse]";
@@ -440,13 +440,13 @@ allcorrect:
     callsub S_Update_Var;
     goto L_Close;
 
-notallcorrect:
+L_notallcorrect:
     mes "[Nurse]";
     mes "\"It didn't work. You are a really brave person. Now you should rest and recover. I hope you won't give up now. Please come back later, so we can try it again.\"";
     next;
     goto L_Close;
 
-state4:
+L_state4:
     mes "The nurse has a worried look in her face.";
     mes "[Nurse]";
     mes "\"Hello. I hope you recovered well.\"";
@@ -466,7 +466,7 @@ state4:
         "I'm ok. We can try, but please explain again.", L_Exp_Game,
         "Let's start right now.", L_Game;
 
-state5:
+L_state5:
     mes "The nurse looks at you pitifully.";
     mes "[Nurse]";
     mes "\"Hello. I'm really sorry for causing you so much pain.\"";
@@ -486,7 +486,7 @@ state5:
         "I'm ok. We can try, but please explain again.", L_Exp_Game,
         "Let's start right now.", L_Game;
 
-state6:
+L_state6:
     mes "The nurse looks at you pitifully.";
     mes "[Nurse]";
     mes "\"There is not enough stuff left for another try.\"";
@@ -496,7 +496,7 @@ state6:
     callsub S_Update_Var;
     goto L_ExplainAgain1;
 
-state7: // geschafft
+L_state7: // geschafft
     mes "[Nurse]";
     mes "\"Thanks a lot, you can call yourself a true hero now!\"";
     next;
diff --git a/world/map/npc/009-3/sword.txt b/world/map/npc/009-3/sword.txt
index cdf69ea9..df4adeb4 100644
--- a/world/map/npc/009-3/sword.txt
+++ b/world/map/npc/009-3/sword.txt
@@ -134,7 +134,7 @@ L_Next2:
     mes "\"If that is thou wishest, I shall not stop thee.  But do not expect to find merriment down this road.\"";
     mes "\"I must ask that thou sacrificest five thousand monster points for this, however.\"";
     menu
-        "No, I don't want that.", L_farewell,
+        "No, I don't want that.", L_Close,
         "Very well.", L_Next3;
 
 L_Next3:
diff --git a/world/map/npc/009-4/torches.txt b/world/map/npc/009-4/torches.txt
index eec66815..22d718af 100644
--- a/world/map/npc/009-4/torches.txt
+++ b/world/map/npc/009-4/torches.txt
@@ -218,7 +218,7 @@ L_Use_Blue:
     if (5 <= @TorchColor && @TorchColor <= 8)
         goto L_Color_Inc;
     if (@TorchColor == 9)
-        goto L_WrongColor;
+        goto L_Wrong_Color;
     if (10 <= @TorchColor && @TorchColor <= 12)
         goto L_Color_Dec;
 
diff --git a/world/map/npc/010-2/chef.txt b/world/map/npc/010-2/chef.txt
index a128b094..1ea64fef 100644
--- a/world/map/npc/010-2/chef.txt
+++ b/world/map/npc/010-2/chef.txt
@@ -1,23 +1,5 @@
 010-2.gat,33,25,0|script|Chef#dimond|148,
 {
-// lines belong to Easter 2011:
-// set @month, 4;
-// set @start_day, 15;
-// set @end_day, 30;
-
-// if (gettime(6) == @month && gettime(5) >= @start_day && gettime(5) <= @end_day && QUEST_Easter11 == 7) goto L_JellyBean;
-// if (gettime(6) == @month && gettime(5) >= @start_day && gettime(5) <= @end_day && QUEST_Easter11 == 8) goto L_MakeJellyBean;
-// if (gettime(6) == @month && gettime(5) >= @start_day && gettime(5) <= @end_day && QUEST_Easter11 == 9) goto L_SeeBunny;
-
-// lines belong to Easter 2012:
-//    if (!(gettime(6) == 3 && gettime(5) >= $@easter2012_start_day) && !(gettime(6) == 4 && gettime(5) <= $@easter2012_reward_end_day)) goto L_Begin;
-//    if (QUEST_Easter12 == 6) goto L_Easter2012_Begin;
-//    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]";
     mes "";
     mes "\"I'm too busy right now to talk.\"";
@@ -138,233 +120,8 @@ L_bringit:
     mes "";
     mes "\"Bring it here when you do.\"";
     next;
-    goto L_End;
+    goto L_end;
 
-L_End:
-    close;
-
-L_JellyBean:
-    mes "[Chef]";
-    mes "";
-    mes "\"I can't talk right now... I'm too busy.\"";
-    next;
-    mes "\"Oh, wait. I see you are the adventurer who was speaking with the Easter Bunny. He has a really bad memory, you know? Every year he forgets who he needs to ask to get Jelly Beans, and every year an adventurer comes to my kitchen asking if I can help the Easter Bunny get some.\"";
-    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!", 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]";
-    mes "";
-    mes "\"I will need you to bring me some candies.\"";
-    mes "\"I think 15 should be enough.\"";
-    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!", 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)
-        goto L_EasterEnough;
-    close;
-
-L_EasterNotEnough:
-    mes "[Chef]";
-    mes "";
-    mes "\"You do not have enough candies for me to work with yet.\"";
-    mes "\"Please go get more.\"";
-    close;
-
-L_EasterEnough:
-    getinventorylist;
-    if (@inventorylist_count == 100 && countitem("Candy") > 15)
-        goto L_EasterTooMany;
-    if(countitem("Candy") < 15)
-        goto L_EasterNotEnough;
-    delitem "Candy", 15;
-    getitem "JellyBeans", 1;
-    set QUEST_Easter11, 9;
-    mes "[Chef]";
-    mes "";
-    mes "\"You have gathered enough candies for me to make the Jelly Beans.\"";
-    mes "He puts the candies into a pot and starts melting them.";
-    mes "He adds in some gooey stuff, then lets the solution cool for a moment before forming the Jelly Beans.";
-    mes "\"Here are your Jelly Beans.\"";
-    close;
-
-L_TooMany:
-    mes "[Chef]";
-    mes "";
-    mes "\"You don't have enough room for the Jelly Beans. Come back later.\"";
-    close;
-
-L_SeeBunny:
-    mes "[Chef]";
-    mes "";
-    mes "\"Oh yeah, you need to return to the Easter Bunny now.\"";
-    next;
-    goto L_Begin;
-
-// Lines below here belong to Easter 2012:
-
-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?", 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;
-    mes "\"But here is the problem, to complete this recipe I need a very resistant pan, because in the process I need to use a very strong acid solution based on yeti saliva!\"";
-    next;
-    mes "\"Can you believe I ruined ALL of my pans and 17 infantry helmets while trying to cook it? That is why I am asking for this favor. Could you lend me your pan? I promise I will give you a jar of the final product.\"";
-    next;
-    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!", 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;
-
-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.", L_Next7,
-        "No way!", L_Close;
-
-L_Next7:
-    if (countitem("PanHat") < 1)
-        goto L_No_PanHat;
-    delitem "PanHat", 1;
-    set QUEST_Easter12, 7;
-    mes "\"Very good! Now I just need to put the basic ingredients inside a metal pan filled with water, yeti saliva, a little bit of salt and finally... The secret ingredient!\"";
-    next;
-    mes "The chef turns his back to you so he can hide what he is using. But you can clearly distinguish a smell of coal...";
-    mes "\"Hahahah! And now we wait!\"";
-    close;
-
-L_Easter2012_Wait:
-    if ((gettime(6) == 4 && gettime(5) >= $@easter2012_reward_start_day))
-        goto L_Easter2012_Result;
-    mes "[Chef]";
-    mes "\"Be patient... The basic ingredients are not ready yet.\"";
-    close;
-
-L_Easter2012_Result:
-    set @temp, rand(99);
-    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.", 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;
-    goto L_Easter2012_Unlucky;
-    close;
-
-L_Easter2012_Lucky:
-    mes "[Chef]";
-    mes "\"Wait! Did I mention bad news? I must be crazy... There is no bad news my friend! The ultimate pickled beets is now ready AND your pan is intact!\"";
-    next;
-    mes "\"Here! Take your pan back and a jar of the best pickled beets of the mana world!\"";
-    set QUEST_Easter12, 10;
-    getitem "PickledBeets", 1;
-    getitem "PanHat", 1;
-    close;
-
-L_Easter2012_Unlucky:
-    mes "[Chef]";
-    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?", 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?", 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...", L_Next11;
-
-L_Next11:
-    mes "[Chef]";
-    mes "\"Here, take your pickled beets!\"";
-    getitem "PickledBeets", 1;
-    set QUEST_Easter12, 8;
-    close;
-
-OnEaster2012Out:
-    if (QUEST_Easter12 == 8)
-        set QUEST_Easter12, 9;
-    mes "[Chef]";
-    mes "\"Hey, I couldn't help but notice your sadness... You really like these silly hats, don't you? Well, since your hat is completely destroyed, just like all my pans, I can give you one of these nice cooking hats. But only if you give my jar of pickled beets back. What do you say?\"";
-    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;
-
-L_GetChefhat:
-    if (countitem("PickledBeets") < 1)
-        goto L_No_Pickledbeets;
-    mes "[Chef]";
-    mes "\"Really? Well, if you are sure about that... Here is your hat!\"";
-    delitem "PickledBeets", 1;
-    getitem "ChefHat", 1;
-    set QUEST_Easter12, 10;
-    close;
-
-L_KeepBeets:
-    mes "[Chef]";
-    mes "\"Hmm, I see that at least you are a wise person. See you later!\"";
-    set QUEST_Easter12, 10;
-    close;
-
-L_No_PanHat:
-    mes "[Chef]";
-    mes "\"So? You said you have the pan, where is it?\"";
-    close;
-
-L_No_Pickledbeets:
-    mes "[Chef]";
-    mes "\"Hey, no pickled beets means no chef hat.\"";
-    close;
-
-L_Easter2012Foolplayers:
-    mes "The chef can't hear you. He keeps looking and feeling the scent of his new recipe.";
-    close;
-
-L_Close:
+L_end:
     close;
 }
-
-//010-2.gat,28,31,0|script|#chefproposition|32767,0,0
-//{
-//OnTouch:
-//    if (gettime(7) != $@easter2012_year || QUEST_Easter12 != 8 || !((gettime(6) == 4 && gettime(5) >= $@easter2012_reward_start_day) && (gettime(6) == 4 && gettime(5) <= $@easter2012_reward_end_day)))
-//        end;
-//    doevent "Chef::OnEaster2012Out";
-//    end;
-//}
diff --git a/world/map/npc/010-2/dimonds.txt b/world/map/npc/010-2/dimonds.txt
index e51213ae..1048a108 100644
--- a/world/map/npc/010-2/dimonds.txt
+++ b/world/map/npc/010-2/dimonds.txt
@@ -47,12 +47,12 @@
     set @month, 1;
     set @start_day, 24;
     set @end_day, 26;
-    if (gettime(6) != @month) goto no_event;
-    if (gettime(5) < @start_day) goto no_event;
-    if (gettime(5) > @end_day) goto no_event;
+    if (gettime(6) != @month) goto L_no_event;
+    if (gettime(5) < @start_day) goto L_no_event;
+    if (gettime(5) > @end_day) goto L_no_event;
     if (gettimetick(2)-TUT_var < 2*7*86400 ) //player must be created at least 2 weeks ago
-        goto no_event;
-    if (FLAGS & FLAG_HAS_BOWLER_BURNSDAY ) goto event_done;
+        goto L_no_event;
+    if (FLAGS & FLAG_HAS_BOWLER_BURNSDAY ) goto L_event_done;
     getinventorylist;
     if (@inventorylist_count == 100) goto L_Full_Inv;
 
@@ -67,140 +67,140 @@
     mes "\"Clos'd under hatches,\"";
     mes "\"Spairges about the brunstane cootie\"";
     mes "\"To scaud poor wretches!\"";
-    callsub food_menu;
+    callsub S_food_menu;
     mes "\"Hear me, Auld Hangie, for a wee,\"";
     mes "\"An' let poor damned bodies be;\"";
     mes "\"I'm sure sma' pleasure it can gie,\"";
     mes "\"E'en to a deil,\"";
     mes "\"To skelp an' scaud poor dogs like me,\"";
     mes "\"An' hear us squeel!\"";
-    callsub food_menu;
+    callsub S_food_menu;
     mes "\"Great is thy pow'r, an' great thy fame;\"";
     mes "\"Far ken'd an' noted is thy name;\"";
     mes "\"An' tho' yon lowin heugh's thy hame,\"";
     mes "\"Thou travels far;\"";
     mes "\"An' faith! thou's neither lag nor lame,\"";
     mes "\"Nor blate nor scaur.\"";
-    callsub food_menu;
+    callsub S_food_menu;
     mes "\"Whyles, ranging like a roarin lion,\"";
     mes "\"For prey a' holes an' corners tryin;\"";
     mes "\"Whyles, on the strong-wing'd tempest flyin,\"";
     mes "\"Tirlin' the kirks;\"";
     mes "\"Whyles, in the human bosom pryin,\"";
     mes "\"Unseen thou lurks.\"";
-    callsub food_menu;
+    callsub S_food_menu;
     mes "\"I've heard my rev'rend graunie say,\"";
     mes "\"In lanely glens ye like to stray;\"";
     mes "\"Or whare auld ruin'd castles gray\"";
     mes "\"Nod to the moon,\"";
     mes "\"Ye fright the nightly wand'rer's way\"";
     mes "\"Wi' eldritch croon.\"";
-    callsub food_menu;
+    callsub S_food_menu;
     mes "\"When twilight did my graunie summon\"";
     mes "\"To say her pray'rs, douce honest woman!\"";
     mes "\"Aft yont the dike she's heard you bummin,\"";
     mes "\"Wi' eerie drone;\"";
     mes "\"Or, rustlin thro' the boortrees comin,\"";
     mes "\"Wi' heavy groan.\"";
-    callsub food_menu;
+    callsub S_food_menu;
     mes "\"Ae dreary, windy, winter night,\"";
     mes "\"The stars shot down wi' sklentin light,\"";
     mes "\"Wi' you mysel I gat a fright,\"";
     mes "\"Ayont the lough;\"";
     mes "\"Ye like a rash-buss stood in sight,\"";
     mes "\"Wi' waving sugh.\"";
-    callsub food_menu;
+    callsub S_food_menu;
     mes "\"The cudgel in my nieve did shake,\"";
     mes "\"Each bristl'd hair stood like a stake,\"";
     mes "\"When wi' an eldritch, stoor 'Quaick, quaick,'\"";
     mes "\"Amang the springs,\"";
     mes "\"Awa ye squatter'd like a drake,\"";
     mes "\"On whistling wings.\"";
-    callsub food_menu;
+    callsub S_food_menu;
     mes "\"Let warlocks grim an' wither'd hags\"";
     mes "\"Tell how wi' you on ragweed nags\"";
     mes "\"They skim the muirs an' dizzy crags\"";
     mes "\"Wi' wicked speed;\"";
     mes "\"And in kirk-yards renew their leagues,\"";
     mes "\"Owre howket dead.\"";
-    callsub food_menu;
+    callsub S_food_menu;
     mes "\"Thence, countra wives wi' toil an' pain\"";
     mes "\"May plunge an' plunge the kirn in vain;\"";
     mes "\"For oh! the yellow treasure's taen\"";
     mes "\"By witchin skill;\"";
     mes "\"An' dawtet, twal-pint hawkie's gaen\"";
     mes "\"As yell's the bill.\"";
-    callsub food_menu;
+    callsub S_food_menu;
     mes "\"Thence, mystic knots mak great abuse,\"";
     mes "\"On young guidmen, fond, keen, an' croose;\"";
     mes "\"When the best wark-lume i' the house,\"";
     mes "\"By cantraip wit,\"";
     mes "\"Is instant made no worth a louse,\"";
     mes "\"Just at the bit.\"";
-    callsub food_menu;
+    callsub S_food_menu;
     mes "\"When thowes dissolve the snawy hoord,\"";
     mes "\"An' float the jinglin icy-boord,\"";
     mes "\"Then water-kelpies haunt the foord\"";
     mes "\"By your direction,\"";
     mes "\"An' nighted trav'lers are allur'd\"";
     mes "\"To their destruction.\"";
-    callsub food_menu;
+    callsub S_food_menu;
     mes "\"And aft your moss-traversing spunkies\"";
     mes "\"Decoy the wight that late an drunk is:\"";
     mes "\"The bleezin, curst, mischievous monkeys\"";
     mes "\"Delude his eyes,\"";
     mes "\"Till in some miry slough he sunk is,\"";
     mes "\"Ne'er mair to rise.\"";
-    callsub food_menu;
+    callsub S_food_menu;
     mes "\"When Masons' mystic word an grip\"";
     mes "\"In storms an' tempests raise you up,\"";
     mes "\"Some cock or cat your rage maun stop,\"";
     mes "\"Or, strange to tell!\"";
     mes "\"The youngest brither ye wad whip\"";
     mes "\"Aff straught to hell!\"";
-    callsub food_menu;
+    callsub S_food_menu;
     mes "\"Lang syne, in Eden'd bonie yard,\"";
     mes "\"When youthfu' lovers first were pair'd,\"";
     mes "\"An all the soul of love they shar'd,\"";
     mes "\"The raptur'd hour,\"";
     mes "\"Sweet on the fragrant flow'ry swaird,\"";
     mes "\"In shady bow'r;\"";
-    callsub food_menu;
+    callsub S_food_menu;
     mes "\"Then you, ye auld snick-drawin dog!\"";
     mes "\"Ye cam to Paradise incog,\"";
     mes "\"And play'd on man a cursed brogue,\"";
     mes "\"(Black be your fa'!)\"";
     mes "\"An gied the infant warld a shog,\"";
     mes "\"Maist ruin'd a'.\"";
-    callsub food_menu;
+    callsub S_food_menu;
     mes "\"D'ye mind that day, when in a bizz,\"";
     mes "\"Wi' reeket duds an reestet gizz,\"";
     mes "\"Ye did present your smoutie phiz\"";
     mes "\"Mang better folk,\"";
     mes "\"An' sklented on the man of Uz\"";
     mes "\"Your spitefu' joke?\"";
-    callsub food_menu;
+    callsub S_food_menu;
     mes "\"An' how ye gat him i' your thrall,\"";
     mes "\"An' brak him out o' house and hal',\"";
     mes "\"While scabs and blotches did him gall,\"";
     mes "\"Wi' bitter claw,\"";
     mes "\"An' lows'd his ill-tongued, wicked scaul,\"";
     mes "\"Was warst ava?\"";
-    callsub food_menu;
+    callsub S_food_menu;
     mes "\"But a' your doings to rehearse,\"";
     mes "\"Your wily snares an' fechtin fierce,\"";
     mes "\"Sin' that day Michael did you pierce,\"";
     mes "\"Down to this time,\"";
     mes "\"Wad ding a Lallan tongue, or Erse,\"";
     mes "\"In prose or rhyme.\"";
-    callsub food_menu;
+    callsub S_food_menu;
     mes "\"An' now, Auld Cloots, I ken ye're thinkin,\"";
     mes "\"A certain Bardie's rantin, drinkin,\"";
     mes "\"Some luckless hour will send him linkin,\"";
     mes "\"To your black pit;\"";
     mes "\"But faith! he'll turn a corner jinkin,\"";
     mes "\"An' cheat you yet.\"";
-    callsub food_menu;
+    callsub S_food_menu;
     mes "\"But fare you weel, Auld Nickie-ben!\"";
     mes "\"O wad ye tak a thought an' men'!\"";
     mes "\"Ye aiblins might--I dinna ken--\"";
@@ -222,12 +222,12 @@ L_Next:
     set FLAGS, FLAGS | FLAG_HAS_BOWLER_BURNSDAY;
     close;
 
-no_event:
+L_no_event:
     mes "[Shannon]";
     mes "\"I'm a traveling poet and admirer of Robert Burns.\"";
     close;
 
-event_done:
+L_event_done:
     mes "[Shannon]";
     mes "\"Ah, my dear friend. Good to see you again in this remarkable time of the year.\"";
     next;
@@ -391,7 +391,7 @@ L_Full_Inv:
     mes "\"Maybe you should turn away from the mundane world and get rid of this burden to change your view to the beauty of poetry.\"";
     close;
 
-food_menu:
+S_food_menu:
     setarray @choice_idx, 0,0,0,0,0,0;
     setarray @choice$, "","","","","","";
 
diff --git a/world/map/npc/010-2/loratay.txt b/world/map/npc/010-2/loratay.txt
index 35cf3af7..f9467e40 100644
--- a/world/map/npc/010-2/loratay.txt
+++ b/world/map/npc/010-2/loratay.txt
@@ -368,7 +368,7 @@ L_proposal_retrieve_design:
     mes "\"May you go retrieve the design from Agostine?\"";
     next;
     menu
-        "Certainly I'll be back soon!", L_Close,
+        "Certainly I'll be back soon!", L_end,
         "Actually I want something else...", L_main_menu;
 
 L_proposal_bringing_design:
@@ -428,7 +428,7 @@ 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.", L_Close,
+        "I'm on my way.", L_end,
         "I have a request...", L_main_menu;
 
 L_desert_hat:
@@ -441,7 +441,7 @@ L_desert_hat:
     setarray @item_names$, "Here is a Cotton Headband.", "Here is a Red Cotton Headband.", "Here is a Green Cotton Headband.", "Here is a Dark Blue Cotton Headband.", "Here is a Yellow Cotton Headband.", "Here is a Light Blue Cotton Headband.", "Here is a Pink Cotton Headband.", "Here is a Black Cotton Headband.", "Here is an Orange Cotton Headband.", "Here is a Puple Cotton Headband.", "Here is a Dark Green Cotton Headband.";
     set @items_nr, 11;
 
-    callsub SUB_pick_one_of_many_items;
+    callsub S_pick_one_of_many_items;
     if (@item == 0)
         goto L_main_menu;
     if (@item == 724)
@@ -497,7 +497,7 @@ L_trim:
     setarray @items, 1202, 2050, 2051, 2052, 2053, 2054, 2055, 2056, 2057, 2058, 2059, 688, 2090, 2091, 2092, 2093, 2094, 2095, 2096, 2097, 2098, 2099, 632, 2100, 2101, 2102, 2103, 2104, 2105, 2106, 2107, 2108, 2109, 648, 2180, 2181, 2182, 2183, 2184, 2185, 2186, 2187, 2188, 2189;
     setarray @item_names$, "Cotton Shirt", "Red Cotton Shirt", "Green Cotton Shirt", "Dark Blue Cotton Shirt", "Yellow Cotton Shirt", "Light Blue Cotton Shirt", "Pink Cotton Shirt", "Black Cotton Shirt", "Orange Cotton Shirt", "Purple Cotton Shirt", "Dark Green Cotton Shirt", "Tank Top", "Red Tank Top", "Green Tank Top", "Dark Blue Tank Top", "Yellow Tank Top", "Light Blue Tank Top", "Pink Tank Top", "Black Tank Top", "Orange Tank Top", "Purple Tank Top", "Dark Green Tank Top", "Cotton Skirt", "Red Cotton Skirt", "Green Cotton Skirt", "Dark Blue Cotton Skirt", "Yellow Cotton Skirt", "Light Blue Cotton Skirt", "Pink Cotton Skirt", "Black Cotton Skirt", "Orange Cotton Skirt", "Purple Cotton Skirt", "Dark Green Cotton Skirt", "Cotton Trousers", "Red Cotton Trousers", "Green Cotton Trousers", "Dark Blue Cotton Trousers", "Yellow Cotton Trousers", "Light Blue Cotton Trousers", "Pink Cotton Trousers", "Black Cotton Trousers", "Orange Cotton Trousers", "Purple Cotton Trousers", "Dark Green Cotton Trousers";
     set @items_nr, 44;
-    callsub SUB_pick_one_of_many_items;
+    callsub S_pick_one_of_many_items;
     if (@item == 0)
         goto L_main_menu;
     set @delitem, @item;
@@ -557,7 +557,7 @@ L_lengthen:
     setarray @item_names$, "Tank Top", "Red Tank Top", "Green Tank Top", "Dark Blue Tank Top", "Yellow Tank Top", "Light Blue Tank Top", "Pink Tank Top", "Black Tank Top", "Orange Tank Top", "Purple Tank Top", "Dark Green Tank Top", "Short Tank Top", "Red Short Tank Top", "Green Short Tank Top", "Dark Blue Short Tank Top", "Yellow Short Tank Top", "Light Blue Short Tank Top", "Pink Short Tank Top", "Black Short Tank Top", "Orange Short Tank Top", "Purple Short Tank Top", "Dark Green Short Tank Top", "Miniskirt", "Red Miniskirt", "Green Miniskirt", "Dark Blue Miniskirt", "Yellow Miniskirt", "Light Blue Miniskirt", "Pink Miniskirt", "Black Miniskirt", "Orange Miniskirt", "Purple Miniskirt", "Dark Green Miniskirt", "Cotton Shorts", "Red Cotton Shorts", "Green Cotton Shorts", "Dark Blue Cotton Shorts", "Yellow Cotton Shorts", "Light Blue Cotton Shorts", "Pink Cotton Shorts", "Black Cotton Shorts", "Orange Cotton Shorts", "Purple Cotton Shorts", "Dark Green Cotton Shorts";
 
     set @items_nr, 44;
-    callsub SUB_pick_one_of_many_items;
+    callsub S_pick_one_of_many_items;
     if (@item == 0)
         goto L_main_menu;
 
@@ -857,7 +857,7 @@ L_end:
 //        @items_nr (number of entries in @items)
 //        @default_choice$ (default option)
 // Return:  @item (The selected item, or 0 if the default/something invalid was chosen)
-SUB_pick_one_of_many_items:
+S_pick_one_of_many_items:
     set @c, 0;
     set @i, 0;
 
diff --git a/world/map/npc/011-1/auldsbel.txt b/world/map/npc/011-1/auldsbel.txt
index b5ea7f1d..92961dcd 100644
--- a/world/map/npc/011-1/auldsbel.txt
+++ b/world/map/npc/011-1/auldsbel.txt
@@ -15,7 +15,6 @@
     set @Q_STATUS_STUDENT3, 7;
     set @Q_STATUS_STUDENT4, 8;
     set @Q_STATUS_STUDENT5, 9;
-    set @Q_STATUS_STUDENT6, 10;
 
 
     set @wants_sulphur, (QUEST_MAGIC & (NIBBLE_6_MASK | NIBBLE_7_MASK)) // war quest
@@ -981,8 +980,6 @@ L_learn_spell:
         goto L_student_4;
     if (@Q_main_status == @Q_STATUS_STUDENT5)
         goto L_student_5;
-    if (@Q_main_status == @Q_STATUS_STUDENT6)
-        goto L_student_6;
 
     mes "[Auldsbel the Wizard]";
     mes "\"Wellll.... you do seem to have some magical abilities.  But do you possess the talent and diligence needed for a true wizard?\"";
diff --git a/world/map/npc/013-1/sagatha.txt b/world/map/npc/013-1/sagatha.txt
index 92925dae..41c7f076 100644
--- a/world/map/npc/013-1/sagatha.txt
+++ b/world/map/npc/013-1/sagatha.txt
@@ -439,12 +439,6 @@ S_up_astral:
     callfunc "SkillUp";
     return;
 
-S_up_nature:
-    set @SUP_id, SKILL_MAGIC_NATURE;
-    set @SUP_name$, "Nature Magic";
-    callfunc "SkillUp";
-    return;
-
 S_update_var:
     set QUEST_MAGIC,
         (QUEST_MAGIC & ~(@Q_MASK)
diff --git a/world/map/npc/013-3/barrier.txt b/world/map/npc/013-3/barrier.txt
index a0d5ec7e..3b979f5d 100644
--- a/world/map/npc/013-3/barrier.txt
+++ b/world/map/npc/013-3/barrier.txt
@@ -6,7 +6,7 @@
 
     set @state, ((QUEST_Hurnscald & NIBBLE_2_MASK) >> NIBBLE_2_SHIFT);
 
-    if (@state >= 2) goto L_Close;
+    if (@state >= 2) goto L_End;
     if (@state == 1 && countitem("JackOSoul") >= 1) goto L_Has_Jack_O_Soul;
 
     message strcharinfo(0), "A barrier around the opening pushes you back as you approach.";
diff --git a/world/map/npc/020-2/baktar.txt b/world/map/npc/020-2/baktar.txt
index 91e1b7e0..d47a6fe5 100644
--- a/world/map/npc/020-2/baktar.txt
+++ b/world/map/npc/020-2/baktar.txt
@@ -289,7 +289,6 @@ L_2_init:
     if (@Q_status2 == 1) goto L_2_talk1;
     if (@Q_status2 == 2) goto L_2_talk2;
     if (@Q_status2 == 3) goto L_2_talk3;
-    if (@Q_status2 == 4) goto L_2_talk4;
     // fall through @Q_status2==0:
     // need to thank for bringing all stuff.
     mes @npcname$;
diff --git a/world/map/npc/021-1/eurni.txt b/world/map/npc/021-1/eurni.txt
index 8983c596..8f9e1b5d 100644
--- a/world/map/npc/021-1/eurni.txt
+++ b/world/map/npc/021-1/eurni.txt
@@ -22,7 +22,7 @@
 
 L_Change:
     if (Zeny < 10000)
-        goto L_No_Money;
+        goto L_NoMoney;
     set Zeny, Zeny - 10000;
     changesex;
     close;
diff --git a/world/map/npc/021-2/bakery.txt b/world/map/npc/021-2/bakery.txt
index 89fbc38d..6415b498 100644
--- a/world/map/npc/021-2/bakery.txt
+++ b/world/map/npc/021-2/bakery.txt
@@ -3,14 +3,6 @@
 // The chef
 021-2.gat,95,21,0|script|Riskim|148,
 {
-// lines belong to easter 2011:
-//    set @month, 4;
-//    set @start_day, 15;
-//    set @end_day, 30;
-
-//    if (gettime(6) == @month && gettime(5) >= @start_day && gettime(5) <= @end_day && QUEST_Easter11 == 10) goto L_ChocMouboo;
-//    if (gettime(6) == @month && gettime(5) >= @start_day && gettime(5) <= @end_day && QUEST_Easter11 == 11) goto L_MakeChocMouboo;
-//    if (gettime(6) == @month && gettime(5) >= @start_day && gettime(5) <= @end_day && QUEST_Easter11 == 12) goto L_SeeBunny;
     goto L_Begin;
 
 L_Begin:
@@ -124,96 +116,9 @@ L_More:
     mes "";
     mes "\"Perhaps the Chef at Dimond's Cove can help you?  We get all our cupcakes from him.\"";
     next;
-    goto L_End;
-
-L_End:
-    close;
+    goto L_end;
 
-L_ChocMouboo:
-    mes "[Riskim]";
-    mes "";
-    mes "\"Welcome to our bakery! Here you will find the best cakes in Tulimshar. And don't leave before you try one of our delicious Chocolate Pinkies!\"";
-    next;
-    menu
-        "Excuse me, sir? Did you say Chocolate Pinkies?", L_Next1;
-
-L_Next1:
-    mes "\"Yes! But there is no need to be alarmed, it is just plain chocolate molded in the shape of a small pinkie...\"";
-    next;
-    menu
-        "Do you have one in the shape of a mouboo? The Easter Bunny needs one.", L_Next2;
-
-L_Next2:
-    mes "\"The Easter Bunny? Interesting... I think I can help you make a Chocolate Mouboo.\"";
-    menu
-        "Nah, I decided not to do that stupid quest.", L_End,
-        "I would really appreciate that!", L_SetEasterBit;
-
-L_SetEasterBit:
-    set QUEST_Easter11, 11;
-    goto L_MakeChocMouboo;
-
-L_MakeChocMouboo:
-    mes "[Riskim]";
-    mes "";
-    mes "\"I will need you to bring me some Chocolate Bars.\"";
-    mes "\"I think 5 bars should be enough.\"";
-    mes "\"Red slimes seem to have those, so try there.\"";
-    mes "\"I will also need a Mouboo Figurine to hollow out and use as a mold.\"";
-    mes "\"Any mage should be able to make you one out of a log, if you ask.\"";
-    menu
-        "I have everything you need.", L_HaveEverything,
-        "Ok, I will be back soon.", L_End,
-        "I changed my mind, forget about it.", L_End;
-
-L_HaveEverything:
-    if(countitem("ChocolateBar") < 5
-        || countitem("MoubooFigurine") < 1)
-            goto L_EasterNotEnough;
-    goto L_EasterEnough;
-
-L_EasterEnough:
-    getinventorylist;
-    if (@inventorylist_count == 100
-        && countitem("ChocolateBar") > 5
-        && countitem("MoubooFigurine") > 1)
-            goto L_EasterTooMany;
-    if (countitem("ChocolateBar") < 5
-        || countitem("MoubooFigurine") < 1)
-            goto L_EasterNotEnough;
-    delitem "ChocolateBar", 5;
-    delitem "MoubooFigurine", 1;
-    getitem "ChocolateMouboo", 1;
-    set QUEST_Easter11, 12;
-    mes "[Riskim]";
-    mes "";
-    mes "\"Excellent.  You have brought me the chocolate and the mold.\"";
-    mes "He places the chocolate in a pan to melt.";
-    mes "Next, he pours the melted chocolate into the mold.";
-    mes "Finally, he dips the mold in cold water for a moment to solidify the chocolate before skillfully cracking it open and handing you the finished product.";
-    mes "\"Here is your Chocolate Mouboo.\"";
-    close;
-
-L_EasterNotEnough:
-    mes "[Riskim]";
-    mes "";
-    if(countitem("ChocolateBar") < 5)
-        mes "\"You do not have enough Chocolate Bars for me to work with yet.\"";
-    if(countitem("MoubooFigurine") < 1)
-        mes "\"You do not have the Mouboo Figurine to use as a mold.\"";
-    mes "\"Please go get what I asked.\"";
-    close;
-
-L_EasterTooMany:
-    mes "[Riskim]";
-    mes "";
-    mes "\"You don't have enough room for the Chocolate Mouboo. Come back later.\"";
-    close;
-
-L_SeeBunny:
-    mes "[Riskim]";
-    mes "";
-    mes "\"You need to return to the Easter Bunny now.\"";
+L_end:
     close;
 }
 
diff --git a/world/map/npc/021-2/kylian.txt b/world/map/npc/021-2/kylian.txt
index 49d2d78b..15f0d36b 100644
--- a/world/map/npc/021-2/kylian.txt
+++ b/world/map/npc/021-2/kylian.txt
@@ -219,7 +219,7 @@ L_Casino: // @state == 6 and logged out sometime between getting to that state a
         "Of course! The casino!",L_CasinoFound,
         "Not really.",L_Close;
 
-L_CasineFound:
+L_CasinoFound:
     set Zeny, Zeny + @casino_money;
     getexp @casino_exp, 0;
     set @state, 7;
diff --git a/world/map/npc/022-1/anwar.txt b/world/map/npc/022-1/anwar.txt
index 9ac3091e..f01089aa 100644
--- a/world/map/npc/022-1/anwar.txt
+++ b/world/map/npc/022-1/anwar.txt
@@ -196,7 +196,7 @@ L_NoItem:
     mes "\"You don't have it!\"";
     goto L_Close;
 
-L_FullInv:
+L_Full_Inv:
     mes "[Anwar]";
     mes "\"You carry a lot of stuff. Come back when you have more room.\"";
     goto L_Close;
diff --git a/world/map/npc/024-1/eomie.txt b/world/map/npc/024-1/eomie.txt
index 5889e6b5..680e77a6 100644
--- a/world/map/npc/024-1/eomie.txt
+++ b/world/map/npc/024-1/eomie.txt
@@ -20,15 +20,6 @@
 
 024-1.gat,72,94,0|script|Eomie|164,
 {
-// lines belong to easter 2011:
-//    set @month, 4;
-//    set @start_day, 15;
-//    set @end_day, 30;
-
-//    if (gettime(6) == @month && gettime(5) >= @start_day && gettime(5) <= @end_day && QUEST_Easter11 == 4) goto L_Grass;
-//    if (gettime(6) == @month && gettime(5) >= @start_day && gettime(5) <= @end_day && QUEST_Easter11 == 5) goto L_MakeGrass;
-//    if (gettime(6) == @month && gettime(5) >= @start_day && gettime(5) <= @end_day && QUEST_Easter11 == 6) goto L_SeeBunny;
-
     set @state, ((QUEST_NorthTulimshar & $@magicfieldNT_MASK) >> $@magicfieldNT_SHIFT);
 
     set @grass_amount, 5;
@@ -151,88 +142,4 @@ L_Close:
 S_Update_Mask:
     set QUEST_NorthTulimshar, (QUEST_NorthTulimshar & ~($@magicfieldNT_MASK)) | (@state << $@magicfieldNT_SHIFT);
     return;
-
-// lines below here belong to easter 2011
-L_Grass:
-    mes "[Eomie]";
-    mes "";
-    mes "\"I maintain this little spot of grass in the desert.\"";
-    next;
-    menu
-        "It looks beautiful. I wish I could find a Grass Liner like this.", L_LookGrass;
-
-L_LookGrass:
-    mes "\"A Grass Liner? Last year I helped the Easter Bunny with a Grass Liner for his basket... It was really easy...  Is this liner for yourself?\"";
-    next;
-    menu
-        "No. Actually, it is for the Easter Bunny again...", L_NoBunny;
-
-L_NoBunny:
-    mes "\"Why didn't you say so before? I can help you make the Grass Liner for the basket if you wish.\"";
-    menu
-        "I would really appreciate that!", L_WouldNot,
-        "Nah, I decided not to do that stupid quest.", L_End;
-
-L_WouldNot:
-    set QUEST_Easter11, 5;
-    goto L_MakeGrass;
-
-L_MakeGrass:
-    mes "[Eomie]";
-    mes "";
-    mes "\"I will need you to bring me some Grass Seeds.\"";
-    mes "\"I think 5 seeds should be enough.\"";
-    mes "\"Squirrels tend to pick those up as they gather food.\"";
-    menu
-        "I have some seeds...", L_SomeSeeds,
-        "Ok, I will be back soon.", L_End,
-        "I changed my mind, forget about it.", L_End;
-
-L_SomeSeeds:
-    if(countitem("GrassSeed") < 5)
-        goto L_EasterNotEnough;
-    if(countitem("GrassSeed") >= 5)
-        goto L_EasterEnough;
-    close;
-
-L_EasterNotEnough:
-    mes "[Eomie]";
-    mes "";
-    mes "\"You do not have enough Grass Seeds for me to work with yet.\"";
-    mes "\"Please go get more.\"";
-    close;
-
-L_EasterEnough:
-    getinventorylist;
-    if (@inventorylist_count == 100
-        && countitem("GrassSeed") > 10)
-            goto L_EasterTooMany;
-    if(countitem("GrassSeed") < 5)
-        goto L_EasterNotEnough;
-    delitem "GrassSeed", 5;
-    getitem "GrassLiner", 1;
-    set QUEST_Easter11, 6;
-    mes "[Eomie]";
-    mes "";
-    mes "\"You have gathered enough Grass Seeds for me to grow the liner.\"";
-    mes "She plants the seeds and murmurs a spell over them.";
-    mes "You both watch the grass grow tall and when it's done growing,";
-    mes "she deftly gathers it for you.";
-    mes "\"Here is your Grass Liner.\"";
-    close;
-
-L_EasterTooMany:
-    mes "[Eomie]";
-    mes "";
-    mes "\"You don't have enough room for the Grass Liner. Come back later.\"";
-    close;
-
-L_SeeBunny:
-    mes "[Eomie]";
-    mes "";
-    mes "\"You need to return to the Easter Bunny now.\"";
-    close;
-
-L_End:
-    close;
 }
diff --git a/world/map/npc/025-4/clauquer.txt b/world/map/npc/025-4/clauquer.txt
index 24861f4e..2415f59c 100644
--- a/world/map/npc/025-4/clauquer.txt
+++ b/world/map/npc/025-4/clauquer.txt
@@ -58,12 +58,6 @@ L_Advice:
     if (Rossy_Quest == 14) set Rossy_Quest, 15;
     close;
 
-L_End:
-    mes "[Clauquer]";
-    mes "\"I see you came back because you didn't know enough of these caves... Well, well...\"";
-    next;
-    goto L_Advice;
-
 L_Hmmm:
     set @cleaned_caves, 0;
     if (cavefights & BATTLE_CAVE1)
diff --git a/world/map/npc/027-1/monsters.txt b/world/map/npc/027-1/monsters.txt
index 6681027e..b4dedad4 100644
--- a/world/map/npc/027-1/monsters.txt
+++ b/world/map/npc/027-1/monsters.txt
@@ -12,17 +12,17 @@
 
 On1036:
     set @mobID, 1036;
-    callsub _MOBCOUNT_ZOMBIES;
+    callsub L_MOBCOUNT_ZOMBIES;
     callfunc "MobPoints";
     end;
 
 On1045:
     set @mobID, 1045;
-    callsub _MOBCOUNT_FALLENS;
+    callsub L_MOBCOUNT_FALLENS;
     callfunc "MobPoints";
     end;
 
-_MOBCOUNT_ZOMBIES:
+L_MOBCOUNT_ZOMBIES:
 
     set @Graveyard_Inn_MASK, NIBBLE_2_MASK;
     set @Graveyard_Inn_SHIFT, NIBBLE_2_SHIFT;
@@ -41,7 +41,7 @@ _MOBCOUNT_ZOMBIES:
     callsub S_Update_Mask;
     return;
 
-_MOBCOUNT_FALLENS:
+L_MOBCOUNT_FALLENS:
 
     set @Graveyard_Inn_MASK, NIBBLE_2_MASK;
     set @Graveyard_Inn_SHIFT, NIBBLE_2_SHIFT;
diff --git a/world/map/npc/027-2/caretaker.txt b/world/map/npc/027-2/caretaker.txt
index 2234ffc5..bd28a0a5 100644
--- a/world/map/npc/027-2/caretaker.txt
+++ b/world/map/npc/027-2/caretaker.txt
@@ -122,4 +122,7 @@ OnWifeDeath:
     gmcommand "@ban +5mn " + strcharinfo(0);
     initnpctimer;
     end;
+
+L_Close:
+    close;
 }
diff --git a/world/map/npc/027-2/innkeeper.txt b/world/map/npc/027-2/innkeeper.txt
index e1387bfd..81feae3b 100644
--- a/world/map/npc/027-2/innkeeper.txt
+++ b/world/map/npc/027-2/innkeeper.txt
@@ -244,9 +244,7 @@ L_Check_Kid:
 
     mes "\"What I'm going to tell you is very personal, but your acts have shown me that you're a person I can trust. You kindly asked me about that ring you have found... and also, even my son, who is always so reserved with strangers, came to me and spent a long time telling me a lot of nice things about you. So I will tell you about my sad love.\"";
     next;
-    goto L_LoveStory;
 
-L_Lovestory:
     mes "[Reid's Ghost]";
     mes "\"It began as a completely normal day. We were taking care of our overnight guests and preparing the inn for the evening rush.\"";
     next;
diff --git a/world/map/npc/028-1/Portal.txt b/world/map/npc/028-1/Portal.txt
index 9a708464..71810ec5 100644
--- a/world/map/npc/028-1/Portal.txt
+++ b/world/map/npc/028-1/Portal.txt
@@ -129,4 +129,7 @@ L_Jump:
     mes "";
     mes "You land softly. It is good to be home...";
     close;
+
+L_Close:
+    close;
 }
diff --git a/world/map/npc/030-2/eljas.txt b/world/map/npc/030-2/eljas.txt
index 288dbb4e..33c54bf6 100644
--- a/world/map/npc/030-2/eljas.txt
+++ b/world/map/npc/030-2/eljas.txt
@@ -27,12 +27,6 @@ L_XmasMain:
         goto L_NeedList1;
     goto L_NeedList2;
 
-L_Broken:
-    mes "If you somehow reached this label this means the quest is broken, your quest state is reset to zero, however you do not have to collect lists again.";
-    set @xmas_state, 0;
-    callfunc "XmasSetState";
-    goto L_Close;
-
 L_HaveList1:
     mes "[Eljas]";
     mes "\"Hello! Welcome to the Christmas Inn. We work all year around to make the magic happen.\"";
diff --git a/world/map/npc/030-2/roasted_acrons_helper.txt b/world/map/npc/030-2/roasted_acrons_helper.txt
index 8c7c6e41..2c901153 100644
--- a/world/map/npc/030-2/roasted_acrons_helper.txt
+++ b/world/map/npc/030-2/roasted_acrons_helper.txt
@@ -62,13 +62,6 @@ L_Roast:
         "Let's roast some more.", L_Roast,
         "Thank you.", L_Close;
 
-L_RoastAcornAgain:
-    mes "[Verneri]";
-    mes "\"Hello again. Do you want to roast some more acorns? They're delicious, right? Maybe we should do this every year.\"";
-    menu
-        "Not now.", L_Close,
-        "Yes, I brought the ingredients.", L_Roast;
-
 L_FullInv:
     mes "\"You need some space to put the roasted acorns.\"";
     goto L_Close;
diff --git a/world/map/npc/031-1/frozenbeard.txt b/world/map/npc/031-1/frozenbeard.txt
index 0dabaeb0..ce97650c 100644
--- a/world/map/npc/031-1/frozenbeard.txt
+++ b/world/map/npc/031-1/frozenbeard.txt
@@ -2,65 +2,7 @@
 
 031-1.gat,96,113,0|script|Frozenbeard|138,
 {
-//    if (QUEST_Easter12 == 2 && ((gettime(6) == 3 && gettime(5) >= $@easter2012_start_day) || (gettime(6) == 4 && gettime(5) < $@easter2012_reward_start_day)))
-//        menu
-//            "I need to find a way to go back home, can you help me?", L_Frozenbeard_Default,
-//            "I heard you know pirates from all around the world, is it true?", L_Frozenbeard_Easter2012;
-
-//L_Frozenbeard_Default:
     mes "[Frozenbeard]";
     mes "\"Arrr mate! I'm glad there's a dock here, so I don't have to row boat from my ship anymore!  I pioneered the trade routes between Nivalis and the rest of the World, so now merchants and adventurers can travel to and fro without any hassle other than the harsh weather up here, yarr.\"";
     close;
-
-// lines below here belong to Easter 2012
-
-L_Frozenbeard_Easter2012:
-    mes "[Frozenbeard]";
-    mes "\"Arrrrh mate! Ye be right! I know every single pirate in this world. But not all of them are to be trusted, I must say.\"";
-    next;
-    menu
-        "I need information about the Easter Bunny. I heard some pirates kidnapped him.", L_Next;
-
-L_Next:
-    mes "[Frozenbeard]";
-    mes "\"Arrrrh! Ye shouldn't do this to me. Those pirates are dangerous, I can't put myself in such a situation!\"";
-    next;
-    if (countitem("BlackPearl") < 1) goto L_Frozenbeard_Fear;
-    mes "You take a black pearl from your backpack and starts to play with it.";
-    next;
-    menu
-        "Hmm, too bad, because I was willing to pay well for information, you know?", L_Continue;
-
-L_Continue:
-    mes "[Frozenbeard]";
-    mes "\"Arrh eh... Did I say dangerous? These pirates are criminals and a shame to our kind. So, if ye give me this pearl I can tell ye all I know about them. It is not much, but maybe it can help.\"";
-    menu
-        "Ok, keep going.", L_More;
-
-L_More:
-    mes "[Frozenbeard]";
-    mes "\"Well I heard they took him to a small house around this area, where they have their base. But then they brought him to another place. It might be hot there, judging the way they dressed up. The bunny seemed to show no resistance at all when they kidnapped him. It looked as if he did not know what was happening.\"";
-    next;
-    mes "\"But the most important thing is, the leader of the kidnappers is an old friend of George, the treasure hunter. George is very clever, I am sure he knows how the kidnapper thinks and all, maybe he can give ye a more specific information about this.\"";
-    next;
-    menu
-        "Well, that was useful, take your pearl.", L_TakePearl;
-
-L_TakePearl:
-    if (countitem("BlackPearl") < 1)
-        goto L_Frozenbeard_Nopearl;
-    delitem "BlackPearl", 1;
-    set QUEST_Easter12, 3;
-    mes "[Frozenbeard]";
-    mes "\"Arrrrh! Such a beautiful item! Always glad to help.\"";
-    close;
-
-L_Frozenbeard_Fear:
-    mes "Frozenbeard ends the conversation. You can see he is afraid of the kidnappers.";
-    close;
-
-L_Frozenbeard_Nopearl:
-    mes "[Frozenbeard]";
-    mes "\"Arrrrh! I see no pearl!\"";
-    close;
 }
diff --git a/world/map/npc/031-2/cindyHouse.txt b/world/map/npc/031-2/cindyHouse.txt
index 8a24a7cf..277d2380 100644
--- a/world/map/npc/031-2/cindyHouse.txt
+++ b/world/map/npc/031-2/cindyHouse.txt
@@ -52,10 +52,4 @@ L_Close:
     set @random, 0;
     set @quote$, "";
     close;
-
-S_Update_Mask:
-    set QUEST_Nivalis_state,
-        (QUEST_Nivalis_state & ~(@Q_Nivalis_state_MASK))
-            | (@rescue_Cindy << @Q_Nivalis_state_SHIFT);
-    return;
 }
diff --git a/world/map/npc/042-1/hasan.txt b/world/map/npc/042-1/hasan.txt
index fa27b305..dc9ff3e4 100644
--- a/world/map/npc/042-1/hasan.txt
+++ b/world/map/npc/042-1/hasan.txt
@@ -153,10 +153,6 @@ L_Tut_Done:
         mes "\"Bah, nothing interesting is happening here.\"";
     goto L_Close;
 
-L_Distance:
-    mes "There is a person off in the distance. He doesn't seem to notice you, maybe you should go closer.";
-    goto L_Close;
-
 L_Cliff_Up:
     mes "You see a guy in shabby clothes when you look down the cliff.";
     goto L_Close;
diff --git a/world/map/npc/052-2/partyroom.txt b/world/map/npc/052-2/partyroom.txt
index 493cd55d..663c2dec 100644
--- a/world/map/npc/052-2/partyroom.txt
+++ b/world/map/npc/052-2/partyroom.txt
@@ -281,4 +281,8 @@ OnW00t:
     if ($@illia_level_7_progress < 4) end;
     warp "052-2.gat", 133, 84;
     end;
+
+L_ShouldNotBeHere:
+    percentheal -100, 0;
+    end;
 }
diff --git a/world/map/npc/functions/clear_vars.txt b/world/map/npc/functions/clear_vars.txt
index 905528ae..ef4f217a 100644
--- a/world/map/npc/functions/clear_vars.txt
+++ b/world/map/npc/functions/clear_vars.txt
@@ -163,11 +163,11 @@ function|script|ClearVariables|,
     set ChestQuest, 0;
 
     if (#BankAccount < 0)
-        goto FixBank;
+        goto L_FixBank;
 
     return;
 
-FixBank:
+L_FixBank:
     if (Zeny >= -#BankAccount)
         goto L_Fix_Full;