Update old scripts with new template.

17 files changed, 411 insertions, 215 deletions

diff --git a/npc/000-0-0/ronan.txt b/npc/000-0-0/ronan.txt
index 1ac13d75..ba1a58e1 100644
--- a/npc/000-0-0/ronan.txt
+++ b/npc/000-0-0/ronan.txt
@@ -3,14 +3,20 @@
 //    Vasily_Makarov
 
 000-0-0.gat,25,22,0,1	script	Ronan	302,{
-  mesn;
-  set @q, rand(2);
-  if (@q == 0) goto l_Zzz;
-  goto l_Snoring;
-  l_Zzz:
+
+    mesn;
+
+    set @q, rand(2);
+    if (@q == 0) goto l_Zzz;
+    goto l_Snoring;
+
+l_Zzz:
     mesq l("Zzzzzzzzzz");
     close;
-  l_Snoring:
+
+l_Snoring:
     mesq l("Rrrr pchhhh...");
+
     close;
+
 }
diff --git a/npc/000-0-0/sailors.txt b/npc/000-0-0/sailors.txt
index f5ee57bf..6bd35df3 100644
--- a/npc/000-0-0/sailors.txt
+++ b/npc/000-0-0/sailors.txt
@@ -5,61 +5,78 @@
 //    Intro scene: Two sailors talking about how the player was found on his raft.
 
 000-0-0.gat,22,17,0,1	script	Elmo	309,{
+
 OnTalk:
     setcamnpc;
     mesn "Elmo";
-    mes g(l("This girl is lucky that we found her before a shark did. I have no idea where this came from. By the way, did you see the logo on her raft?"),
-          l("This guy is lucky that we found him before a shark did. I have no idea where this came from. By the way, did you see the logo on his raft?"));
+    mesq g(l("This girl is lucky that we found her before a shark did. I have no idea where this came from. By the way, did you see the logo on her raft?"),
+           l("This guy is lucky that we found him before a shark did. I have no idea where this came from. By the way, did you see the logo on his raft?"));
     next;
+
     mesn "Magic Arpan";
-    mes lg("Yeye, it's the logo of the warrior guild of Esperia, I wonder what this yoiis was doing so far away from the coast.");
+    mesq lg("Yeye, it's the logo of the warrior guild of Esperia, I wonder what this yoiis was doing so far away from the coast.");
     next;
+
     mesn "Elmo";
-    mes l("I wonder too...");
+    mesq l("I wonder too...");
     next;
+
     mesn "Magic Arpan";
-    mes g(l("Maybe she was one of those who got lost last month? The yoiis from Esperia that got a secret quest from the Warrior guild!"),
-          l("Maybe he was one of those who got lost last month? The yoiis from Esperia that got a secret quest from the Warrior guild!"));
+    mesq g(l("Maybe she was one of those who got lost last month? The yoiis from Esperia that got a secret quest from the Warrior guild!"),
+           l("Maybe he was one of those who got lost last month? The yoiis from Esperia that got a secret quest from the Warrior guild!"));
     next;
+
     mesn "Elmo";
-    mes l("It makes sense, do you think we should inform the capt'n about it?");
+    mesq l("It makes sense, do you think we should inform the capt'n about it?");
     next;
+
     mesn "Magic Arpan";
-    mes l("Yeye.");
+    mesq l("Yeye.");
     next;
+
     mesn "Elmo";
-    mes g(l("Ok, I'm going to her room, keep an eye on her, we still don't know if she's an ally or an enemy..."),
-          l("Ok, I'm going to his room, keep an eye on him, we still don't know if he's an ally or an enemy..."));
+    mesq g(l("Ok, I'm going to her room, keep an eye on her, we still don't know if she's an ally or an enemy..."),
+           l("Ok, I'm going to his room, keep an eye on him, we still don't know if he's an ally or an enemy..."));
     next;
+
     mesn "Magic Arpan";
-    mes l("I will yaying do.");
+    mesq l("I will yaying do.");
     next;
+
     mesn "Elmo";
-    mes g(l("Oh, and give her some basic clothes, the poor girl, the one she had was in even worse condition that the ones we have!"),
-          l("Oh, and give him some basic clothes, the poor guy, the one he had was in even worse condition that the ones we have!"));
+    mesq g(l("Oh, and give her some basic clothes, the poor girl, the one she had was in even worse condition that the ones we have!"),
+           l("Oh, and give him some basic clothes, the poor guy, the one he had was in even worse condition that the ones we have!"));
     next;
+
     mesn "Magic Arpan";
-    mes l("Yayayaya, for the first time someone is dressed worse then us!");
+    mesq l("Yayayaya, for the first time someone is dressed worse then us!");
     next;
+
     mesn "Elmo";
-    mes l("He he... OK, I'm going to the upper level and inform the captain.");
+    mesq l("He he... OK, I'm going to the upper level and inform the captain.");
     next;
+
     mesn "Magic Arpan";
-    mes g(l("I will give her everything she needs, don't worry."),
-          l("I will give him everything he needs, don't worry."));
+    mesq g(l("I will give her everything she needs, don't worry."),
+           l("I will give him everything he needs, don't worry."));
     next;
+
     mesn "Elmo";
-    mes g(l("OK, I think she's waking up, go see to her."),
-          l("OK, I think he's waking up, go see to him."));
+    mesq g(l("OK, I think she's waking up, go see to her."),
+           l("OK, I think he's waking up, go see to him."));
     next;
+
     restorecam;
     warp "000-2-1.gat", 40, 38;
     savepoint "000-2-1.gat",40,38;
-    setskill 1, 1;
+    setskill 1, 1; // Add Emote skill.
     close;
+
 }
 
 000-0-0.gat,21,17,0,1	script	Magic Arpan	307,{
     doevent "Elmo::OnTalk"; // Elmo will handle dialogs between both npcs
+
     close;
+
 }
