Clean up main scripts

9 files changed, 197 insertions, 95 deletions

diff --git a/world/map/npc/027-2/caretaker.txt b/world/map/npc/027-2/caretaker.txt
index 7ed0a665..2234ffc5 100644
--- a/world/map/npc/027-2/caretaker.txt
+++ b/world/map/npc/027-2/caretaker.txt
@@ -15,8 +15,7 @@
     next;
     menu
         "And what are you?", L_Who,
-        "That's right, so move and let me kill that demon behind you.", -;
-    close;
+        "That's right, so move and let me kill that demon behind you.", L_Close;
 
 L_Who:
     mes "[Caretaker]";
@@ -24,7 +23,9 @@ L_Who:
     mes "Now, I care only for my wife. I watch over her... make sure that nobody ever does her harm.\"";
     next;
     menu
-        "You guard her corpse day and night?", -;
+        "You guard her corpse day and night?", L_WatchCorpse;
+
+L_WatchCorpse:
     mes "[Caretaker]";
     mes "\"I am bound to this wretched place by the very same spell that was cast to keep the undead from leaving. Until the day that this cemetery is free from its curse, I shall remain within these gates.\"";
     set QUEST_Graveyard_Caretaker, 1;
@@ -38,8 +39,7 @@ L_Return_Dialog:
     menu
         "What's the favor?", L_Favor,
         "I'm sure I can, for a price.", L_Favor,
-        "Sorry, I am busy.", -;
-    close;
+        "Sorry, I am busy.", L_Close;
 
 L_Favor:
     mes "[Caretaker]";
@@ -50,8 +50,7 @@ L_Favor:
     menu
         "I will take it to her.", L_Receive,
         "I will help you. Where can I find your daughter?", L_Receive,
-        "Sorry, but I am too busy.", -;
-    close;
+        "Sorry, but I am too busy.", L_Close;
 
 L_Receive:
     set QUEST_Graveyard_Caretaker, 2;
@@ -62,6 +61,7 @@ L_Receive:
 
 L_Location:
     next;
+    goto L_Location_Real;
 
 L_Location_Real:
     mes "[Caretaker]";
@@ -73,17 +73,18 @@ L_Has_Letter:
     mes "\"Have you found my daughter?\"";
     next;
     menu
-        "Not yet.", -,
-        "I'll get there when I get there.", -,
+        "Not yet.", L_Close,
+        "I'll get there when I get there.", L_Close,
         "Where did you say I could find her?", L_Location_Real;
-    close;
 
 L_Delivered_Letter:
     mes "[Caretaker]";
     mes "\"Have you found my daughter?\"";
     next;
     menu
-        "Yes.", -;
+        "Yes.", L_Next;
+
+L_Next:
     mes "[Caretaker]";
     mes "\"Thank you for delivering my letter.\"";
     set QUEST_Graveyard_Caretaker, 4;
@@ -95,8 +96,7 @@ L_Give_New_Letter:
     next;
     menu
         "Sure.", L_Give_New_Letter_Real,
-        "I'm too busy right now.", -;
-    close;
+        "I'm too busy right now.", L_Close;
 
 L_Give_New_Letter_Real:
     set QUEST_Graveyard_Caretaker, 5;
diff --git a/world/map/npc/027-2/cerhan.txt b/world/map/npc/027-2/cerhan.txt
index ec860ca4..fa6c9ebc 100644
--- a/world/map/npc/027-2/cerhan.txt
+++ b/world/map/npc/027-2/cerhan.txt
@@ -7,8 +7,7 @@
     next;
     menu
         "That's true. What are you doing here?",L_Story,
-        "Yes, this place is really strange. I'm going to have another look around.",-;
-    goto L_Close;
+        "Yes, this place is really strange. I'm going to have another look around.",L_Close;
 
 L_Story:
     mes "[Cerhan]";
@@ -19,7 +18,10 @@ L_Story:
     if (countitem("MylarinDust") > 0)
         menu
             "Do you know something about 'Mylarin Dust'?", L_Mylarin,
-            "Good luck with that.",-;
+            "Good luck with that.",L_GoodLuckWith;
+    goto L_GoodLuckWith;
+
+L_GoodLuckWith:
     mes "[Cerhan]";
     mes "\"If you're interested in weapons and armor, you may want to come back later.\"";
     goto L_Close;
