Correct close behaviour in many dialogues. Democratize l_Quit function.

18 files changed, 158 insertions, 146 deletions

diff --git a/npc/000-1/ale.txt b/npc/000-1/ale.txt
index c7fe20e9f..20f813793 100644
--- a/npc/000-1/ale.txt
+++ b/npc/000-1/ale.txt
@@ -22,7 +22,7 @@
     menu
         l("Gugli sent me down here to help you."), -,
         l("What's that?"), l_Plushroom,
-        l("See you aboard."), close;
+        l("See you aboard."), l_Quit;
 
     mes "";
     mesn;
@@ -63,9 +63,7 @@ l_CallFunc:
         rif(getq(ShipQuests_Jalad) == 0, l("Jalad.")), l_Jalad,
         rif(getq(ShipQuests_QMuller) == 0, l("QMuller.")), l_Bottom,
         rif(getq(ShipQuests_Tibbo) == 0, l("Tibbo.")), l_Bottom,
-        l("Nobody."), -;
-
-    close;
+        l("Nobody."), l_Quit;
 
 l_Bottom:
     mes "";
@@ -83,6 +81,7 @@ l_Jalad:
     next;
 
     restorecam;
+
     close;
 
 l_Plushroom:
@@ -110,4 +109,7 @@ l_TaskDone:
 
     close;
 
+l_Quit:
+    close;
+
 }
diff --git a/npc/000-1/darlin.txt b/npc/000-1/darlin.txt
index 1ba7c98e5..9cd2a384b 100644
--- a/npc/000-1/darlin.txt
+++ b/npc/000-1/darlin.txt
@@ -12,9 +12,9 @@
 //    3   Get back to Darlin.

 

 000-1.gat,89,95,0,1	script	Darlin	103;14,{

-
+

     mesn;

-    set @q, getq(ShipQuests_Darlin);
+    set @q, getq(ShipQuests_Darlin);

     if (@q == 1 || @q == 2) goto OnQuestGiven;

     if (@q > 2) goto l_QuestDone;

 OnStart:

@@ -76,8 +76,8 @@ OnStart:
     next;

 

 l_Menu:

-    set @q, getq(ShipQuests_Darlin);
-
+    set @q, getq(ShipQuests_Darlin);

+

     menu

         l("Maybe you can come down to talk?"), l_GoDown,

         l("I'm looking for Gugli, where is he?"), -,

@@ -90,7 +90,7 @@ l_Menu:
     next;

     mesq l("HE IS AT THE BOTTOM OF THE SHIP, DOWN THE STAIRS. YOU CAN'T MISS HIM!");

     restorecam;

-
+

     close;

 

 l_GoDown:

@@ -134,10 +134,7 @@ l_Bye:
     mesn;

     mesq l("FINE, BYE!");

 

-l_Quit:

-    close;

-

-OnQuestGiven:
+OnQuestGiven:

     mesq l("HEY @@!", strcharinfo(0));

     next;

     mesq l("DID YOU FIND OUT WHAT THE LIGHT WAS?!");

@@ -157,7 +154,7 @@ OnQuestGiven:
     goto l_Menu;

 

 l_Nothing:

-    if (@q == 2) setq ShipQuests_Darlin, 3;
+    if (@q == 2) setq ShipQuests_Darlin, 3;

     mes "";

     mesn;

     mesq l("OH, OK!");

@@ -170,19 +167,22 @@ l_Chest:
     mesq l("SORRY, BUT WHAT DID YOU SAY? SPEAK LOUDER!");

     next;

     mesq l("IF YOU FIND SOMETHING, THEN IT'S GREAT!");

-
-    setq ShipQuests_Darlin, 3;
+

+    setq ShipQuests_Darlin, 3;

     goto l_Menu;

 

 l_DangerAround:

     mesq l("NOTHING ELSE OTHER THAN SHARKS AND AN ODD LIGHT!");

  

     close;

-
+

 l_QuestDone:

     mesq l("HEY") + " " + strcharinfo(0) + "!"; 

-    next;
-
-    goto l_Menu;
+    next;

+

+    goto l_Menu;

+

+l_Quit:

+    close;

 

-}
+}