diff --git a/npc/000-0/sailors.txt b/npc/000-0/sailors.txt
index f5e32120..a85d5fa1 100644
--- a/npc/000-0/sailors.txt
+++ b/npc/000-0/sailors.txt
@@ -9,68 +9,70 @@
 000-0.gat,23,20,0,1	script	Sailors	305,6,6,{
 
 OnTouch:
-  callfunc "CheckClientVersion";
-  requestlang @lang;
-  if (@lang >= 0 && @lang <= 7) setlang @lang;
-  mesn "Narrator";
-  mes col(l("You are on a raft, adrift in the sea."), 9);
-  next;
-  mes col(l("You don't remember anything before this."), 9);
-  next;
-  mes col(l("Suddenly, you hear a voice from the sky."), 9);
-  next;
-  mes col(l("As you open your eyes and look around, you see a large ship."), 9);
-  next;
-  mes col(l("Some sailors are trying to talk to you.."), 9);
-  next;
+    callfunc "CheckClientVersion";
+    requestlang @lang;
+    if (@lang >= 0 && @lang <= 7) setlang @lang;
 
-  mesn "Orc Voice";
-  mesq lg("Hey Frenchy!");
-  next;
+    mesn "Narrator";
+    mes col(l("You are on a raft, adrift in the sea."), 9);
+    next;
+    mes col(l("You don't remember anything before this."), 9);
+    next;
+    mes col(l("Suddenly, you hear a voice from the sky."), 9);
+    next;
+    mes col(l("As you open your eyes and look around, you see a large ship."), 9);
+    next;
+    mes col(l("Some sailors are trying to talk to you.."), 9);
+    next;
 
-  mesn "Elfen Voice";
-  mesq lg("Why Frenchy? It's a Russian!");
-  next;
+    mesn "Orc Voice";
+    mesq lg("Hey Frenchy!");
+    next;
 
-  mesn "Tritan Voice";
-  mesq lg("What are you saying guys, it's a yoiis!");
-  next;
+    mesn "Elfen Voice";
+    mesq lg("Why Frenchy? It's a Russian!");
+    next;
 
-  mesn "Raijin Voice";
-  mesq g(l("You stupid, it's an english, look at her head form."),
-         l("You stupid, it's an english, look at his head form."));
-  next;
-  mesq l("Hey you! Do you hear us? Are you okay?");
-  next;
+    mesn "Tritan Voice";
+    mesq lg("What are you saying guys, it's a yoiis!");
+    next;
 
-  menu
-    "I hear you..." + " (English)", -,
-    "Je vous entends..." + " (Français)", -,
-    "Да я вас слышу..." + " (Русский)", -,
-    "Te oigo..." + " (Español)", -,
-    "Eu te ouço..." + " (Português)", -,
-    "I höre euch..." + " (Deutsch)", -,
-    "'k hoar ui wel..." + " (Vloams)", -,
-    "Słyszę cię..." + " (Polish)", -;
+    mesn "Raijin Voice";
+    mesq g(l("You stupid, it's an english, look at her head form."),
+           l("You stupid, it's an english, look at his head form."));
+    next;
+    mesq l("Hey you! Do you hear us? Are you okay?");
+    next;
+
+    menu
+        "I hear you..." + " (English)", -,
+        "Je vous entends..." + " (Français)", -,
+        "Да я вас слышу..." + " (Русский)", -,
+        "Te oigo..." + " (Español)", -,
+        "Eu te ouço..." + " (Português)", -,
+        "I höre euch..." + " (Deutsch)", -,
+        "'k hoar ui wel..." + " (Vloams)", -,
+        "Słyszę cię..." + " (Polish)", -;
     set @lang, @menu-1;
     if (@lang < 0 || @lang > 7) close;
     setlang @lang;
 
-  mesn;
-  mesq g(l("Oh, she's still alive!"),
-         l("Oh, he's still alive!"));
-  next;
-  mesq g(l("This girl needs help, let's rescue her!"),
-         l("This guy needs help, let's rescue him!"));
-  next;
+    mesn;
+    mesq g(l("Oh, she's still alive!"),
+           l("Oh, he's still alive!"));
+    next;
+    mesq g(l("This girl needs help, let's rescue her!"),
+           l("This guy needs help, let's rescue him!"));
+    next;
+
+    mesn "Narrator";
+    mes col(l("The sailors take you aboard their ship to help you."), 9);
+    next;
+    mes col(l("Click on the NPCs around you to continue the introduction."), 9);
+    next;
 
-  mesn "Narrator";
-  mesq col(l("The sailors take you aboard their ship to help you."), 9);
-  next;
-  mesq col(l("Click on the NPCs around you to continue the introduction."), 9);
-  next;
+    warp "000-0-0.gat",22,22;
 
-  warp "000-0-0.gat",22,22;
+    close;
 
-  close;
-}
+}
\ No newline at end of file
diff --git a/npc/000-2-0/billybons.txt b/npc/000-2-0/billybons.txt
index 240d00a1..1063d85e 100644
--- a/npc/000-2-0/billybons.txt
+++ b/npc/000-2-0/billybons.txt
@@ -2,7 +2,7 @@
 // Authors:
 //    Reid
 // Description:
-//    Drunken easteregg about player's past activity
+//    Drunken easteregg about player's past activity.
 
 000-2-0.gat,20,23,0,1	script	BillyBons	311,{
 
@@ -13,11 +13,14 @@
     mesq l("How is *hick* possible??");
     next;
 
-    mesq l("The sailor chugs his beer");
+    mesn "Narrator";
+    mes col(l("The sailor chugs his beer."), 9);
+    next;
 
     menu
         lg("Excuse me? Do you know who I am?"), -;
 
+    mes "";
     mesn;
     mesq l("Don't do do theee... *hick* with me eh!");
     next;
@@ -26,13 +29,12 @@
         l("Are you ok?"), l_Quit,
         l("Alright, bye!"), -;
 
+    mes "";
     mesn;
     mesq lg("NO and *hick* NO, you and you and your... *burp* stupi*hick* guild!");
     next;
     mesq l("You tried to get rid of me, eeh?? But surprise! I'm still here...*hick* Or there....");
     next;
-
-    mesn;
     mesq l("But you won't *hick* me this time...");
     next;
 
@@ -41,6 +43,7 @@
         l("You are full of wine, my friend..."), -,
         l("You should go and get some sleep."), l_Quit;
 
+    mes "";
     mesn;
     mesq l("If I saw *hick* who you wereee.... *hips* Would not have helped you! ");
     next;
@@ -50,28 +53,30 @@
         l("What am I suposed to say?"), l_Quit,
         l("You should go and get some sleep."), l_Secret;
 
+    mes "";
     mesn;
     mesq l("The giant bogeyman!");
-    next;
 
-    goto l_Quit;
+    close;
 
 l_Secret:
+    mes "";
     mesn;
     mesq l("Hear me *hick* well, what ever, whatididever you will*hick*said ab...euh..out wha?! You saw there, the Guild of Esperia won't let it go to public.");
     next;
     mesq l("Nobody will know about the existence of the Mercurians");
     next;
-
     mesq l("Nobody! *burp*");
     next;
-    goto l_Quit;
+
+    close;
 
 l_Hips:
     mesq l("*hick*");
     close;
 
 l_Quit:
+    mes "";
     mesn;
     mesq l("Yeah you're all like *hick* that in Esperia, but you won't get me! *burp*");
     next;
@@ -81,4 +86,4 @@ l_Quit:
 
     close;
 
-}
+}
\ No newline at end of file
diff --git a/npc/000-2-0/julia.txt b/npc/000-2-0/julia.txt
index 5b2083a6..3f2eb88b 100644
--- a/npc/000-2-0/julia.txt
+++ b/npc/000-2-0/julia.txt
@@ -16,7 +16,8 @@
 000-2-0.gat,27,24,0,0	script	Julia	304,2,10,{
 
     mesn;
-    mesq g(l("Hello dear!"), l("Hello sir!"));
+    mesq g(l("Hello dear!"),
+           l("Hello sir!"));
     next;
     mesq l("What do you want today?");
     next;
@@ -55,16 +56,16 @@ l_First:
 
   l_ChooseLang:
     menu
-        l("I speak English") + " (English)", -,
-        l("I speak French") + " (Français)", -,
-        l("I speak Russian") + " (Русский)", -,
-        l("I speak Spanish") + " (Español)", -,
-        l("I speak Portuguese") + " (Português)", -,
-        l("I speak German") + " (Deutsch)", -,
-        l("I speak Flemish") + " (Vloams)", -,
-        l("I speak Polish") + " (Polski)", -,
-
-      @s$, l_NoChanges;
+        l("I speak English") + ". (English)", -,
+        l("I speak French") + ". (Français)", -,
+        l("I speak Russian") + ". (Русский)", -,
+        l("I speak Spanish") + ". (Español)", -,
+        l("I speak Portuguese") + ". (Português)", -,
+        l("I speak German") + ". (Deutsch)", -,
+        l("I speak Flemish") + ". (Vloams)", -,
+        l("I speak Polish") + ". (Polski)", -,
+
+    @s$, l_NoChanges;
     set @lang, @menu-1;
     if (@lang < 0 || @lang > 7) close;
     setlang @lang;
diff --git a/npc/000-2-1/alige.txt b/npc/000-2-1/alige.txt
index 02d001d5..a56fc593 100644
--- a/npc/000-2-1/alige.txt
+++ b/npc/000-2-1/alige.txt
@@ -14,41 +14,47 @@
 //    0     first talking (before food)
 //    1     already talked
 
-
 000-2-1.gat,33,32,0,1	script	AligeTrigger	0,1,1,{
 
-    OnTouch:
-      if (geta2(ShipQuests, ShipQuests_Alige) > 0) close;
-      doevent "Alige::OnFirstEncounter";
-      close;
-    OnTouchFirst:
-      setnpcdir "Alige", 2;
-      stopnpctimer;
-      initnpctimer;
-      // OnTouch will not be called otherwise when OnTouchFirst got called
-      goto OnTouch;
-    OnUnTouchAll:
-      setnpcdir "Alige", 4;
-      stopnpctimer;
-      initnpctimer;
-      close;
-    OnTimer190:
-      if (getnpcdir ("Alige") == 2) setnpcdir "Alige", 6;
-      if (getnpcdir ("Alige") == 4) setnpcdir "Alige", 8;
-      stopnpctimer;
-      end;
+OnTouch:
+    if (geta2(ShipQuests, ShipQuests_Alige) > 0) close;
+    doevent "Alige::OnFirstEncounter";
+
+    close;
+
+OnTouchFirst: // OnTouch will not be called otherwise when OnTouchFirst got called
+    setnpcdir "Alige", 2;
+    stopnpctimer;
+    initnpctimer;
+
+    goto OnTouch;
+
+OnUnTouchAll:
+    setnpcdir "Alige", 4;
+    stopnpctimer;
+    initnpctimer;
+
+    close;
+
+OnTimer190:
+    if (getnpcdir ("Alige") == 2) setnpcdir "Alige", 6;
+    if (getnpcdir ("Alige") == 4) setnpcdir "Alige", 8;
+    stopnpctimer;
+
+    end;
+
 }
 
 000-2-1.gat,33,31,0,1	script	Alige	301,{
 
-  set @q, geta2(ShipQuests, ShipQuests_Alige);
-  if (@q == 2) goto l_AskForFood;
-  goto OnFirstEncounter;
+    set @q, geta2(ShipQuests, ShipQuests_Alige);
+    if (@q == 2) goto l_AskForFood;
+
+    goto OnFirstEncounter;
 
-  OnFirstEncounter:
+OnFirstEncounter:
     seta2 ShipQuests, ShipQuests_Alige, 1;
 
-  l_Talk:
     mesn "Hidden person";
     mesq l("Hey, psst! You're not a sailor, right?");
     next;
@@ -57,12 +63,14 @@
         lg("I am, who are you?"), -,
         lg("I'm not."), l_NeedHelp;
 
-    mes " ";
-    mesq "Hidden person doesn't answer";
+    mes "";
+    mesn "Narrator";
+    mes col(l("Hidden person doesn't answer."), 9);
+
     close;
 
-  l_NeedHelp:
-    mes " ";
+l_NeedHelp:
+    mes "";
     mesn "Hidden person";
     mesq l("Good, good! ") + " " + l("Could you help me please? ") + " " + l("I beg you, please, pleeeease...");
     next;
@@ -71,18 +79,17 @@
         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 " ";
+    mes "";
     mesn "Hidden person";
     mesq lg("Damn you! You better not tell anyone that you've seen me!");
+
     close;
 
-  l_CanHelp:
-    mes " ";
+l_CanHelp:
+    mes "";
     mesn;
     mesq l("I'm called Alige, and I've been hiding here for few weeks.") + l("All that I had to eat were these berries... Berries... Berries...") + l("I'm losing my mind, I need something else to eat!");
     next;
-
-    mesn;
     mesq l("Can you bring me something which isn't a vegetable?") + l("And please, no berries. No more!");
     next;
 
@@ -92,52 +99,48 @@
 
 
   l_ExplainHiding:
-    mes " ";
+    mes "";
     mesn;
     mesq l("No, I can't, I just wanted to travel across the seas for fun.") + " " + l("In this cave, you see, I have lots of fun.");
     next;
-
-    mesn;
     mesq l("Err, seriously, I just wanted to get to Artis, and I haven't got the money to pay for the ferry!");
     next;
-
-    mesn;
     mesq l("Please, don't tell people that you've seen me, I don't want to be thrown to sea as food for sharks or decapitated, not again!");
-
     next;
 
     if (geta2(ShipQuests, ShipQuests_Alige) == 2) goto l_AskForFood;
     goto l_Accept;
 
-  l_AboutReward:
-    mes " ";
+l_AboutReward:
+    mes "";
     mesn;
     mesq l("I'll share my berries with you, if you help me.");
     next;
 
-  l_Accept:
+l_Accept:
     menu
       l("Ok, I'll help you."), l_Accepted,
       l("What is Artis?"), l_Artis,
       l("I think I should report you to the crew members."), l_DamnYou;
 
-  l_Artis:
-    mes " ";
+l_Artis:
+    mes "";
     mesn;
     mesq l("It's a commercial port of Andorra, it's weird that you don't know about it, it's one of the most famous cities throughout the world... But hey oh, returning to the topic! I'm hungry!");
     next;
+
     if (@q == 2) goto l_AskForFood;
     goto l_Accept;
 
-  l_Accepted:
+l_Accepted:
     seta2 ShipQuests, ShipQuests_Alige, 2;
+
     mes " ";
     mesn;
     mesq lg("Perfect, which food did you get for me today?");
     next;
-    goto l_GiveFood;
 
-  l_GiveFood:
+l_GiveFood:
     menu
         rif(countitem(501, 1), l(getitemname("Acorn"))), 0,
         rif(countitem(502, 1), l(getitemname("Bread"))), 502,
@@ -158,7 +161,7 @@
     if (@id == 2) goto l_NoMore; // In case of Piberries.
 // Continue if the food is correct.
 
-  l_GiveReward:
+l_GiveReward:
     if (countitem(@id) < 1) close;
     delitem @id, 1;
 
@@ -169,25 +172,28 @@
     getitem "Piberries", rand(1,3);
     close;
 
-  l_NoReward:
+l_NoReward:
+    mes " ";
     mesn;
     mesq l("I don't want this, give me something else.");
+
     goto l_GiveFood;
 
-  l_NoMore:
+l_NoMore:
     mes " ";
     mesn;
     mesq l("Arrr, don't give me more berries! I don't want them, stupid berries, stupid ... stupid ... stupid!");
-    next;
+
     close;
 
-  l_Poison:
+l_Poison:
     mes " ";
     mesn;
     mesq l("Don't try to poison me! I know what that does!");
+
     goto l_GiveFood;
 
-  l_AskForFood:
+l_AskForFood:
     mesn;
     mesq l("Do you have anything for me today?");
     next;
@@ -199,21 +205,22 @@
       l("What is Artis?"), l_Artis,
       l("I think I should report you to the crew members."), l_DamnYou;
 
-  l_Food:
+l_Food:
     mes " ";
     mesn;
     mesq l("There is some flying yellow plush around you, they're called pious. Getting a roasted leg of one of them would be perfect.");
     next;
-    mesn;
     mesq l("I'd like to catch one of them, but they are flying away when I try.");
     next;
-    mesn;
     mesq l("As you can walk around, it'll be an easy task for you. Impale me one of them!!");
+
     close;
 
-  l_DamnYou:
+l_DamnYou:
     mes " ";
     mesn;
     mesq lg("Damn you! You better not tell anyone that you've seen me!");
+
     close;
+
 }
diff --git a/npc/000-2-1/arpan.txt b/npc/000-2-1/arpan.txt
index 455f1380..d7f7d893 100644
--- a/npc/000-2-1/arpan.txt
+++ b/npc/000-2-1/arpan.txt
@@ -15,13 +15,17 @@
 000-2-1.gat,39,36,0,1	script	LeftDoorCheck	0,0,0,{
     set @q, geta2(ShipQuests, ShipQuests_Arpan);
     if (@q == 0) doevent "Magic Arpan::OnTalk";
+
     close;
+
 }
 
 000-2-1.gat,44,36,0,1	script	RightDoorCheck	0,0,0,{
     set @q, geta2(ShipQuests, ShipQuests_Arpan);
     if (@q == 0) doevent "Magic Arpan::OnTalk";
+
     close;
+
 }
 
 000-2-1.gat,37,32,0,1	script	LeftBarrierCheck	0,0,2,{
@@ -29,19 +33,24 @@
     if (@q > 2) close;
     if (@q == 2 && getequipid(equip_torso) == 1300 && getequipid(equip_legs) == 2200) goto l_EquipDone;
     if (@q == 1) goto l_GetCloth;
+
     doevent "Magic Arpan::OnClothNotTaken";
     warp "000-2-1.gat", 39, 32;
     doevent "Magic Arpan::OnEquip";
+
     close;
 
 l_GetCloth:
     warp "000-2-1.gat", 39, 32;
     doevent "Magic Arpan::OnClothNotTaken";
+
     close;
 
 l_EquipDone:
     seta2 ShipQuests, ShipQuests_Arpan, 3;
+
     close;
+
 }
 
 000-2-1.gat,46,32,0,1	script	RightBarrierCheck	0,0,2,{
@@ -49,34 +58,43 @@ l_EquipDone:
     if (@q > 2) close;
     if (@q == 2 && getequipid(equip_torso) == 1300 && getequipid(equip_legs) == 2200) goto l_EquipDone;
     if (@q == 1) goto l_GetCloth;
+
     doevent "Magic Arpan::OnClothNotTaken";
     warp "000-2-1.gat", 45, 32;
     doevent "Magic Arpan::OnEquip";
+
     close;
 
 l_GetCloth:
     warp "000-2-1.gat", 45, 32;
     doevent "Magic Arpan::OnClothNotTaken";
+
     close;
 
 l_EquipDone:
     seta2 ShipQuests, ShipQuests_Arpan, 3;
+
     close;
+
 }
 
 000-2-1.gat,41,37,0	script	Box	999,{
     mesn "Narrator";
+
     set @q, geta2(ShipQuests, ShipQuests_Arpan);
     if (@q == 1) goto l_Give;
     if (@q > 1) goto l_Empty;
+
     mes col(l("This box is locked"), 9);
     close;
 
 l_Give:
-    mes l("You see some items in the box. Take them out?");
+    mes col(l("You see some items in the box. Take them out?"), 9);
+
     menu
         l("Yes."), -,
         l("No."), l_Close;
+
     seta2 ShipQuests, ShipQuests_Arpan, 2;
     getitem "Wornshirt", 1;
     getitem "Wornshort", 1;
@@ -85,48 +103,60 @@ l_Close:
     close;
 
 l_Empty:
-    mes l("This box is locked.");
+    mes col(l("This box is locked."), 9);
+
     close;
+
 }
 
 
 000-2-1.gat,39,33,0,1	script	Magic Arpan	307,{
+
 OnTalk:
     set @q, geta2(ShipQuests, ShipQuests_Arpan);
+
     mesn;
+
     if (@q > 0) goto l_Menu;
-    mes lg("Yeye, you are really lucky to be alive. You are in good enough shape for walking, do you remember what happened?");
+
+    mesq lg("Yeye, you are really lucky to be alive. You are in good enough shape for walking, do you remember what happened?");
     seta2 ShipQuests, ShipQuests_Arpan, 1;
+
     menu
         lg("I only remember I was rescued by you."), l_Story,
         lg("I can't remember anything."), l_OhWell;
-    close;
 
 OnClothNotTaken:
     mesn;
-    mes lg("Yeye, you still did not get your clothes!");
+    mesq lg("Yeye, you still did not get your clothes!");
+
     close;
 
 OnEquip:
     mesn "Narrator";
     mes col(lg("Open your inventory (F3 key), select the clothes one by one and equip them."), 9);
+
     close;
 
 l_OhWell:
-    mes lg("Oh well, we rescued you when you were yaying adrift in the sea.");
+    mes "";
+    mesq lg("Oh well, we rescued you when you were yaying adrift in the sea.");
 
 l_Story:
-    mes lg("You were yaying sleeping for quite some days there, our shipkeeper, Julia, was here with you, she did her best to fix your injuries during this time.");
+    mes "";
+    mesq lg("You were yaying sleeping for quite some days there, our shipkeeper, Julia, was here with you, she did her best to fix your injuries during this time.");
     next;
-    mes lg("Yaya, you should go see her! She will be happy to see you.");
+    mesq lg("Yaya, you should go see her! She will be happy to see you.");
     next;
-    mes lg("Also, we took your yayed clothes, as they were... Yeyeye... In bad condition, go check the box around your bed, there is some new ones inside.");
+    mesq lg("Also, we took your yayed clothes, as they were... Yeyeye... In bad condition, go check the box around your bed, there is some new ones inside.");
     setcamnpc "Box";
     next;
     restorecam;
+
 l_Menu:
-    mes l("What yeye could I do for you today?");
+    mesq l("What yeye could I do for you today?");
     set @equipped, getequipid(equip_torso) == 1300 && getequipid(equip_legs) == 2200;
+
     menu
         lg("Could you tell me where I am?"), l_Where,
         lg("Where can I find Julia?"), l_Julia,
@@ -137,44 +167,59 @@ l_Menu:
     close;
 
 l_Where:
+    mes "";
     mesn;
-    mes lg("You are on our ship, we are actually yeyending our long merchant traveling adventure to the city of Artis.");
+    mesq lg("You are on our ship, we are actually yeyending our long merchant traveling adventure to the city of Artis.");
     next;
-    mes lg("We will be yaying there in a few days, so we will drop you off there. You will see, citizens are polite and you can still ask for help in the warrior guild. They can help find a job for you or maybe help you find out what happened to you out at sea!");
+    mesq lg("We will be yaying there in a few days, so we will drop you off there. You will see, citizens are polite and you can still ask for help in the warrior guild. They can help find a job for you or maybe help you find out what happened to you out at sea!");
     next;
+
     goto l_Menu;
 
-l_WhereOldClothes:
+l_Julia:
+    mes "";
     mesn;
-    mes lg("We tried to clean them but the sea water mostly killed them. It's why we gave you these cloths, they are not very good but it's all that we got.");
+    mesq g(l("She is on the upper level, yeye can't miss her. She is the only girl in this crew, oh well, except for you now yeyeye!"),
+           l("She is on the upper level, yeye can't miss her. She is the only girl in this crew."));
     next;
-    mes lg("Oh, now that I remember, we also find some money on your pockets, here they are!");
-    seta ShipQuests, ShipQuests_ArpanMoney, 1;
-    set zeny, zeny+25;
+    mesq lg("You can go to your right to go to the upper level.");
     next;
+
     goto l_Menu;
 
-l_Julia:
-    mes g(l("She is on the upper level, yeye can't miss her. She is the only girl in this crew, oh well, except for you now yeyeye!"),
-          l("She is on the upper level, yeye can't miss her. She is the only girl in this crew."));
-    next;
-    mes lg("You can go to your right to go to the upper level.");
+l_Who:
+    mes "";
+    mesn;
+    mesq l("Sorry! I forgot to introduce myself. My name is Arpan, but other sailors call me Magic Arpan because I know one or two yaing magic spells.");
     next;
+
     goto l_Menu;
 
-l_Who:
-    mes l("Sorry! I forgot to introduce myself. My name is Arpan, but other sailors call me Magic Arpan because I know one or two yaing magic spells.");
+l_WhereOldClothes:
+    mes "";
+    mesn;
+    mesq lg("We tried to clean them but the sea water mostly killed them. It's why we gave you these cloths, they are not very good but it's all that we got.");
+    next;
+    mes lg("Oh, now that I remember, we also find some money on your pockets, here they are!");
+    seta ShipQuests, ShipQuests_ArpanMoney, 1;
+    set zeny, zeny+25;
     next;
+
     goto l_Menu;
 
 l_WhatCloth:
-    mes lg("Oh yeyeye, as they are not eatable, you can try to equip them!");
+    mes "";
+    mesn;
+    mesq lg("Oh yeyeye, as they are not eatable, you can try to equip them!");
     next;
+
     mesn "Narrator";
     mes col(lg("Open your inventory (F3 key), select the clothes one by one and equip them."), 9);
     next;
+
     goto l_Menu;
 
 l_Quit:
     close;
-}
+
+}
\ No newline at end of file
diff --git a/npc/000-2-1/devis.txt b/npc/000-2-1/devis.txt
index c0a85e27..742f7585 100644
--- a/npc/000-2-1/devis.txt
+++ b/npc/000-2-1/devis.txt
@@ -4,14 +4,20 @@
 //    Reid
 
 000-2-1.gat,22,38,0,1	script	Devis	310,{
-  mesn;
-  set @q, rand(2);
-  if (@q == 0) goto l_Zzz;
-  goto l_Grm;
-  l_Zzz:
+    mesn;
+    set @q, rand(2);
+    if (@q == 0) goto l_Zzz;
+
+    goto l_Grm;
+
+l_Zzz:
     mes l("Zzzzzzzzzz");
+
     close;
-  l_Grm:
+
+l_Grm:
     mes l("Ggrmm grmmm...");
+
     close;
+
 }