diff --git a/world/map/npc/027-2/crying_child.txt b/world/map/npc/027-2/crying_child.txt
index a2eedf80..d84432cc 100644
--- a/world/map/npc/027-2/crying_child.txt
+++ b/world/map/npc/027-2/crying_child.txt
@@ -30,6 +30,7 @@
     if (@state == 2) goto L_return1;
     if (@state == 1) goto L_return;
     if (BaseLevel >= @minLevel) goto L_intro;
+    goto L_cry;
 
 L_cry:
     mes "[Crying Child]";
@@ -44,21 +45,29 @@ L_intro:
     next;
     mes "You bend your knees near the child, trying to gain his confidence and ask why he is crying. But looking closely, you are surprised to see that his skin color is an awful, cadaveric grey...";
     menu
-        "Calm down kid, what happened?",-,
+        "Calm down kid, what happened?",L_WhatHappen,
         "Leave the kid alone.",L_Close;
+
+L_WhatHappen:
     mes "[Crying Child]";
     mes "\"Oh, what? Who are you "+@madamsir$+", what are you doing here?\"";
     next;
     menu
-        "My name is "+strcharinfo(0)+". I heard you cry and decided to check if you needed any help.",-;
+        "My name is "+strcharinfo(0)+". I heard you cry and decided to check if you needed any help.",L_MyNameIs;
+
+L_MyNameIs:
     mes "The child looks at you from head to toe and says: \"" +@madamsir$+ ", aren't you scared of me?\"";
     next;
     menu
-        "No... Why would I be scared of you?",-;
+        "No... Why would I be scared of you?",L_NotScaredOf;
+
+L_NotScaredOf:
     mes "[Crying Child]";
     mes "\"I am, you know... dead. Like Mom and Dad, and a lot of other people in this inn... But most of them don't like to talk about it.\"";
     menu
-        "You are a brave and smart kid... I have nothing to be afraid of.",-;
+        "You are a brave and smart kid... I have nothing to be afraid of.",L_BraveSmart;
+
+L_BraveSmart:
     mes "[Crying Child]";
     mes "\"It's nice to talk to you. I don't have any friends and Mom is always sad and Dad is always angry about something I don't know... and... Did you see the man in the room next to me? The one with horns? Oh, I don't like him! \"";
     next;
@@ -69,7 +78,9 @@ L_intro:
     mes "\"You asked why I was crying. My problem is... I don't know what to do... My dad will be so angry with me... He used to be very nice, but now... if you do something wrong... he... Waaaaa!\"";
     next;
     menu
-        "There, there. Don't cry... What did you do?",-;
+        "There, there. Don't cry... What did you do?",L_DontCryWhat;
+
+L_DontCryWhat:
     mes "[Aldred]";
     mes "\"Umm... I was looking at my parents' stuff and I found this funny thing! It looked like a normal ring, but with a round empty space... I thought it would be fun to take it with me and maybe look for a stone or a gem to fit into the empty space. But I... I lost it...\"";
     next;
@@ -78,8 +89,10 @@ L_intro:
     mes "\"I think it was something very bad, because, after all that, I woke up the way I am now and I couldn't find the ring in my pocket. Oh, and my parents are acting like they're not themselves. I don't know what happened, maybe it was my fault... I shouldn't have played with that ring... \"";
     next;
     menu
-        "Don't worry, I will look around. Maybe I can find it for you...",-,
+        "Don't worry, I will look around. Maybe I can find it for you...",L_DontWorryFind,
         "Hey, you messed up. Deal with it.",L_Close;
+
+L_DontWorryFind:
     mes "[Aldred]";
     mes "\"Thank you " +strcharinfo(0)+"! Find it for me, pleeeease! Oh, and don't tell my parents that I lost their ring, okay?\"";
     set @state, 1;
@@ -94,17 +107,23 @@ L_return:
 
 L_return1:
     menu
-        "Hi Aldred. I found the ring!",-;
+        "Hi Aldred. I found the ring!",L_RingFoundHere;
+
+L_RingFoundHere:
     mes "[Aldred]";
     mes "\"Great! You're the best! Where did you find it?\"";
     next;
     menu
-        "It was easy, I found it on one of the monsters outside.",-;
+        "It was easy, I found it on one of the monsters outside.",L_RingMonstersOut;
+
+L_RingMonstersOut:
     mes "[Aldred]";
     mes "\"Ohh.. a monster? It must've been a nice monster since it returned it so easily to you!\"";
     next;
     menu
-        "Err... kind of...",-;
+        "Err... kind of...",L_ErrKindOf;
+
+L_ErrKindOf:
     mes "[Aldred]";
     mes "\"Now, I'll put this thing back in its proper place... Thank you!\"";
     set @state, 3;