diff --git a/npc/000-1/fexil.txt b/npc/000-1/fexil.txt
index 234a947e0..6c4b6b8f2 100644
--- a/npc/000-1/fexil.txt
+++ b/npc/000-1/fexil.txt
@@ -30,6 +30,7 @@
 
 l_Accepted:
     shop "Bag";
+
     close;
 
 }
diff --git a/npc/000-1/gugli.txt b/npc/000-1/gugli.txt
index d5af91853..1f3762714 100644
--- a/npc/000-1/gugli.txt
+++ b/npc/000-1/gugli.txt
@@ -83,13 +83,13 @@ l_Menu:
         rif(countitem("AquadaBox") > 0 || countitem("CroconutBox") > 0 || countitem("PlushroomBox") > 0, l("I have some food for you.")), l_CollectSmthing,
         l("Who should I search for?"), l_SailorNames,
         l("Where can I find your crew?"), l_Location,
-        l("See you!"), close;
+        l("See you!"), l_Quit;
 
 l_MenuDone:
     menu
         rif(getq(ShipQuests_Couwan) == 1, l("Couwan gave me this box, it is for you.")), l_Couwan,
         l("I have collected all the boxes you needed."), l_TaskDone,
-        l("See you!"), close;
+        l("See you!"), l_Quit;
 
 l_SailorNames:
     mes "";
@@ -219,4 +219,7 @@ l_AllComplete:
     doevent "Gugli::OnTalk";
     close;
 
+l_Quit:
+    close;
+
 }
diff --git a/npc/000-1/gulukan.txt b/npc/000-1/gulukan.txt
index c67427429..92693f263 100644
--- a/npc/000-1/gulukan.txt
+++ b/npc/000-1/gulukan.txt
@@ -23,7 +23,7 @@
     menu
         l("Wow, it seems everyone knows my name!"), -,
         l("Well, it it's not bad to finally feel something beneath my feet."), l_Continue,
-        l("Not so good actually... I would feel better on Nard's ship."), close;
+        l("Not so good actually... I would feel better on Nard's ship."), l_Quit;
 
 l_Name:
 
@@ -44,7 +44,7 @@ l_Continue2:
 
     menu
         l("Actually Gugli asked me if I could help you bringing him some of your boxes."), -,
-        l("Yes, indeed. I prefer to explore places I have never been to, before doing anything else."), close;
+        l("Yes, indeed. I prefer to explore places I have never been to, before doing anything else."), l_Quit;
 
     mes "";
     mesn;
@@ -125,9 +125,7 @@ l_RandomC:
         rif(getq(ShipQuests_Jalad) == 0, l("Jalad.")), l_Top,
         rif(getq(ShipQuests_QMuller) == 0, l("QMuller.")), l_Top,
         rif(getq(ShipQuests_Tibbo) == 0, l("Tibbo.")), l_Bottom,
-        l("Nobody."), -;
-
-    close;
+        l("Nobody."), l_Quit;
 
 l_Bottom:
     mes "";
@@ -159,4 +157,7 @@ l_TaskDone:
 
     close;
 
+l_Quit:
+    close;
+
 }
diff --git a/npc/000-1/lean.txt b/npc/000-1/lean.txt
index 2164f2c82..7ff491e13 100644
--- a/npc/000-1/lean.txt
+++ b/npc/000-1/lean.txt
@@ -56,7 +56,7 @@ l_Sailors:
     next;

 

     menu

-        l("Thank you for your help."), close,

+        l("Thank you for your help."), l_Quit,

         l("Gugli mentioned six sailors. What about the others?"), -;

 

     mes "";

@@ -67,4 +67,7 @@ l_Sailors:
 

     close;

 

+l_Quit:

+    close;

+

 }

diff --git a/npc/000-1/max.txt b/npc/000-1/max.txt
index 1e9528602..ada5c14c9 100644
--- a/npc/000-1/max.txt
+++ b/npc/000-1/max.txt
@@ -22,7 +22,7 @@
         rif(@gugli == 1, l("Gugli asked me to help sailors with their food gatherings. Do you know where could I find them?")), l_Sailors,
         rif(@gugli > 1, l("Seems I've helped everyone here. I don't know what to do now!")), l_Annoyed,
         rif(@knife == 0, l("It looks like you are an expert of the life inside 'La Johanne'. Do you know any hidden secrets nobody knows?")), l_Secrets,