diff --git a/npc/000-2-1/knife.txt b/npc/000-2-1/knife.txt
index c34345d8..2c850ca8 100644
--- a/npc/000-2-1/knife.txt
+++ b/npc/000-2-1/knife.txt
@@ -12,11 +12,13 @@
 000-2-1.gat,40,24,0,2	script	#name	100,{
     set @q, geta(ShipQuests, ShipQuests_Knife);
     if (@q) close;
-    mesn "Knifes on the table";
-    mes l("There are some knifes on the table, do you want to take one?");
+
+    mesn "Narrator";
+    mes col(l("There are some knifes on the table, do you want to take one?"), 9);
     menu
         l("Yes."), l_Give,
         l("No."), -;
+
     close;
 
 l_Give:
diff --git a/npc/000-2-1/peter.txt b/npc/000-2-1/peter.txt
index 3baf6aea..31d53730 100644
--- a/npc/000-2-1/peter.txt
+++ b/npc/000-2-1/peter.txt
@@ -41,28 +41,35 @@ OnTouch:
     if (@q < 1) goto L_Task;
     if (@q == 1 || @q == 2) goto L_Rfail;
     if (@q == 3 || @q == 4) goto L_Rwin;
-    doevent "Peter::OnStartOutside";
+    doevent "Peter::OnReturnWin";
+
     close;
 
 L_Stop:
     doevent "Peter::OnStop";