@@ -116,13 +135,17 @@ L_return2:
     mes "\"Hi "+strcharinfo(0)+ "! I was thinking... you were sooo nice helping me find the ring... I think I should give you a gift, but I'm just a dead kid, I have nothing to give you!\"";
     next;
     menu
-        "Don't worry, you don't need to give me anything...",-;
+        "Don't worry, you don't need to give me anything...",L_GiveMeAnything;
+
+L_GiveMeAnything:
     mes "[Aldred]";
     mes "\"Are you sure? That's why you're so great! But hey, I have an idea. What if you talk to my parents about this thing? If it's not important or valuable, I don't think it would be a problem to let you keep it. And I really want to know if they're acting all weird because I lost it. Would you do this for me?\"";
     next;
     menu
-        "Sounds interesting... But who are your parents?",-,
+        "Sounds interesting... But who are your parents?",L_WhereParents,
         "Bad idea, it will only bring more problems...",L_Close;
+
+L_WhereParents:
     set @state, 4;
     callsub S_Update_Mask;
     mes "[Aldred]";
@@ -139,20 +162,28 @@ L_return3:
 
 L_return4:
     menu
-        "Hi, I talked to your parents.",-;
+        "Hi, I talked to your parents.",L_TalkParents;
+
+L_TalkParents:
     mes "[Aldred]";
     mes "\"Really? What did my father say about it?\"";
     menu
-        "He said it's just a cheap ring. And it doesn't belong to him.",-;
+        "He said it's just a cheap ring. And it doesn't belong to him.",L_JustCheapRing;
+
+L_JustCheapRing:
     mes "[Aldred]";
     mes "\"And what did my mother say?\"";
     menu
-        "She said it was a gift, but she doesn't want it anymore.",-;
+        "She said it was a gift, but she doesn't want it anymore.",L_GiftNoWant;
+
+L_GiftNoWant:
     mes "[Aldred]";
     mes "\"Really? A gift? And why doesn't she want it anymore?\"";
     next;
     menu
-        "She said it makes her sad.",-;
+        "She said it makes her sad.",L_MakesHerSad;
+
+L_MakesHerSad:
     mes "\"Ohh... really? I don't like it when my mother gets sad... If this ring is making her feel bad, I should keep it away from her. \"";
     next;
     mes "\"Well, I guess you can keep it, but don't show it to my mother again, she's already very sad. But now I'm really curious. Who else would give a gift to my mother? There are so many strange things happening lately...\"";
diff --git a/world/map/npc/027-2/golbenez.txt b/world/map/npc/027-2/golbenez.txt
index ffc0206f..082b7a7d 100644
--- a/world/map/npc/027-2/golbenez.txt
+++ b/world/map/npc/027-2/golbenez.txt
@@ -50,16 +50,20 @@
     mes "[Golbenez]";
     mes "\"How do you like my place of leisure, mortal?\"";
     menu
-        "What is this place? Why is it full of dead people?",-,
+        "What is this place? Why is it full of dead people?",L_WhatPlace,
         "You look different here. Nice horns.",L_Horns,
         "I'm enjoying myself, thanks for asking.",L_Close;
+
+L_WhatPlace:
     mes "[Golbenez]";
     mes "\"Mortal, this is beyond your comprehension. Do not worry about it and enjoy your time.\"";
 
     if (@lover < 2)
         goto L_Close;
     menu
-        "I want to know. Try me.",-;
+        "I want to know. Try me.",L_WantKnow;
+
+L_WantKnow:
     mes "Golbenez takes a piercing look at you.";
     mes "[Golbenez]";
     mes "\"Fine.\"";
@@ -71,14 +75,15 @@
     mes "[Golbenez]";
     mes "\"Unfortunately, it got destroyed. I had no choice but to take the memories from the dead and recreate this place.\"";
     menu
-        "What do you mean by 'playground?'",-,
-        "Recreate? What do you mean by that?",-;
+        "What do you mean by 'playground?'",L_WantGoOn,
+        "Recreate? What do you mean by that?",L_WantGoOn;
+
+L_WantGoOn:
     mes "[Golbenez]";
     mes "\"As I said, you do not understand. You are starting to bore me. Leave.\"";
 
     set @state, 1;
     callsub S_Update_Mask;
-
     goto L_Close;
 
 L_Back:
@@ -91,8 +96,10 @@ L_Memory:
     mes "[Golbenez]";
     mes "\"Mortal, you are back. Are you going to bore me with other stupid questions?\"";
     menu