-        l("No thanks, not at the moment."), close;
+        l("No thanks, not at the moment."), l_Quit;
 
 l_Help:
     mes "";
@@ -46,7 +46,7 @@ l_MenuSailors:
         l("Do you know where can I find Gulukan?"), l_Gulukan,
         l("Any clue on where Astapolos may be hidden?"), l_Astapolos,
         l("What about Q'Muller? Where is he?"), l_Qmuller,
-        l("Alright. I will go looking for them now."), close;
+        l("Alright. I will go looking for them now."), l_Quit;
 
 l_Gulukan:
     mes "";
@@ -96,4 +96,7 @@ l_Secrets:
 
     close;
 
+l_Quit:
+    close;
+
 }
diff --git a/npc/000-1/muller.txt b/npc/000-1/muller.txt
index 4dca23386..f9b64a25e 100644
--- a/npc/000-1/muller.txt
+++ b/npc/000-1/muller.txt
@@ -27,7 +27,7 @@
     next;
     
     menu
-        l("Indeed! Goodbye."), close,
+        l("Indeed! Goodbye."), l_Quit,
         l("Yes, it is true! You are not able at all. Nard has been waiting for the food for too long already. Hurry up, you lazy sailors!"), -;
 
     mes "";
@@ -75,9 +75,7 @@ l_CallFunc:
         rif(getq(ShipQuests_Jalad) == 0, l("Jalad.")), l_Top,
         rif(getq(ShipQuests_Gulukan) == 0, l("Gulukan.")), l_Bottom,
         rif(getq(ShipQuests_Tibbo) == 0, l("Tibbo.")), l_Bottom,
-        l("Nobody."), -;
-
-    close;
+        l("Nobody."), l_Quit;
 
 l_Bottom:
     mes "";
@@ -120,4 +118,7 @@ l_TaskDone:
 
     close;
 
+l_Quit:
+    close;
+
 }
diff --git a/npc/000-1/sapartan.txt b/npc/000-1/sapartan.txt
index 435615013..d7f518032 100644
--- a/npc/000-1/sapartan.txt
+++ b/npc/000-1/sapartan.txt
@@ -27,7 +27,7 @@
 
     menu
         l("Thank you sir for you nice words. I am feeling better now."), -,
-        lg("I'm still a bit weak at the moment. We should probably talk later."), close;
+        lg("I'm still a bit weak at the moment. We should probably talk later."), l_Quit;
 
     mes "";
     mesn;
@@ -59,7 +59,7 @@
     menu
         l("No, I don't, but I would like to know more about that."), -,
         l("Well... I've only killed some little pious in the ship, that's all."), -,
-        l("Yes, I feel strong enough for dangerous combats!"), close;
+        l("Yes, I feel strong enough for dangerous combats!"), l_Quit;
 
     mes "";
     mesn;
@@ -88,7 +88,7 @@
 
     menu
         l("Thank you for your tricks. I am going to try them now!"), -,
-        l("I already know everything. Bye."), close;
+        l("I already know everything. Bye."), l_Quit;
 
     mes "";
     mesn;
@@ -97,4 +97,7 @@
 
     close;
 
+l_Quit:
+    close;
+
 }
diff --git a/npc/000-1/silvio.txt b/npc/000-1/silvio.txt
index 464bb3de0..b9ce97dce 100644
--- a/npc/000-1/silvio.txt
+++ b/npc/000-1/silvio.txt
@@ -1,7 +1,7 @@
 // Evol scripts.
 // Author:
 //    Reid
-// Description:

+// Description:
 //    Pervert and arrogant sailor.
 
 000-1.gat,86,99,0,1	script	Silvio	312;2,{
@@ -166,7 +166,7 @@ l_Sailors:
     next;
 
     menu
-        l("See you."), close,
+        l("See you."), l_Quit,
         l("*Imitate a thunder's sound.*"), -;
 
     mes "";
@@ -175,4 +175,7 @@ l_Sailors:
 
     close;
 
+l_Quit:
+    close;
+
 }