+
     close;
 
 L_Occupied:
     doevent "Peter::OnDontneedHelp";
+
     close;
 
 L_Task:
     doevent "Peter::OnGiveTask";
+
     close;
 
 L_Rfail:
     doevent "Peter::OnReturnFail";
+
     close;
 
 L_Rwin:
     doevent "Peter::OnReturnWin";
+
     close;
+
 }
 
 000-2-1.gat,60,35,0,1	script	Peter	303,{
@@ -78,72 +85,100 @@ L_Rwin:
 OnGiveTask:
     mesn;
     mesq g(l("Hey, girl!"),
-        l("Hey, man!"));
+           l("Hey, man!"));
     next;
     mesn;
     mesq l("I need somebody who can clean the bottom of the ship of these Ratto, can you help me?");
+    next;
+
     menu
         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;
 
 L_TalkToJulia:
     mesn;
     mesq l("Hey, you should go see Julia to be registered on the ship board.");
+
     goto L_Close;
 
 OnTooWeak:
     mesn;
     mesq lg("I need help for cleaning the wedge of the ship, but you aren't strong enough to help me.");
+
     goto L_Close;
 
 OnStop:
+    warp "000-2-1",61,36;
+
     mesn;
     mesq l("You can't go there!");
-    warp "000-2-1",61,36;
+
     close;
 
 OnReturnFail:
     mesn;
     mesq l("I see it is not easy to get rid of those rattos. Do you want to try again?");