-        "I want to know what happened in the inn, before it was destroyed.",-,
+        "I want to know what happened in the inn, before it was destroyed.",L_KnowDestroy,
         "Nevermind.",L_Close;
+
+L_KnowDestroy:
     if ((@woman >= 7)
         && (@lover >= 3)
         && (@husband >= 4))
@@ -109,9 +116,11 @@ L_Detective:
     next;
     mes "\"The only thing you would have to do is promise me your soul.\"";
     menu
-        "No!",-,
-        "That's too expensive. Make another offer.",-,
-        "My soul?!",-;
+        "No!",L_WantsSoul,
+        "That's too expensive. Make another offer.",L_WantsSoul,
+        "My soul?!",L_WantsSoul;
+
+L_WantsSoul:
     mes "Golbenez giggles, a strange and somewhat unnerving sound from such a being.";
     mes "[Golbenez]";
     mes "\"You should have seen your face. Really, mortals can be so funny.\"";
@@ -129,8 +138,10 @@ L_Reid:
             "What do you need them for?",L_Why_Stuff,
             "I'm working on that.",L_Close;
     menu
-        "Here you go.",-,
+        "Here you go.",L_GiveRags,
         "I'm working on that.",L_Close;
+
+L_GiveRags:
     if (countitem("OrangeCake") < 1)
         goto L_No_Cake;
     if (countitem("RottenRags") < @ROTTENRAGS_AMOUNT)
@@ -148,9 +159,11 @@ L_Reid:
     set @state, 3;
     callsub S_Update_Mask;
     menu
-        "Can I see it again?",-,
-        "Wow, that was interesting.",-,
-        "Why do you collect such personal memories?",-;
+        "Can I see it again?",L_CollectMem,
+        "Wow, that was interesting.",L_CollectMem,
+        "Why do you collect such personal memories?",L_CollectMem;
+
+L_CollectMem:
     mes "Golbenez throws you an amused look.";
     next;
     mes "[Golbenez]";
@@ -169,8 +182,10 @@ L_Hamond:
             "Not yet.",L_Close;
     menu
         "I want to see Reid's memory again.",L_R_Again,
-        "I have what you want.",-,
+        "I have what you want.",L_GiveEar,
         "I'm working on that.",L_Close;
+
+L_GiveEar:
     if (countitem("ChocolateCake") < 1)
         goto L_No_Cake;
     if (countitem("UndeadEar") < @UNDEADEAR_AMOUNT)
@@ -205,8 +220,10 @@ L_Savaric:
     menu
         "I want to see Reid's memory again.",L_R_Again,
         "I want to see Hamond's memory again.",L_H_Again,
-        "I got what you want.",-,
+        "I got what you want.",L_GiveEye,
         "I'm working on that.",L_Close;
+
+L_GiveEye:
     if (countitem("AppleCake") < 1)
         goto L_No_Cake;
     if (countitem("UndeadEye") < @UNDEADEYE_AMOUNT)
@@ -224,8 +241,10 @@ L_Savaric:
     mes "[Golbenez]";
     mes "\"Humans can be so amusing!\"";
     menu
-        "YOU CRUEL MONSTER!",-,
-        "I agree. What a bunch of idiots.",-;
+        "YOU CRUEL MONSTER!",L_MonsterIdiots,
+        "I agree. What a bunch of idiots.",L_MonsterIdiots;
+
+L_MonsterIdiots:
     mes "Golbenez's mouth twists into something resembling a smile.";
     mes "[Golbenez]";
     mes "\"Oh, thank you.\"";
@@ -241,18 +260,19 @@ L_All:
         "I want to see Hamond's memory again.",L_H_Again,
         "I want to see Savaric's memory again.",L_S_Again,
         "Nevermind.",L_Close;
-    goto L_Close;
 
 L_Negotiate:
     mes "Golbenez's eyes are glowing greedily.";
     mes "[Golbenez]";
     mes "\"Did you come back to see the memories again? Or are you going to offer me another deal?\"";
     menu
-        "I want Savaric's soul back.",-,
+        "I want Savaric's soul back.",L_WantSoulBack,
         "I want to see Reid's memory again.",L_R_Again,
         "I want to see Hamond's memory again.",L_H_Again,
         "I want to see Savaric's memory again.",L_S_Again,
         "Nevermind.",L_Close;
+
+L_WantSoulBack:
     mes "[Golbenez]";
     mes "\"Savaric's soul, yes. It is a pretty nice soul, you know. From a mage... no, even better... from a lovestruck mage. It is valuable.\"";
     next;