diff --git a/npc/000-1/tarlan.txt b/npc/000-1/tarlan.txt
index 3f687c284..26381d50a 100644
--- a/npc/000-1/tarlan.txt
+++ b/npc/000-1/tarlan.txt
@@ -27,7 +27,7 @@
     mesn;
     mesq l("Ok, see you then!");
 
-    goto l_Close;
+    goto l_Quit;
 
 l_Food:
     mes " ";
@@ -36,28 +36,28 @@ l_Food:
     next;
     mesq l("Yeye be careful with wild animal's food, some of them are yeyery dangerous, especially the blubs.");
 
-    goto l_Close;
+    goto l_Quit;
 
 l_HardToHit:
     mesq l("These crocotrees are full of yaying @@, but they are so hard to hit...", getitemlink("Croconut"));
 
-    goto l_Close;
+    goto l_Quit;
 
 l_Aouch:
     mesq l("Ayouyouch! My head...");
     next;
     mesq l("Damn @@.", getitemlink("Croconut"));
 
-    goto l_Close;
+    goto l_Quit;
 
 l_DoYou:
     mesq l("Do you want to try?");
     next;
     mesq l("Just hit the trunk, and it will yeye a @@.", getitemlink("Croconut"));
 
-    goto l_Close;
+    goto l_Quit;
 
-l_Close:
+l_Quit:
     setnpcdir 4;
     close;
 
diff --git a/npc/000-2-0/julia.txt b/npc/000-2-0/julia.txt
index 5eec4a203..87ae9b74e 100644
--- a/npc/000-2-0/julia.txt
+++ b/npc/000-2-0/julia.txt
@@ -39,7 +39,7 @@ l_Menu:
         l("Could you explain to me where I am?"), l_WhereIam,
         l("What happened to me?"), l_What,
         l("Can I read these rules again?"), l_Rules,
-        l("Nothing, sorry."), l_Close;
+        l("Nothing, sorry."), l_Quit;
 
     mes "";
     mesn;
@@ -108,7 +108,7 @@ l_First:
     next;
     mesq col(l("6. Follow the social convention listed on the RFC1855 article."), 9);
     next;
-

+
     mesn;
     mesq l("Oh, and I almost forgot! Do not give the password of your room to anybody! I am the only one who has the other key and I won't ask for yours so keep it secret and try not to use the same password for any other room in the future.");
     next;
@@ -136,7 +136,7 @@ l_NoChanges:
 l_YNMenu:
     menu
         l("Yes, I do."), l_Menu,
-        l("No, none."), l_Close;
+        l("No, none."), l_Quit;
 
 l_WhereIam:
     mes "";
@@ -168,13 +168,6 @@ l_EsperiaMenu:
         l("Sorry, but I can't tell you anything about that."), l_NoChanges,
         l("Nothing, sorry."), l_NoChanges;
 
-l_Close:
-    mes "";
-    mesn;
-    mesq l("Bye!");
-
-    close;
-
 l_Rules:
     mes "";
     mesn;
@@ -221,5 +214,11 @@ l_Regret:
 
     close;
 
-}
+l_Quit:
+    mes "";
+    mesn;
+    mesq l("Bye!");
 
+    close;
+
+}
diff --git a/npc/000-2-1/alige.txt b/npc/000-2-1/alige.txt
index ee39139d4..f8d785b9f 100644
--- a/npc/000-2-1/alige.txt
+++ b/npc/000-2-1/alige.txt
@@ -78,13 +78,7 @@ l_NeedHelp:
 
     menu
         l("Why not, but who are you?") + " " + l("And what kind of help do you need?"), l_CanHelp;
-        l("Sorry but I have no time for this."), -;
-
-    mes "";
-    mesn "Hidden Person";
-    mesq lg("Damn you! You better not tell anyone that you've seen me!");
-
-    close;
+        l("Sorry but I have no time for this."), l_Quit;
 
 l_CanHelp:
     mes "";