+    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("No, they are way too dangerous for me!"), -;
+
+    mes "";
+    mesn;
     mesq l("Ok, ok. Come back if you change your mind.");
+
     goto L_Close;
 
 OnReturnWin:
     mesn;
     mesq l("Thanks again for helping me. But those rattos are a permanent problem and your help is always welcome. The only problem is that I can give you a reward only one time.");
+
     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("Sorry, I am not in the mood for another fight with those rattos."), -;
 
     if (@q == 5)
+
     menu
         l("No problem, I can help you anyway."), L_Task,
         l("Sorry, I am not in the mood for another fight with those rattos."), -;
 
+    mes "";
+    mesn;
     mesq l("Ok, ok. Come back if you change your mind.");
+
     close;
 
 L_BonusTask:
+    mes "";
     mesn;
     mesq l("I will give you @@gp.", 500);
+    next;
+
     menu
-    lg("Okay, I'm ready to work!"), -,
-    l("What? This reward is too small!"), L_Close;
+        lg("Okay, I'm ready to work!"), -,
+        l("What? This reward is too small!"), L_Close;
+
     if ($@RAT_SAILOR_HELPER$ != "") goto OnDontneedHelp;
     if (@q == 0) seta4 ShipQuests, ShipQuests_Peter, 2;
     if (@q == 3) seta4 ShipQuests, ShipQuests_Peter, 4;
+
     goto L_Start;
 
 L_Task:
+    mes "";
     if ($@RAT_SAILOR_HELPER$ != "") goto OnDontneedHelp;
     if (@q == 0) seta4 ShipQuests, ShipQuests_Peter, 1;
     goto L_Start;
@@ -159,6 +194,7 @@ OnStartOutside:
     initnpctimer;
     warp "000-2-2.gat", 48, 28;
     doevent "RattosControl::OnSpawn";
+
     goto L_Close;
 
 OnTimer5000:
@@ -169,6 +205,7 @@ OnTimer5000:
     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:
@@ -181,18 +218,22 @@ L_CheckRattos:
     if ($@RAT_SAILOR_CONTROL[7] > 40) doevent "RattosControl::OnRatto3Respawn";
     if ($@RAT_SAILOR_CONTROL[8] > 40) doevent "RattosControl::OnRatto4Respawn";
     setnpctimer 0;
+
     end;
 
 OnDontneedHelp:
     mesn;
     mesq l("I don't need your help right now, come back later.");
+    next;
     mesq l("@@ is helping me.", $@RAT_SAILOR_HELPER$);
+
     goto L_Close;
 
 L_Timeout:
     mesn;
     mesq l("Hey! Be careful. You can't stay in this basement for so long, you are going to get sick. Come outside and take a break, maybe you can try again later.");
     warp "000-2-1", 61, 36;
+
     goto L_CleaningClose;
 
 L_Logoff:
@@ -201,12 +242,14 @@ L_Logoff:
 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;
 
 L_Done:
     warp "000-2-1", 61, 36;
     set @q, geta4(ShipQuests, ShipQuests_Peter);
     if (@q == 2 || @q == 4) goto L_Reward;
+
     goto L_Thanks;
 
 L_CleaningEnd:
@@ -218,6 +261,7 @@ L_CleaningEnd:
     killmonster "000-2-2.gat", "RattosControl::OnRatto2Death";
     killmonster "000-2-2.gat", "RattosControl::OnRatto3Death";
     killmonster "000-2-2.gat", "RattosControl::OnRatto4Death";
+
     end;
 
 L_CleaningClose:
@@ -229,6 +273,7 @@ L_CleaningClose:
     killmonster "000-2-2.gat", "RattosControl::OnRatto2Death";
     killmonster "000-2-2.gat", "RattosControl::OnRatto3Death";
     killmonster "000-2-2.gat", "RattosControl::OnRatto4Death";