@@ -260,8 +280,10 @@ L_Negotiate:
     next;
     menu
         "What about another cake?",L_Cake,
-        "I'm not sure. What do you want?",-,
+        "I'm not sure. What do you want?",L_GetSoul,
         "No.",L_Close;
+
+L_GetSoul:
     mes "[Golbenez]";
     mes "\"Bring me a soul of at least equal power to the mage's. I do not care about its origin.\"";
     set @state, 6;
@@ -271,15 +293,17 @@ L_Negotiate:
 L_Soul:
     mes "[Golbenez]";
     mes "\"So, did you get a soul for me?\"";
+    goto L_Soul_Try;
 
 L_Soul_Try:
     if (countitem("JackOSoul") < 1)
         menu
             "I'll go and get one.",L_Close;
     menu
-        "What about this Jack O Soul?",-,
+        "What about this Jack O Soul?",L_TryThisSoul,
         "I'll go and try to find a soul.",L_Close;
 
+L_TryThisSoul:
     if (countitem("JackOSoul") < 1)
         goto L_Betray;
     delitem "JackOSoul", 1;
diff --git a/world/map/npc/027-2/gy_inn_shops.txt b/world/map/npc/027-2/gy_inn_shops.txt
index da1c3c57..2a829ec1 100644
--- a/world/map/npc/027-2/gy_inn_shops.txt
+++ b/world/map/npc/027-2/gy_inn_shops.txt
@@ -34,6 +34,7 @@
     mes "\"Come on in and have a nice long... long slumber...";
     next;
     callfunc "Inn";
+    close;
 }
 
 // Bank and Storage
diff --git a/world/map/npc/027-2/husband.txt b/world/map/npc/027-2/husband.txt
index 4217d9a4..f78cf48a 100644
--- a/world/map/npc/027-2/husband.txt
+++ b/world/map/npc/027-2/husband.txt
@@ -53,9 +53,11 @@
         goto L_Close;
     next;
     menu
-        "I'd like to know why all the people in here are dead.",-,
-        "Are you feeling well? You look very pale... In fact, deathly pale.",-,
+        "I'd like to know why all the people in here are dead.",L_Next,
+        "Are you feeling well? You look very pale... In fact, deathly pale.",L_Next,
         "Thank you, but I'm fine.", L_Close;
+
+L_Next:
     mes "Hamond seems very confused. Then he notices the grey color of his hands and begins to shake his head in panic.";
     mes "[Hamond]";
     mes "\"WHAT IS THIS?\"";
@@ -73,7 +75,9 @@
     mes "\"But nevertheless, I will continue to run this inn and do my best to make all our patrons happy and satisfied - be they alive or dead.\"";
     next;
     menu
-        "Can I help with that?", -;
+        "Can I help with that?", L_Continue;
+
+L_Continue:
     mes "[Hamond]";
     mes "\"Help me? Normally I would never ask you for this, but actually, I do need something to cool the drinks. Maybe you can find something.\"";
 
@@ -130,7 +134,9 @@ L_Check_Ice:
     mes "\"And I won't let a wannabe mage take her away from me...\"";
     next;
     menu
-        "What do you mean?",-;
+        "What do you mean?",L_More;
+
+L_More:
     mes "[Hamond]";
     mes "\"Nevermind, nevermind. I'd like to ask you for another favor, if I might.\"";
     next;
@@ -154,6 +160,7 @@ L_Check_Bones:
 
     set @state, 3;
     callsub S_Update_Mask;
+    goto L_Brought_Bones;
 
 L_Brought_Bones:
     mes "[Hamond]";
@@ -173,7 +180,10 @@ L_Brought_Bones:
     if (@woman > 5)
         menu
             "Would you tell me about this mage named Savaric?", L_Savaric,
-            "You're welcome.",-;
+            "You're welcome.",L_Welcome;
+    goto L_Welcome;
+
+L_Welcome:
     mes "[Hamond]";
     mes "\"Please make yourself at home.\"";
     goto L_Close;
@@ -192,6 +202,7 @@ L_Savaric:
             goto L_Man;
     mes "\"Well, I have been thinking about you. You seem to be a very helpful and wise person. Even my son told me good things about you, making a long speech about how great you are and your ability to comprehend and deal with delicate matters. I wonder how he reached that conclusion... But anyway, I'll tell you about Savaric.\"";
     next;
+    goto L_Jealousy;
 
 L_Jealousy:
     mes "[Hamond]";
@@ -244,7 +255,9 @@ L_News:
             "I'm enjoying myself.",L_Close;
     menu
         "I'm enjoying myself.",L_Close,