@@ -122,7 +116,7 @@ l_Accept:
     menu
         l("Understood, I will help you."), l_Accepted,
         l("What is Artis?"), l_Artis,
-        l("I think I should report you to the crew members."), l_DamnYou;
+        l("I think I should report you to the crew members."), l_Quit;
 
 l_Artis:
     mes "";
@@ -219,7 +213,7 @@ l_IntroMenu:
         l("Where can I find some food?"), -,
         l("Why are you hiding?") + " " + l("Why don't you come out?"), l_ExplainHiding,
         l("What is Artis?"), l_Artis,
-        l("I think I should report you to the crew members."), l_DamnYou;
+        l("I think I should report you to the crew members."), l_Quit;
 
     mes "";
     mesn;
@@ -236,7 +230,7 @@ l_IntroMenu:
 
     close;
 
-l_DamnYou:
+l_Quit:
     mes "";
     mesn;
     mesq lg("Damn you! You better not tell anyone that you've seen me!");
diff --git a/npc/000-2-1/chefgado.txt b/npc/000-2-1/chefgado.txt
index a53cf7a9e..c171e9eb6 100644
--- a/npc/000-2-1/chefgado.txt
+++ b/npc/000-2-1/chefgado.txt
@@ -39,9 +39,7 @@ l_QuestStart:
 
     menu
         l("How rude! What is the reason behind your malice?"), l_Rude,
-        l("I swear, I do not eat so much."), -;
-
-    close;
+        l("I swear, I do not eat so much."), l_Quit;
 
 l_Rude:
     mes "";
@@ -79,9 +77,7 @@ l_Rude:
 
     menu
         l("Sure, why not?"), l_Sure,
-        l("Sea water?! I will not help you with your evil plan!"), -;
-
-    close;
+        l("Sea water?! I will not help you with your evil plan!"), l_Quit;
 
 l_Sure:
     setq ShipQuests_ChefGado, 1;
@@ -99,7 +95,7 @@ l_QuestAccepted:
     menu
         rif(countitem("PiouLegs") > 1 && countitem("Croconut") > 0 && countitem("Aquada") > 0 && countitem("SeaDrops") > 0, l("All your... Fresh ingredients are ready to be cooked.")), l_GotAll,
         l("What are your needs?"), l_Need,
-        l("Not yet. I will be back soon."), close;
+        l("Not yet. I will be back soon."), l_Quit;
 
 l_GotAll:
     mes "";
@@ -161,4 +157,7 @@ l_QuestAborted:
 
     close;
 
+l_Quit:
+    close;
+
 }
diff --git a/npc/000-2-1/chest.txt b/npc/000-2-1/chest.txt
index 680f9e986..b898ee6bd 100644
--- a/npc/000-2-1/chest.txt
+++ b/npc/000-2-1/chest.txt
@@ -21,7 +21,7 @@
     close;
 
 l_Give:
-    if (@q > 1) goto l_Close;
+    if (@q > 1) goto l_Quit;
     set @item, 1300;
     set @count, 2;
     callfunc "InventoryPlace", @item, @count;
@@ -31,16 +31,16 @@ l_Give:
     getitem "CreasedShorts", 1;
     message strcharinfo(0), l("You take the clothes from the chest.");
 
-l_Close:
-    setnpcdir 6;
-    initnpctimer;
-    startnpctimer;
-    close;
-
 OnTimer220:
     stopnpctimer;
     if (getnpcdir ("") == 2) setnpcdir 4;
     if (getnpcdir ("") == 6) setnpcdir 0;
     end;
 
+l_Quit:
+    setnpcdir 6;
+    initnpctimer;
+    startnpctimer;
+    close;
+
 }
diff --git a/npc/000-2-1/dan.txt b/npc/000-2-1/dan.txt
index d6f61ca3b..726782b6a 100644
--- a/npc/000-2-1/dan.txt
+++ b/npc/000-2-1/dan.txt
@@ -23,7 +23,7 @@ l_QuestStory:
 
     menu
         l("Why?"), -,
-        l("I guess so... I will leave you alone."), l_Close;
+        l("I guess so... I will leave you alone."), l_Quit;
 
     mes "";
     mesn;