+
     close;
 
 L_Reward:
@@ -237,6 +282,7 @@ L_Reward:
     getexp 100, 0;
     set zeny, zeny + 500;
     seta4 ShipQuests, ShipQuests_Peter, 5;
+
     goto L_CleaningClose;
 
 L_Thanks:
@@ -244,11 +290,13 @@ L_Thanks:
     mesq l("Thanks for helping me!");
     set @q, geta4(ShipQuests, ShipQuests_Peter);
     if (@q == 1) seta4 ShipQuests, ShipQuests_Peter, 3;
+
     goto L_CleaningClose;
 
 L_Close:
     set @q, 0;
     set @q_julia, 0;
+
     close;
 
 }
diff --git a/npc/000-2-1/ronan.txt b/npc/000-2-1/ronan.txt
index dc95b350..73028538 100644
--- a/npc/000-2-1/ronan.txt
+++ b/npc/000-2-1/ronan.txt
@@ -3,14 +3,20 @@
 //    Vasily_Makarov
 
 000-2-1.gat,43,38,0,1	script	Ronan	302,{
-  mesn;
-  set @q, rand(2);
-  if (@q == 0) goto l_Zzz;
-  goto l_Snoring;
-  l_Zzz:
+    mesn;
+    set @q, rand(2);
+    if (@q == 0) goto l_Zzz;
+
+    goto l_Snoring;
+
+l_Zzz:
     mesq l("Zzzzzzzzzz");
+
     close;
-  l_Snoring:
+
+l_Snoring:
     mesq l("Rrrr pchhhh...");
+
     close;
+
 }
diff --git a/npc/000-2-2/doors.txt b/npc/000-2-2/doors.txt
index 0d7e7b85..98374fa7 100644
--- a/npc/000-2-2/doors.txt
+++ b/npc/000-2-2/doors.txt
@@ -10,6 +10,7 @@
 
 OnTouch:
     if (getmapmobs("000-2-2.gat") > 0) goto l_Warn;
+
     goto l_Warp;
 
 l_Warn:
@@ -18,14 +19,18 @@ l_Warn:
     next;
 
     menu
-      l("Yes."), l_Warp,
-      l("No."), -;
+        l("Yes."), l_Warp,
+        l("No."), -;
+
     warp "000-2-2", 48, 28;
+
     close;
 
 l_Warp:
     warp "000-2-1", 61, 36;
+
     close;
+
 }
 
 000-2-2.gat,24,31,0,1	script	AreaNPC	0,0,0,{
@@ -53,24 +58,28 @@ OnSpawn:
     areamonster "000-2-2.gat",23, 19, 50, 40,"Ratto",1005,1,"RattosControl::OnRatto2Death";
     areamonster "000-2-2.gat",23, 19, 50, 40,"Ratto",1005,1,"RattosControl::OnRatto3Death";
     areamonster "000-2-2.gat",23, 19, 50, 40,"Ratto",1005,1,"RattosControl::OnRatto4Death";
+
     close;
 
 OnRatto1Respawn:
     areamonster "000-2-2.gat",23, 19, 50, 40,"Ratto",1005,1,"RattosControl::OnRatto1Death";
     set $@RAT_SAILOR_CONTROL[1], 0;
     set $@RAT_SAILOR_CONTROL[5], 0;
+
     end;
 
 OnRatto2Respawn:
     areamonster "000-2-2.gat",23, 19, 50, 40,"Ratto",1005,1,"RattosControl::OnRatto2Death";
     set $@RAT_SAILOR_CONTROL[2], 0;
     set $@RAT_SAILOR_CONTROL[6], 0;
+
     end;
 
 OnRatto3Respawn:
     areamonster "000-2-2.gat",23, 19, 50, 40,"Ratto",1005,1,"RattosControl::OnRatto3Death";
     set $@RAT_SAILOR_CONTROL[3], 0;
     set $@RAT_SAILOR_CONTROL[7], 0;
+
     end;
 
 OnRatto4Respawn:
@@ -81,17 +90,22 @@ OnRatto4Respawn:
 
 OnRatto1Death:
     set $@RAT_SAILOR_CONTROL[1], 1;
+
     end;
 
 OnRatto2Death:
     set $@RAT_SAILOR_CONTROL[2], 1;
+
     end;
 
 OnRatto3Death:
     set $@RAT_SAILOR_CONTROL[3], 1;
+
     end;
 
 OnRatto4Death:
     set $@RAT_SAILOR_CONTROL[4], 1;
+
     end;
+
 }
diff --git a/npc/000-2-3/elmo.txt b/npc/000-2-3/elmo.txt
index 8c50c93f..7e2d2bc6 100644
--- a/npc/000-2-3/elmo.txt
+++ b/npc/000-2-3/elmo.txt
@@ -16,6 +16,7 @@
         l("Yes, Arpan gave me these clothes."), l_OhGood,
         l("No."), -;
 
+    mes "";
     mesn;
     mesq l("You should go see them.");
     next;
@@ -24,6 +25,7 @@
     close;
 
 l_OhGood:
+    mes "";
     mesn;
     mesq l("Oh good! Did he give you your money back as well?");
     next;
@@ -32,15 +34,17 @@ l_OhGood:
         l("Yes he did."), l_OhHeDid,
         l("He told me nothing about that."), -;
 
+    mes "";
     mesn;
     mesq l("Hehe, sometimes he gets his head in the clouds, You should go ask him about that.");
 
     close;
 
 l_OhHeDid:
+    mes "";
     mesn;
     mesq l("Ok, be patient a little while longer, in the next few days we will arrive at the port of Artis...");
 
     close;
 
-}
+}
\ No newline at end of file
diff --git a/npc/000-2-3/piousrocket.txt b/npc/000-2-3/piousrocket.txt
index a18b042c..327c1a03 100644
--- a/npc/000-2-3/piousrocket.txt
+++ b/npc/000-2-3/piousrocket.txt
@@ -5,13 +5,17 @@
 //    Jumping pious.
 
 000-2-3.gat,27,23,4,2	script	#name	308,{
+
     setnpcdir 2;
     stopnpctimer;
     initnpctimer;
+
     close;
 
 OnTimer1420:
     setnpcdir 4;
     stopnpctimer;
+
     end;
+
 }