-        "I found out what happened to you and this place.",-;
+        "I found out what happened to you and this place.",L_FoundOut;
+
+L_FoundOut:
     mes "[Hamond]";
     mes "\"You did? Amazing! Please tell me.\"";
     next;
@@ -259,9 +272,11 @@ L_News:
     next;
     mes "Hamond seems about to break down.";
     menu
-        "Maybe it was just fate.",-,
-        "You got very upset, don't blame yourself",-,
-        "You're right. You were very violent. How could you do that if you love her?",-;
+        "Maybe it was just fate.",L_HamondFate,
+        "You got very upset, don't blame yourself",L_HamondFate,
+        "You're right. You were very violent. How could you do that if you love her?",L_HamondFate;
+
+L_HamondFate:
     mes "[Hamond]";
     mes "\"I- I need to apologize.\"";
     next;
diff --git a/world/map/npc/027-2/innkeeper.txt b/world/map/npc/027-2/innkeeper.txt
index 4204d041..e1387bfd 100644
--- a/world/map/npc/027-2/innkeeper.txt
+++ b/world/map/npc/027-2/innkeeper.txt
@@ -77,29 +77,36 @@ L_After_Welcome:
     mes "\"Please enjoy yourself!\"";
     if (BaseLevel < @minLevel)
             goto L_Close;
+    goto L_Ask_Dead;
 
 L_Ask_Dead:
     if (BaseLevel < 85)
             goto L_Close;
 
     menu
-        "What happened to you?", - ,
+        "What happened to you?", L_Next,
         "Thank you, I'll surely enjoy my visit.", L_Close;
+
+L_Next:
     mes "[Reid's Ghost]";
     mes "\"What happened to me? What do you mean?\"";
     menu
-        "Ahm, you don't look very well - actually, you look dead.",-,
-        "You don't seem to be in the best condition.",-,
-        "You are dead!",-;
+        "Ahm, you don't look very well - actually, you look dead.",L_Next1,
+        "You don't seem to be in the best condition.",L_Next1,
+        "You are dead!",L_Next1;
+
+L_Next1:
     mes "Reid looks down at her body and turns even more pale, if this is possible.";
     next;
     mes "[Reid's Ghost]";
     mes "\"OH?\"";
     next;
     menu
-        "I'm sorry. I didn't know you weren't aware of that.",-,
-        "Yes - do you understand my question now?",-,
+        "I'm sorry. I didn't know you weren't aware of that.",L_Next2,
+        "Yes - do you understand my question now?",L_Next2,
         "Shall I help you to find out what happened to you?", L_Offer_Help1;
+
+L_Next2:
     mes "[Reid's Ghost]";
     mes "\"I'm dead? But why? And why am I still here?\"";
     next;
@@ -116,10 +123,11 @@ L_Offer_Help2:
             "Shall I help you to find out what happened to you?", L_Offer_Help1,
             "Hi. I found this in the main hall. Do you know to whom it belongs?", L_Ring,
             "I don't want to bother you.", L_Close;
+    goto L_Skip1;
 
 L_Skip1:
     menu
-        "Shall I help you to find out what happened to you?", -,
+        "Shall I help you to find out what happened to you?", L_Offer_Help1,
         "I don't want to bother you.", L_Close;
 
 L_Offer_Help1:
@@ -166,6 +174,7 @@ L_Check_Tears:
     mes "[Reid's Ghost]";
     mes "\"These tears.. how they shimmer in the candle light. Yes, it seems you are serious about your offer. I think maybe you have the sensibility to help me find out the real meaning behind this terrible feeling.\"";
     next;
+    goto L_Ask_Life;
 
 L_Ask_Life:
     mes "[Reid's Ghost]";
@@ -177,11 +186,14 @@ L_Ask_Life:
             "Please tell me about your life. Maybe this will give us a clue about what happened.",L_Skip2,
             "Hi. I found this in the main hall. Do you know to whom it belongs?", L_Ring,
             "I need to think about that.", L_Close;
+    goto L_Skip2;
 
 L_Skip2:
     menu
-        "Please tell me about your life. Maybe this will give us a clue about what happened.",-,
+        "Please tell me about your life. Maybe this will give us a clue about what happened.",L_Next4,
         "I need to think about that.", L_Close;
+
+L_Next4:
     mes "[Reid's Ghost]";
     mes "\"About my life? Well, ok.\"";
     next;
@@ -201,8 +213,10 @@ L_Skip2:
     next;
     mes "\"That was a very hard time.\"";
     menu