@@ -33,7 +33,7 @@ l_QuestStory:
     next;
 
     menu
-        l("I'm still in a coma, but my ghost is haunting you!"), l_Close,
+        l("I'm still in a coma, but my ghost is haunting you!"), l_Quit,
         l("It was something like a long nap."), -;
 
     mes "";
@@ -61,7 +61,7 @@ l_She:
     mesq l("She is a good friend of mine... We wanted to marry a few weeks before her accident but...");
     next;
 
-    goto l_Close2;
+    goto l_Quit2;
 
 l_Quest:
     mes "";
@@ -69,16 +69,16 @@ l_Quest:
     mesq l("I don't think that we are in a good place to talk about this...");
     next;
 
-l_Close2:
+l_Quit:
+    mes "";
     mesn "Narrator";
-    mes col(l("Dan ends the conversation and resumes to write his letter."), 9);
+    mes col(l("Dan keeps silent since your last question."), 9);
 
     close;
 
-l_Close:
-    mes "";
+l_Quit2:
     mesn "Narrator";
-    mes col(l("Dan keeps silent since your last question."), 9);
+    mes col(l("Dan ends the conversation and resumes to write his letter."), 9);
 
     close;
 
diff --git a/npc/000-2-1/peter.txt b/npc/000-2-1/peter.txt
index a849c7633..61b099454 100644
--- a/npc/000-2-1/peter.txt
+++ b/npc/000-2-1/peter.txt
@@ -36,37 +36,37 @@
 000-2-1.gat,72,34,0,1	script	AreaNPC	0,0,1,{
 
 OnTouch:
-    if (BaseLevel < 5) goto L_Stop;
-    if ($@RAT_SAILOR_HELPER$ != "") goto L_Occupied;
+    if (BaseLevel < 5) goto l_Stop;
+    if ($@RAT_SAILOR_HELPER$ != "") goto l_Occupied;
     set @q, getq(ShipQuests_Peter);
-    if (@q < 1 || @q > 5) goto L_Task;
-    if (@q == 1 || @q == 2) goto L_Rfail;
-    if (@q == 3 || @q == 4) goto L_Rwin;
-    if (@q > 5) goto L_SecondTime;
+    if (@q < 1 || @q > 5) goto l_Task;
+    if (@q == 1 || @q == 2) goto l_Rfail;
+    if (@q == 3 || @q == 4) goto l_Rwin;
+    if (@q > 5) goto l_SecondTime;
     doevent "Peter::OnReturnWin";
     close;
 
-L_Stop:
+l_Stop:
     doevent "Peter::OnStop";
 
     close;
 
-L_Occupied:
+l_Occupied:
     doevent "Peter::OnDontneedHelp";
 
     close;
 
-L_Task:
+l_Task:
     doevent "Peter::OnGiveTask";
 
     close;
 
-L_Rfail:
+l_Rfail:
     doevent "Peter::OnReturnFail";
 
     close;
 
-L_Rwin:
+l_Rwin:
     doevent "Peter::OnReturnWin";
 
 }
@@ -90,21 +90,21 @@ OnGiveTask:
     next;
 
     menu
-        l("Yeah, but what reward will I get?"), L_BonusTask,
-        l("Why not, I need to train anyway."), L_Task,
+        l("Yeah, but what reward will I get?"), l_BonusTask,
+        l("Why not, I need to train anyway."), l_Task,
         l("No, they are way too dangerous for me!"), -;
 
     mes "";
     mesn;
     mesq l("Ok, ok. Come back if you change your mind.");
 
-    goto L_Close;
+    goto l_Quit;
 
 OnTooWeak:
     mesn;
     mesq lg("I need help for clean the edge of the ship, but you aren't strong enough to help.");
 
-    goto L_Close;
+    goto l_Quit;
 
 OnStop:
     warp "000-2-1",72,36;
@@ -120,15 +120,15 @@ OnReturnFail:
     next;
 
     menu