diff --git a/npc/000-2-3/sailors.txt b/npc/000-2-3/sailors.txt
index e85a6176..f0d7657b 100644
--- a/npc/000-2-3/sailors.txt
+++ b/npc/000-2-3/sailors.txt
@@ -6,88 +6,115 @@
 //    End of intro with Nard and Elmo talking about the player.
 
 000-2-3.gat,20,26,0,0	script	AreaTop	0,1,0,{
+
 OnTouch:
     if (geta(ShipQuests, ShipQuests_Door) == 1) end;
     seta ShipQuests, ShipQuests_Door, 1;
+
     mesn "Elmo";
     mesq g(l("So that's why we wanted to warn you, maybe she comes from that guild, as that sign was on her raft."),
            l("So that's why we wanted to warn you, maybe he comes from that guild, as that sign was on his raft."));
     next;
+
     mesn "Captain Nard";
     mesq g(l("I see, warn the other sailors about this. But if she is a part of the Warrior Guild, then she is also our ally."),
            l("I see, warn the other sailors about this. But if he is a part of the Warrior Guild, then he is also our ally."));
     next;
+
     mesn "Elmo";
     mesq l("I will.");
     next;
     mesq l("About this Esperia's Guild, I wonder about them, if I may speak frankly. There are rumours going around that they did some monstrous things and that they are hiding quite alot of things from us.");
     next;
+
     mesn "Captain Nard";
     mesq g(l("This kind of talk should be punished, but I agree that I don't specially like them too, so keep an eye on her."),
            l("This kind of talk should be punished, but I agree that I don't specially like them too, so keep an eye on him."));
     next;
+
     mesq g(l("But... if she has amnesia like Julia said... We don't need to worry about her."),
            l("But... if he has amnesia like Julia said... We don't need to worry about him."));
     next;
+
     mesn "Elmo";
     mesq l("Sure, Cap'tain.");
+
     close;
+
 }
 
 000-2-3.gat,21,27,0,0	script	AreaMiddle	0,0,0,{
+
 OnTouch:
     if (geta(ShipQuests, ShipQuests_Door) == 1) end;
     seta ShipQuests, ShipQuests_Door, 1;
+
     mesn "Elmo";
     mesq g(l("So that's why we wanted to warn you, maybe she comes from that guild, as that sign was on her raft."),
            l("So that's why we wanted to warn you, maybe he comes from that guild, as that sign was on his raft."));
     next;
+
     mesn "Captain Nard";
     mesq g(l("I see, warn the other sailors about this. But if she is a part of the Warrior Guild, then she is also our ally."),
            l("I see, warn the other sailors about this. But if he is a part of the Warrior Guild, then he is also our ally."));
     next;
+
     mesn "Elmo";
     mesq l("I will.");
     next;
     mesq l("About this Esperia's Guild, I wonder about them, if I may speak frankly. There are rumours going around that they did some monstrous things and that they are hiding quite alot of things from us.");
     next;
+
     mesn "Captain Nard";
     mesq g(l("This kind of talk should be punished, but I agree that I don't specially like them too, so keep an eye on her."),
            l("This kind of talk should be punished, but I agree that I don't specially like them too, so keep an eye on him."));
     next;
-    mesq g(l("But... if she is amnesic like Julia said, we don't need to worry about her."),
-           l("But... if he is amnesic like Julia said, we don't need to worry about him."));
+
+    mesq g(l("But... if she has amnesia like Julia said... We don't need to worry about her."),
+           l("But... if he has amnesia like Julia said... We don't need to worry about him."));
     next;
+
     mesn "Elmo";
     mesq l("Sure, Cap'tain.");
+
     close;
+
 }
 
 000-2-3.gat,20,28,0,0	script	AreaBottom	0,1,0,{
+
 OnTouch:
     if (geta(ShipQuests, ShipQuests_Door) == 1) end;
     seta ShipQuests, ShipQuests_Door, 1;
+
     mesn "Elmo";
     mesq g(l("So that's why we wanted to warn you, maybe she comes from that guild, as that sign was on her raft."),
            l("So that's why we wanted to warn you, maybe he comes from that guild, as that sign was on his raft."));
     next;
+
     mesn "Captain Nard";
     mesq g(l("I see, warn the other sailors about this. But if she is a part of the Warrior Guild, then she is also our ally."),
            l("I see, warn the other sailors about this. But if he is a part of the Warrior Guild, then he is also our ally."));
     next;
+
     mesn "Elmo";
     mesq l("I will.");
     next;
     mesq l("About this Esperia's Guild, I wonder about them, if I may speak frankly. There are rumours going around that they did some monstrous things and that they are hiding quite alot of things from us.");
     next;
+
     mesn "Captain Nard";
     mesq g(l("This kind of talk should be punished, but I agree that I don't specially like them too, so keep an eye on her."),
            l("This kind of talk should be punished, but I agree that I don't specially like them too, so keep an eye on him."));
     next;
-    mesq g(l("But... if she is amnesic like Julia said, we don't need to worry about her."),
-           l("But... if he is amnesic like Julia said, we don't need to worry about him."));
+
+    mesq g(l("But... if she has amnesia like Julia said... We don't need to worry about her."),
+           l("But... if he has amnesia like Julia said... We don't need to worry about him."));
     next;
+
     mesn "Elmo";
     mesq l("Sure, Cap'tain.");
+
     close;
-}
+
+}
\ No newline at end of file
diff --git a/npc/000-2-3/savepoint.txt b/npc/000-2-3/savepoint.txt
index f3481503..9013e000 100644
--- a/npc/000-2-3/savepoint.txt
+++ b/npc/000-2-3/savepoint.txt
@@ -22,6 +22,7 @@
     next;
     mes col(l("..."), 9);
     next;
+
     mesn "Nard";
     mesq l("Hey, you can't sleep here, it's my room.");
 
diff --git a/npc/functions/savepoint.txt b/npc/functions/savepoint.txt
index 72c08910..2d10b41a 100644
--- a/npc/functions/savepoint.txt
+++ b/npc/functions/savepoint.txt
@@ -15,15 +15,15 @@ function	script	SavePoint	{
         l("Take a nap"), -,
         l("Nothing"), L_Return;
 
-    mes " ";
+    mes "";
     mesn "Narrator";
     mes col(l("You close your eyes a few seconds..."), 9);
     next;
-    mes col(l("..."), 9);
+    mes col("...", 9);
     next;
-    mes col(l("..."), 9);
+    mes col("...", 9);
     next;
-    mes col(l("..."), 9);
+    mes col("...", 9);
     next;
     mes col(l("Your position is saved."), 9);
     next;
@@ -32,4 +32,5 @@ function	script	SavePoint	{
 
 L_Return:
     return;
+
 }