-        "Yes, yes, but what about your life shortly before you died?",-,
-        "I can imagine. I'm very sorry for you",-;
+        "Yes, yes, but what about your life shortly before you died?",L_Next5,
+        "I can imagine. I'm very sorry for you",L_Next5;
+
+L_Next5:
     mes "She doesn't seem to pay much attention to what you say.";
     next;
     mes "\"But Hamond, my friend since I was a child, helped me in those bad times. We built up the inn again and we - we married.\"";
@@ -214,6 +228,7 @@ L_Skip2:
 
     set @state, 5;
     callsub S_Update_Mask;
+    goto L_Check_Kid;
 
 L_Check_Kid:
     if (@kidstate == 5)
@@ -229,6 +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]";
@@ -269,9 +285,10 @@ L_Savaric:
     mes "\"Now you know about my recent past and... and my twisted feelings.\"";
     next;
     menu
-        "Yes, I feel very sorry for you.",-,
+        "Yes, I feel very sorry for you.",L_Next6,
         "Savaric seems to be a really hot guy, making you so compliant.",L_Tease;
 
+L_Next6:
     mes "[Reid's Ghost]";
     mes "\"Oh, thank you.\"";
     if (@golbanez < 5)
@@ -279,8 +296,9 @@ L_Savaric:
             "But I still didn't find out what happened. I'll return when I have news.",L_Close;
     menu
         "But I still didn't find out what happened. I'll return when I have news.",L_Close,
-        "I found out what happened to you and this place. I'll tell you.",-;
+        "I found out what happened to you and this place. I'll tell you.",L_Next7;
 
+L_Next7:
     mes "You explain to her about Golbenez, Savaric and the memories you have seen.";
     next;
     mes "[Reid's Ghost]";
@@ -303,15 +321,15 @@ L_Sorry:
             menu
                 "Savaric asked me to give you something.",L_Diamond,
                 "Hamond sent me to bring you this.",L_Ruby,
-                "Nevermind.",-;
+                "Nevermind.",L_Close;
     if (@lover == 4 && (countitem("Diamond") >= @DIAMOND_AMOUNT))
         menu
             "Savaric asked me to give you something.",L_Diamond,
-            "Nevermind.",-;
+            "Nevermind.",L_Close;
     if (@husband == 5 && (countitem("Ruby") >= @RUBY_AMOUNT))
         menu
             "Hamond sent me to bring you this.",L_Ruby,
-            "Nevermind.",-;
+            "Nevermind.",L_Close;
     goto L_Close;
 
 L_Diamond:
@@ -345,6 +363,7 @@ L_Ruby:
 L_Kidding:
     mes "[Reid's Ghost]";
     mes "\"Are you kidding? You don't have the items you are talking about. This is not funny.\"";
+    goto L_Tease;
 
 L_Tease:
     mes "[Reid's Ghost]";
@@ -361,6 +380,7 @@ L_Thanks:
     set @state, 11;
     callsub S_Update_Mask;
     next;
+    goto L_Mylarin;
 
 L_Mylarin:
     mes "[Reid's Ghost]";
@@ -376,8 +396,7 @@ L_Happy:
     mes "\"Thank you for all you've done.\"";
     menu
         "Can you tell me again about the powder you gave me?",L_Mylarin,
-        "I'm glad I could help.",-;
-    goto L_Close;
+        "I'm glad I could help.",L_Close;
 
 L_Not_Enough_Tears:
     mes "[Reid's Ghost]";
diff --git a/world/map/npc/027-2/lover.txt b/world/map/npc/027-2/lover.txt
index 354362b1..7105dfab 100644
--- a/world/map/npc/027-2/lover.txt
+++ b/world/map/npc/027-2/lover.txt
@@ -49,7 +49,9 @@
     mes "[Hanged Man]";
     mes "\"Oh, hello. Nice to see you - I seem to be dead, but I don't know why and why I'm still consciousness. This is very interesting.\"";
     menu
-        "INTERESTING? Are you crazy?",-;
+        "INTERESTING? Are you crazy?",L_Next;
+
+L_Next:
     mes "[Hanged Man]";
     mes "\"Well, as you mention it, it is quite annoying and uncomfortable. Would you mind helping me down to the floor?\"";
     next;
@@ -87,13 +89,16 @@ L_Crystals:
     mes "[Hanged Man]";
     mes "\"You have more of them, haven't you? It will work better if you give them to me too.\"";
     menu
-        "Ok, here you go.",-,
+        "Ok, here you go.",L_Next1,
         "I prefer to keep them.",L_Skip;