-        l("Yeah, but I would like to make sure I get a reward."), L_BonusTask,
-        l("Why not, I need to train anyway."), L_Task,
+        l("Yeah, but I would like to make sure I get a reward."), l_BonusTask,
+        l("Why not, I need to train anyway."), l_Task,
         l("No, they are way too dangerous for me!"), -;
 
     mes "";
     mesn;
     mesq l("Ok, ok. Come back if you change your mind.");
 
-    goto L_Close;
+    goto l_Quit;
 
 OnReturnWin:
     mesn;
@@ -137,14 +137,14 @@ OnReturnWin:
     if (@q == 3 || @q == 4)
 
     menu
-        l("Did you say reward? I want it!"), L_BonusTask,
-        l("I am not worried about rewards. I just want to help."), L_Task,
+        l("Did you say reward? I want it!"), l_BonusTask,
+        l("I am not worried about rewards. I just want to help."), l_Task,
         l("Sorry, I am not in the mood for another fight with these rattos."), -;
 
     if (@q == 5)
 
     menu
-        l("No problem, I can help you anyway."), L_Task,
+        l("No problem, I can help you anyway."), l_Task,
         l("Sorry, I am not in the mood for another fight with these rattos."), -;
 
     mes "";
@@ -153,7 +153,7 @@ OnReturnWin:
 
     close;
 
-L_BonusTask:
+l_BonusTask:
     mes "";
     mesn;
     mesq l("I will give you @@GP.", 500);
@@ -161,21 +161,21 @@ L_BonusTask:
 
     menu
         lg("Okay, I'm ready to work!"), -,
-        l("What? This reward is too small!"), L_Close;
+        l("What? This reward is too small!"), l_Quit;
 
     if ($@RAT_SAILOR_HELPER$ != "") goto OnDontneedHelp;
     if (@q == 6) setq ShipQuests_Peter, 2;
     if (@q == 3) setq ShipQuests_Peter, 4;
 
-    goto L_Start;
+    goto l_Start;
 
-L_Task:
+l_Task:
     mes "";
     if ($@RAT_SAILOR_HELPER$ != "") goto OnDontneedHelp;
     if (@q == 6) setq ShipQuests_Peter, 1;
-    goto L_Start;
+    goto l_Start;
 
-L_Start:
+l_Start:
     mesn;
     mesq l("Okay, you can start!");
 
@@ -187,20 +187,20 @@ OnStartOutside:
     warp "000-2-2.gat", 48, 28;
     doevent "RattosControl::OnSpawn";
 
-    goto L_Close;
+    goto l_Quit;
 
 OnTimer5000:
-    if (attachrid(getcharid(3,$@RAT_SAILOR_HELPER$)) == 0) goto L_Logoff;
+    if (attachrid(getcharid(3,$@RAT_SAILOR_HELPER$)) == 0) goto l_Logoff;
     set $@RAT_SAILOR_CONTROL[9], $@RAT_SAILOR_CONTROL[9] + 5;
-    if ($@RAT_SAILOR_CONTROL[9] > 100) goto L_Timeout;
-    if (PC_DIE_COUNTER > $@RAT_SAILOR_DEATHS) goto L_Dead;
-    if ($@RAT_SAILOR_CONTROL[1] && $@RAT_SAILOR_CONTROL[2] && $@RAT_SAILOR_CONTROL[3] && $@RAT_SAILOR_CONTROL[4]) goto L_Done;
-    if (getmapusers("000-2-2.gat") == 0) goto L_CleaningEnd;
-    goto L_CheckRattos;
+    if ($@RAT_SAILOR_CONTROL[9] > 100) goto l_Timeout;
+    if (PC_DIE_COUNTER > $@RAT_SAILOR_DEATHS) goto l_Dead;
+    if ($@RAT_SAILOR_CONTROL[1] && $@RAT_SAILOR_CONTROL[2] && $@RAT_SAILOR_CONTROL[3] && $@RAT_SAILOR_CONTROL[4]) goto l_Done;
+    if (getmapusers("000-2-2.gat") == 0) goto l_CleaningEnd;
+    goto l_CheckRattos;
 
     end;
 
