Clean up main scripts

1 files changed, 46 insertions, 15 deletions

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...\"";