+
+L_Next1:
     set @crystal, countitem("DarkCrystal");
     if (@crystal > @CRYSTAL_MAX)
         set @crystal, @CRYSTAL_MAX;
     delitem "DarkCrystal", @crystal;
     getexp @crystal*@CRYSTAL_EXTRA_EXP, 0;
+    goto L_Skip;
 
 L_Skip:
     mes "[Hanged Man]";
@@ -117,9 +122,11 @@ L_Skip:
     next;
     mes "\"This is fascinating!\"";
     menu
-        "Ok, you are crazy!",-,
-        "Yes, it is very fascinating to be blown up!",-,
-        "I NEARLY DIED! AND YOU THINK THIS IS FASCINATING?!",-;
+        "Ok, you are crazy!",L_Next2,
+        "Yes, it is very fascinating to be blown up!",L_Next2,
+        "I NEARLY DIED! AND YOU THINK THIS IS FASCINATING?!",L_Next2;
+
+L_Next2:
     mes "[Hanged Man]";
     mes "\"I sometimes forget the fact that not everybody is fascinated by the riddles of magic. Please forgive me.\"";
     next;
@@ -155,6 +162,7 @@ L_News:
                 "Can you tell me about your relationship to Reid?",L_Reid,
                 "Yes, let me tell you.",L_Golbenez,
                 "I don't think so.",L_Close;
+    goto L_Golbenez;
 
 L_Golbenez:
     mes "You explain how you came to the inn and what Golbenez said to you.";
@@ -164,9 +172,11 @@ L_Golbenez:
     next;
     mes "\"Savaric seems to be completely absorbed in his thoughts.\"";
     menu
-        "Hello? Are you still there?",-,
-        "Excuse me, I don't want to interrupt you, but can you explain to me what's going on? I'm confused.",-,
-        "Hey! I'm talking with you!",-;
+        "Hello? Are you still there?",L_Next3,
+        "Excuse me, I don't want to interrupt you, but can you explain to me what's going on? I'm confused.",L_Next3,
+        "Hey! I'm talking with you!",L_Next3;
+
+L_Next3:
     mes "Savaric winces.";
     next;
     mes "\"Oh, right - I was just thinking. It makes me feel uncomfortable to hear about Golbenez being involved in this.\"";
@@ -195,9 +205,10 @@ L_Golb:
         menu
             "I'm still working on doing all the stuff Golbenez wants me to do.",L_Close;
     menu
-        "Now I know what happened. I'll tell you.",-,
-        "I'm sorry to tell you, but this was all your fault.",-;
+        "Now I know what happened. I'll tell you.",L_Next4,
+        "I'm sorry to tell you, but this was all your fault.",L_Next4;
 
+L_Next4:
     mes "You tell Savaric about what Golbenez showed to you.";
     next;
     mes "[Savaric]";
@@ -237,8 +248,10 @@ L_Want_Soul:
     mes "[Savaric]";
     mes "\"Welcome back! Are you still working on getting my soul back?\"";
     menu
-        "I'm doing my best.",-,
-        "Yes, but it isn't easy.",-;
+        "I'm doing my best.",L_NextEnd,
+        "Yes, but it isn't easy.",L_NextEnd;
+
+L_NextEnd:
     mes "[Savaric]";
     mes "\"Thank you so much! I'm counting on you!\"";
     goto L_Close;
diff --git a/world/map/npc/027-2/werewolf.txt b/world/map/npc/027-2/werewolf.txt
index c3187e92..1438393a 100644
--- a/world/map/npc/027-2/werewolf.txt
+++ b/world/map/npc/027-2/werewolf.txt
@@ -48,8 +48,7 @@ L_Bones:
             "Yes, here they are.",L_Bring,
             "Not yet.",L_Close;
     menu
-        "Not yet.",-;
-    goto L_Close;
+        "Not yet.",L_Close;
 
 L_Bring:
     if (countitem("AnimalBones") < @ANIMALBONES_AMOUNT)
@@ -86,8 +85,7 @@ L_Happy:
     mes "\"You will need " + @money + " GP.\"";
     menu
         "Sure, why not?",L_Game,
-        "No, thanks.",-;
-    goto L_Close;
+        "No, thanks.",L_Close;
 
 //The game mechanics is copied from casino.txt
 L_Game:
@@ -158,7 +156,6 @@ L_Ace:
     menu
         "Yes", L_Another,
         "No", L_End;
-    goto L_Close;
 
 L_Close:
     set @Graveyard_Inn_MASK, 0;