-L_CheckRattos:
+l_CheckRattos:
     if ($@RAT_SAILOR_CONTROL[1]) set $@RAT_SAILOR_CONTROL[5], $@RAT_SAILOR_CONTROL[5] + 5;
     if ($@RAT_SAILOR_CONTROL[2]) set $@RAT_SAILOR_CONTROL[6], $@RAT_SAILOR_CONTROL[6] + 5;
     if ($@RAT_SAILOR_CONTROL[3]) set $@RAT_SAILOR_CONTROL[7], $@RAT_SAILOR_CONTROL[7] + 5;
@@ -219,32 +219,32 @@ OnDontneedHelp:
     next;
     mesq l("@@ is helping me.", $@RAT_SAILOR_HELPER$);
 
-    goto L_Close;
+    goto l_Quit;
 
-L_Timeout:
+l_Timeout:
     mesn;
     mesq l("Hey! Be careful. You can't stay in this basement for so long, you're going to get sick. Come outside and take a break, maybe you can try again later.");
     warp "000-2-1", 72, 36;
 
-    goto L_CleaningClose;
+    goto l_CleaningClose;
 
-L_Logoff:
-    goto L_CleaningEnd;
+l_Logoff:
+    goto l_CleaningEnd;
 
-L_Dead:
+l_Dead:
 // Warps the dead body outside, so it does not interfere with the getmapusers check.
     if (getmapusers("000-2-2.gat") > 0) warp "000-2-1", 61, 36;
 
-    goto L_CleaningEnd;
+    goto l_CleaningEnd;
 
-L_Done:
+l_Done:
     warp "000-2-1", 72, 36;
     set @q, getq(ShipQuests_Peter);
-    if (@q == 2 || @q == 4) goto L_Reward;
+    if (@q == 2 || @q == 4) goto l_Reward;
 
-    goto L_Thanks;
+    goto l_Thanks;
 
-L_CleaningEnd:
+l_CleaningEnd:
     stopnpctimer;
     set $@RAT_SAILOR_HELPER$, "";
     set $@RAT_SAILOR_DEATHS, 0;
@@ -256,7 +256,7 @@ L_CleaningEnd:
 
     end;
 
-L_CleaningClose:
+l_CleaningClose:
     stopnpctimer;
     set $@RAT_SAILOR_HELPER$, "";
     set $@RAT_SAILOR_DEATHS, 0;
@@ -268,24 +268,24 @@ L_CleaningClose:
 
     close;
 
-L_Reward:
+l_Reward:
     mesn;
     mesq l("Good job!") + " " + l("Here's your reward!");
     getexp 100, 0;
     set zeny, zeny + 500;
     setq ShipQuests_Peter, 5;
 
-    goto L_CleaningClose;
+    goto l_CleaningClose;
 
-L_Thanks:
+l_Thanks:
     mesn;
     mesq l("Thanks for helping me!");
     set @q, getq(ShipQuests_Peter);
     if (@q == 1) setq ShipQuests_Peter, 3;
 
-    goto L_CleaningClose;
+    goto l_CleaningClose;
 
-L_Close:
+l_Quit:
     set @q, 0;
 
     close;
diff --git a/npc/000-2-3/box.txt b/npc/000-2-3/box.txt
index 806414e6b..45df8493b 100644
--- a/npc/000-2-3/box.txt
+++ b/npc/000-2-3/box.txt
@@ -27,7 +27,7 @@
 
     menu
         l("Take a Bandana."), -,
-        l("Nothing."), l_Close;
+        l("Nothing."), l_Quit;
 
     if (@q == 1) goto l_NotYet;
     if (@q == 2) goto l_Give;
@@ -53,7 +53,7 @@
 
     menu
         l("Why not, I've got plenty of free time."), -,
-        l("I think that I'm still a bit sick."), l_Close;
+        l("I think that I'm still a bit sick."), l_Quit;
 
     mes "";
     mesn "Nard";
@@ -79,9 +79,6 @@ l_NotYet:
     mesn "Nard";
     mesq l("Please don't touch these hats, they are for crew members only.");
 
-l_Close:
-    close;
-
 l_Give:
     setcamnpc "Nard";
     mes "";
@@ -109,4 +106,7 @@ l_Already:
 
     close;
 
+l_Quit:
+    close;
+
 }