Replace bit flags by constants on narrator and speech functions.

58 files changed, 293 insertions, 293 deletions

diff --git a/npc/000-0-1/narrator.txt b/npc/000-0-1/narrator.txt
index c83dbac7..5c7e4788 100644
--- a/npc/000-0-1/narrator.txt
+++ b/npc/000-0-1/narrator.txt
@@ -11,7 +11,7 @@
 
 000-0-1,25,28,0	script	Narrator#000-0-1	NPC_NARRATOR,{
 
-    narrator 4,
+    narrator S_LAST_NEXT,
         l("Look, we finally meet."),
         l("I think that you already understood, you are asleep."),
         l("The ship, La Johanne, has left Drasil Island, finally."),
diff --git a/npc/000-1/gugli.txt b/npc/000-1/gugli.txt
index 9d5c3505..e9e0e0b0 100644
--- a/npc/000-1/gugli.txt
+++ b/npc/000-1/gugli.txt
@@ -26,7 +26,7 @@
 
     if (getq(ShipQuests_Couwan) == 1)
     {
-        speech 4,
+        speech S_LAST_NEXT,
             l("Great to see you! What can I do for you today?");
         goto L_Menu;
     }
diff --git a/npc/000-2-0/julia.txt b/npc/000-2-0/julia.txt
index 94ae91b2..9a9c8e57 100644
--- a/npc/000-2-0/julia.txt
+++ b/npc/000-2-0/julia.txt
@@ -53,7 +53,7 @@
     }
 
     function gotoSleep {
-        speech 5,
+        speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
             l("You already did enough for us, follow Nard's advice and get some rest."),
             l("We are at half a day from our final destination, by the time that you wake up I'm sure that we will be there!"),
             l("Do you have any other questions for me?");
@@ -166,7 +166,7 @@
         mesq l("Here they are.");
         next;
 
-        narrator 4,
+        narrator S_LAST_NEXT,
             l("There is a paper with some rules written on it.");
 
         GameRules 8 | 4;
diff --git a/npc/000-2-0/note.txt b/npc/000-2-0/note.txt
index 5751d18b..fcb28f71 100644
--- a/npc/000-2-0/note.txt
+++ b/npc/000-2-0/note.txt
@@ -8,12 +8,12 @@
 //    A small note presenting the 6 main rules of Evol Online.
 
 000-2-0,29,25,0	script	Note	NPC_PAPER_NOTE,{
-    narrator 4,
+    narrator S_LAST_NEXT,
             l("There is a paper with some rules written on it.");
 
     GameRules 8 | 4;
 
-    narrator 8,
+    narrator S_NO_NPC_NAME,
         l("Following these lines are some other writings on this paper."),
         l("Do not give the password of your room to anybody! Keep it secret and try not to use the same one in any other room in the future. - Julia"),
         l("Does anyone know a good place to hang out in Esperia? - M. Arpan"),
diff --git a/npc/000-2-1/alige.txt b/npc/000-2-1/alige.txt
index 7cfb9e63..500e39af 100644
--- a/npc/000-2-1/alige.txt
+++ b/npc/000-2-1/alige.txt
@@ -227,7 +227,7 @@ L_NoReward:
 
 L_Drunk:
     setcamnpc;
-    speech 5,
+    speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
         l("I asked for food but... *hips* Ah, that'll do!");
     restorecam;
 
diff --git a/npc/000-2-1/arpan.txt b/npc/000-2-1/arpan.txt
index b72e0b63..e1c07bbf 100644
--- a/npc/000-2-1/arpan.txt
+++ b/npc/000-2-1/arpan.txt
@@ -241,13 +241,13 @@ L_EquipDone:
     goto L_Menu;
 
 L_GotoSleep:
-    speech 5,
+    speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
         l("You already did enough for us, do you want to follow Nard's advice and get some rest?");
 
     switch (select (l("Yes."), l("No.")))
     {
         case 1:
-            speech 5,
+            speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
                 l("Fine."),
                 l("We are at half a day from our final destination, by the time that you wake up I'm sure that we will be there!");
 
@@ -257,7 +257,7 @@ L_GotoSleep:
 
             break;
         case 2:
-            speech 5,
+            speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
                 l("Alright, take your time we are not in a hurry.");
 
             break;
diff --git a/npc/000-2-1/story_save.txt b/npc/000-2-1/story_save.txt
index de2c1693..44171ad6 100644
--- a/npc/000-2-1/story_save.txt
+++ b/npc/000-2-1/story_save.txt
@@ -11,7 +11,7 @@
     if(.@q_nard == 5 && .@q_narr < 1)
     {        
 OnClick:
-        narrator 4,
+        narrator S_LAST_NEXT,
             l("You lie in the bed."),
             l("Your head is suddently heavy, your eyes are closing..."),
             lg("You fell asleep.");
diff --git a/npc/000-2-3/elmo.txt b/npc/000-2-3/elmo.txt
index 74e5beec..8e2ef044 100644
--- a/npc/000-2-3/elmo.txt
+++ b/npc/000-2-3/elmo.txt
@@ -7,7 +7,7 @@
 
 000-2-3,27,27,0	script	Elmo	NPC_ELMO,{
     function got_money {
-        speech 4,
+        speech S_LAST_NEXT,
             lg("Be patient a little while longer, in the next few days we will arrive at the port of Artis..."),
             l("If you feel bored or like running around in circles, you may want to talk with the other sailors around here to get some tasks to do."),
             l("From what I heard, my brother Gugli needs the help of as many people as possible in order to collect a lot of neat things that can be found on this island."),
@@ -26,24 +26,24 @@
         got_money;
     }
 
-    speech 4,
+    speech S_LAST_NEXT,
         l("Hey you, sorry for leaving your room so quickly. I needed to speak with the captain about the food reserves. You know, now that we have a new mouth to feed, we need to check what we have."),
         l("So, how is it going? Did you meet any other crew members yet?");
 
     switch (select (l("Yes, Arpan gave me these clothes."), l("Not yet.")))
     {
         case 1:
-            speech 5,
+            speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
                 l("Oh good! Did he give you your money back as well?");
 
             switch (select (l("Yes he did."), l("He told me nothing about that.")))
             {
                 case 1:
-                    speech 5,
+                    speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
                         l("Ok, be patient a little while longer, in the next few days we will arrive at the port of Artis...");
                     break;
                 case 2:
-                    speech 5,
+                    speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
                         l("Hehe, sometimes he gets his head in the clouds, You should go ask him about that.");
                     setq ShipQuests_ArpanMoney, 1; 
                     break;
@@ -51,7 +51,7 @@
 
             break;
         case 2:
-            speech 5,
+            speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
                 l("You should go see them."),
                 l("You still got a few days before we arrive at the port, maybe you can learn something from them?");
 
diff --git a/npc/000-2-3/nard.txt b/npc/000-2-3/nard.txt
index 0526b790..86dbe50a 100644
--- a/npc/000-2-3/nard.txt
+++ b/npc/000-2-3/nard.txt
@@ -227,7 +227,7 @@ L_Already:
 
 L_GoBackArtis:
     checkclientversion;
-    speech 4,
+    speech S_LAST_NEXT,
         l("Enough of this island?"),
         l("Where would you like to go now?");
     switch (select(l("Let's go to Artis."),
@@ -235,7 +235,7 @@ L_GoBackArtis:
                    l("I would like to stay here a bit more.")))
     {
         case 1:
-            speech 5,
+            speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
                 l("Let's set sail then!");
 
             savepoint "001-2-22", 50, 38;
@@ -257,7 +257,7 @@ L_GoBackArtis:
             close;
 
         case 3:
-            speech 5,
+            speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
                 l("Ok I stay here with my paperwork if you need my help.");
 
             closedialog;
diff --git a/npc/001-1/artaxe.txt b/npc/001-1/artaxe.txt
index 355423b1..9f8e02f2 100644
--- a/npc/001-1/artaxe.txt
+++ b/npc/001-1/artaxe.txt
@@ -5,7 +5,7 @@
 //    Legion NPC blocking the north road of Artis.
 
 001-1,90,31,0	script	Artaxe	NPC_ARTAXE,{
-    speech 4,
+    speech S_LAST_NEXT,
         l("Sorry buddy, you can't pass by this way, we're moving some furniture."),
         l("Come back later!");
 
diff --git a/npc/001-1/calypsan.txt b/npc/001-1/calypsan.txt
index 411d7d18..e4195f06 100644
--- a/npc/001-1/calypsan.txt
+++ b/npc/001-1/calypsan.txt
@@ -16,7 +16,7 @@
 001-1,47,126,0	script	Calypsan#001-1	NPC_CALYPSAN,{
 
     function explain_dyes {
-        speech 5,
+        speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
             l("Look at your equipment, can you guess what material it is made from?"),
             l("Seek a colorant for that material:"),
             l("Cotton, cashmere, leather, ..."),
@@ -33,7 +33,7 @@
     }
 
     function sell_dye {
-        speech 5, l("For what kind of tissue?");
+        speech S_FIRST_BLANK_LINE | S_LAST_NEXT, l("For what kind of tissue?");
         .@tissue_type = select (l("Cotton"), l("Cashmere"));
 
         closedialog;
@@ -52,7 +52,7 @@
         close;
     }
 
-    speech 4,
+    speech S_LAST_NEXT,
         l("Yoiis envies a rainbow in the sky?"),
         l("It is possible to yeye your cloth with my beautiful dyes."),
         l("What does yoiis want today?");
@@ -72,7 +72,7 @@
         {
             case 1:
                 setcamnpc "Fexil#001-1";
-                speech 5,
+                speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
                     l("Oh yeye did, his store is just beside me!"),
                     l("Yoiis should look there.");
                 restorecam;
@@ -86,7 +86,7 @@
                 explain_dyes;
                 break;
             case 4:
-                speech 5,
+                speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
                     l("Yoiis is not yet ready to make his own dyes."),
                     l("But in the future I might be able to help you create some of your own.");
                 break;
diff --git a/npc/001-1/chelios.txt b/npc/001-1/chelios.txt
index e29193a2..1ee44d2f 100644
--- a/npc/001-1/chelios.txt
+++ b/npc/001-1/chelios.txt
@@ -15,7 +15,7 @@
 001-1,95,109,0	script	Chelios	NPC_CHELIOS,{
 
     function give_small_quest {
-        speech 5,
+        speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
             l("Her sword... I'm having some trouble finishing it."),
             l("You see, Enora asked me to do a black iron sword, unfortunately I ran out of the material needed, and..."),
             l("Only Don and the Merchant Guild have that kind of material in stock. It's called black iron."),
@@ -28,13 +28,13 @@
             case 1:
                 break;
             case 2:
-                speech 5,
+                speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
                     lg("I'll be here, come back when you'll be ready.");
 
                 return;
         }
 
-        speech 5,
+        speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
             l("Thank you very much!"),
             l("Talk with Lloyd the Banker in the Merchant Guild, it's a big building in the northern side of Artis, at the top of the small hill.");
 
@@ -44,7 +44,7 @@
     }
 
     function more_info {
-        speech 5,
+        speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
             l("It's the big building in northern Artis, at the top of a small hill."),
             l("Take the east road that goes to the north and follow it until you are on top of the cliff."),
             l("That part of the town is called the Gilded Hill, it's also where the Merchant Guild has its headquarters."), //rich hill
@@ -54,7 +54,7 @@
     }
 
     function quest_completed {
-        speech 5,
+        speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
             l("Oh... Awesome!"),
             l("You were gone so I thought you let me down."),
             l("Don gave me some black iron... after I asked him nearly ten times."),
@@ -67,7 +67,7 @@
     }
 
     function blacksmith_house{
-        speech 5,
+        speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
             l("Behind me? It's the Blacksmith House, the most renowned throughout Aemil."),
             l("There are two shops inside, they are independent from the Merchant Guild of Artis."),
             l("Now that I think about it, they are the only shops that are independent in Artis..."),
@@ -76,7 +76,7 @@
         return;
     }
 
-    speech 4, l("Can I be of any help?");
+    speech S_LAST_NEXT, l("Can I be of any help?");
 
     do
     {
diff --git a/npc/001-1/devis.txt b/npc/001-1/devis.txt
index a9f40c07..0a2a60f0 100644
--- a/npc/001-1/devis.txt
+++ b/npc/001-1/devis.txt
@@ -22,7 +22,7 @@
         if (.@rand == 0) goodbye;
         else if (.@rand == 1)
         {
-            speech 4,
+            speech S_LAST_NEXT,
                 l("A sunny and hot day,"),
                 l("a quiet place,"),
                 l("a ground!"),
diff --git a/npc/001-1/doors.txt b/npc/001-1/doors.txt
index 778757d4..31ca2b7d 100644
--- a/npc/001-1/doors.txt
+++ b/npc/001-1/doors.txt
@@ -12,7 +12,7 @@ OnTouch:
 
     if (.@enora < 11)
     {
-        narrator 4,
+        narrator S_LAST_NEXT,
             l("The door to the legion building is temporarily closed.");
     }
     else
diff --git a/npc/001-1/enora.txt b/npc/001-1/enora.txt
index 1061dace..019e99aa 100644
--- a/npc/001-1/enora.txt
+++ b/npc/001-1/enora.txt
@@ -22,7 +22,7 @@
 001-1,176,113,0	script	Enora#001-1	NPC_HUMAN_FEMALE_NOOB,{
 
     function enora_don {
-        speech 5,
+        speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
             l("Don is renowned throughout the entire land of Aemil for his blacksmithing skills, and he is here, in Artis."),
             l("It's a great honor for us, at the Legion, to hold the security of his business!"),
             l("If you search for him you should look in the west of the city, it's the first house just after the left bridge, you can't miss it!"),
@@ -32,7 +32,7 @@
     }
 
     function enora_legion {
-        speech 5,
+        speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
             l("The Legion of Gasaron are a group of warriors who vowed to protect and serve their neighbours."),
             l("We hold various training sessions, and also have a task board with a heap of things to do for the city and its surroundings."),
             l("It's a good place to earn money, it can also help you to travel throughout the land!"),
@@ -42,7 +42,7 @@
     }
 
     function enora_light_armor {
-        speech 5,
+        speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
             l("The light armor shop is ran by Resa, she is part of the Merchant Guild of Artis."),
             l("She is very skilled when it comes to weaving an ordinary piece of cloth into a wonderful work of art!"),
             l("Her shop is on the west side of the city, between the Legion building and the library.");
@@ -51,7 +51,7 @@
     }
 
     function enora_market {
-        speech 5,
+        speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
             l("The market is located in the south-east of Artis, it is known as Merchant Guild's exhibit."),
             l("You need to be a member of the Merchant Guild to have a chance there."),
             l("And I bet you don't know who is in charge of monitoring the security of this place?");
@@ -59,12 +59,12 @@
         switch (select (l("The Legion?"), l("I don't know.")))
         {
             case 1:
-                speech 5,
+                speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
                     l("You hit the nail on the head, it's the Legion of Gasaron!"),
                     l("Our main responsibility in the city is to protect the Merchant Guild.");
                 break;
             case 2:
-                speech 5,
+                speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
                     l("Cat got your tongue?"),
                     l("..."),
                     l("Your brain liquified to match the level of a piou! It's the Legion of Gasaron.");
@@ -74,7 +74,7 @@
     }
 
     function enora_hill {
-        speech 5,
+        speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
             l("Go north from here until you find the dock warehouse, cross the bridge to the west side of the canal, continue north until you reach another bridge then cross it to the east side of the canal."),
             l("You should arrive at a park with a hill nearby.");
 
@@ -82,7 +82,7 @@
     }
 
     function enora_memories {
-        speech 5,
+        speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
             l("It's so exciting to meet somebody with amnesia!"),
             l("Can't you remember anything at all? Or do you have some memories of your past?"),
             l("What happens when you try to think about it?"),
@@ -93,17 +93,17 @@
                         lg("Don't get too excited about it...")))
         {
             case 1:
-                narrator 5,
+                narrator S_FIRST_BLANK_LINE | S_LAST_NEXT,
                     l("You concentrate and try to summon old memories from within your mind."),
                     l("You feel numb and everything around you looks foggy, but you can recall the feeling of the cold hard wood of your raft on a stormy night."),
                     l("A headache hits you and you lose your concentration.");
 
-                speech 4,
+                speech S_LAST_NEXT,
                     l("So? You haven't exploded yet! Are you getting anything?");
 
                 select (l("Not really. All I got was a headache..."));
 
-                speech 5,
+                speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
                     l("It's like your memories are locked away in your head! Cool!");
 
                 break;
@@ -112,7 +112,7 @@
                 break;
         }
 
-        speech 4,
+        speech S_LAST_NEXT,
             l("Ok, sorry. Back to our fluffies.");
 
         return;
@@ -125,14 +125,14 @@
         getexp .@exp_reward, 0;
         Zeny = Zeny + .@zeny_reward;
 
-        narrator 4,
+        narrator S_LAST_NEXT,
             l("You received @@ EXP and @@ E.", .@exp_reward, .@zeny_reward);
 
         return;
     }
 
     function enora_first_quest {
-        speech 5,
+        speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
             l("You probably don't have much business in this city as you don't remember who you are."),
             lg("So I was going to ask if maybe you would be interested in giving me a hand with a few errands.");
 
@@ -140,7 +140,7 @@
                         l("Of course! What do you need?")))
         {
             case 1:
-                speech 5,
+                speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
                     l("Some tasks will help you become aquainted with Artis. Trust me.");
                 break;
             case 2:
@@ -148,7 +148,7 @@
                 break;
         }
 
-        speech 4,
+        speech S_LAST_NEXT,
             l("I asked Don our blacksmith to prepare a black iron sword for morning, he should be done by now."),
             l("Go meet him, and take the package to me, it's an easy task."),
             l("You will be able to find Don's house in the west of the city, it's the first house just after the bridge on the left, you can't miss it!"),
@@ -163,7 +163,7 @@
     }
 
     function enora_second_quest {
-        speech 5,
+        speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
             l("Thank you for this commission, Chelios is as good as Don when it comes to forging metal."),
             l("By the way, did you ever talk with Don?"),
             l("If so, I hope that he didn't give you any hard time, sometimes he can get up on the wrong side of the bed he becomes an embittered and grumpy old man..."),
@@ -174,15 +174,15 @@
                         l("The old man seemed to be senile.")))
         {
             case 1:
-                speech 5, l("Fine, let's see his work...");
-                narrator 4, l("Enora is carefully inspecting the sword.");
-                speech 4,
+                speech S_FIRST_BLANK_LINE | S_LAST_NEXT, l("Fine, let's see his work...");
+                narrator S_LAST_NEXT, l("Enora is carefully inspecting the sword.");
+                speech S_LAST_NEXT,
                     l("Excellent!"),
                     l("The detail and craftsmanship that went into this sword can only be accomplished by the most practiced of blacksmiths.");
 
                 break;
             case 2:
-                speech 5,
+                speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
                     l("He may not have all of his wits but keep in mind one thing:"),
                     l("Don is renowned throughout the entire land for his blacksmith skills, and he is here, in Artis."),
                     l("It's a great honor for us, at the Legion, to hold the security of his business!");
@@ -190,7 +190,7 @@
                 break;
         }
 
-        speech 4,
+        speech S_LAST_NEXT,
             l("After this small overview of Artis, what do you think of our city?"),
             l("The Legion of Gasaron is in charge of the security of the intramural part of our cities."),
             l("The control and administration of the cities passes hands sometimes. You may find the Mana Order or the Brotherhood in charge instead of us at some point!"),
@@ -207,7 +207,7 @@
     }
 
     function enora_third_quest {
-        speech 5,
+        speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
             l("Look how splendid this @@ is!", getitemlink (ArtisTankTop, CamelCottonDye)),
             l("It's nearly as good as one from Esperia, have you ever been there?"),
             l("Ah... Sorry, I forgot, again."),
@@ -229,7 +229,7 @@
             }
         } while (.@q == 2);
 
-        speech 5,
+        speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
             l("Oh yes, I have one last errand for you, Q'Pid in the market sells potions."),
             l("It has been some days now since I asked her for a box of @@s, but she hasn't delivered anything yet.", getitemlink (PiberriesInfusion)),
             l("Please try to figure out what went wrong with this order and bring me those potions."),
@@ -244,10 +244,10 @@
     }
 
     function enora_fourth_quest {
-        speech 5,
+        speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
             l("Awesome!");
 
-        speech 4,
+        speech S_LAST_NEXT,
             l("I have one more task for you. Trozz, another member of the Legion, sent me a letter earlier today."),
             l("Some citizens are worried about the growing number of Fluffies on the hill of Artis."),
             l("Children play there and can be badly hurt if they get too close to a Fluffy's nest."),
@@ -264,18 +264,18 @@
         setq ArtisQuests_Enora, 10;
         enora_reward (80, 175);
 
-        speech 4,
+        speech S_LAST_NEXT,
             l("Do you know where the hill is?");
 
         switch (select (l("Yes I do."),
                         l("Please guide me.")))
         {
             case 1:
-                speech 5,
+                speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
                     l("Perfect! I will wait for you here.");
                 break;
             case 2:
-                speech 5,
+                speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
                     l("Follow the up-stream and cross the canal twice using the two bridges north from here."),
                     l("The hill is located on the north-east of Artis.");
                 break;
@@ -289,20 +289,20 @@
     function enora_hill_cleaned {
         if (getq2(ArtisQuests_Enora) < 9)
         {
-            speech 5,
+            speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
                 l("Oh no, you still have @@ Fluffies to kill.", 10 - getq2(ArtisQuests_Enora));
 
             return;
         }
         else if (getq2(ArtisQuests_Enora) < 10)
         {
-            speech 5,
+            speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
                 l("Only one more Fluffy to kill and it's done!");
 
             return;
         }
 
-        speech 5,
+        speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
             l("I cannot find the words to express my gratitude for your hard work."),
             l("Keep the sword and the jacket, you deserved them!"),
             l("You now also have access to the Legion building. Good job, you earned it."),
@@ -339,7 +339,7 @@
     }
 
     function enora_paid_potions {
-        speech 5,
+        speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
             lg("Are you sure that these are my potions?");
 
         if (askyesno() == ASK_YES)
@@ -353,7 +353,7 @@
 
     if (getq(ArtisQuests_Enora) == 0)
     {
-        speech 4,
+        speech S_LAST_NEXT,
             l("Hey! You must be @@.", strcharinfo(0)),
             lg("Julia told me how they found you in the sea, on a raft with a logo of..."),
             l("...I mean log! Made of log!"),
@@ -362,7 +362,7 @@
     }
     else
     {
-        speech 4,
+        speech S_LAST_NEXT,
             l("Hey @@!", strcharinfo(0)),
             l("What brings you here today?");
     }
@@ -399,7 +399,7 @@
                 enora_hill_cleaned;
                 break;
             case 5:
-                speech 5,
+                speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
                     l("You killed @@ Fluffies.", getq2(ArtisQuests_Enora));
                 if (getq2(ArtisQuests_Enora) > 8)
                 {
@@ -425,7 +425,7 @@
                 enora_memories;
                 break;
             case 12:
-                speech 5,
+                speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
                     l("Please come back anytime!");
         }
     } while (@menu != 12);
diff --git a/npc/001-1/eugene.txt b/npc/001-1/eugene.txt
index 08dbefa4..442b950d 100644
--- a/npc/001-1/eugene.txt
+++ b/npc/001-1/eugene.txt
@@ -16,7 +16,7 @@
     .BaitID = SmallTentacles;
     .BaitCount = 10;
 
-    narrator 4,
+    narrator S_LAST_NEXT,
         l("You see a raijin boy, sitting on the edge of the dock."),
         l("He's holding a fishing rod, while gazing out at the sea.");
 
@@ -24,7 +24,7 @@
     if (.@q == 1) goto L_CheckItems;
     if (.@q == 2) goto L_QuestDone;
 
-    speech 2,
+    speech S_LAST_BLANK_LINE,
         l("Ahoi."),
         l("Hey, check out my brand new fishing rod. I bought it just today."),
         l("I was so excited, I wanted to try it as soon as possible."),
@@ -36,11 +36,11 @@
     {
         case 1:
             setq ArtisQuests_Fishman, 1;
-            speech 1,
+            speech S_FIRST_BLANK_LINE,
                 l("Thank you. I'll wait here.");
             close;
         case 2:
-            speech 1,
+            speech S_FIRST_BLANK_LINE,
                 l("But I'm almost out of @@...", getitemlink(.BaitID));
             close;
     }
diff --git a/npc/001-1/fexil.txt b/npc/001-1/fexil.txt
index ef9de7be..855dda0b 100644
--- a/npc/001-1/fexil.txt
+++ b/npc/001-1/fexil.txt
@@ -14,7 +14,7 @@
 001-1,47,134,0	script	Fexil#001-1	NPC_ELVEN_MAN_TRADER,{
 
     function fexil_quest {
-        speech 4,
+        speech S_LAST_NEXT,
             l("You know, the life of the merchant is hard. I really hope that Artis and the Merchant Guild will help me to succeed."),
             l("Maybe you too you could help me?"),
             l("I want to be the first merchant of this square to sell clothes made from @@s!", getitemlink(FluffyFur)),
@@ -25,11 +25,11 @@
         {
             case 1:
                 setq ArtisQuests_Fexil, 3;
-                speech 5,
+                speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
                     l("Awesome! I will wait for you here.");
                 break;
             case 2:
-                speech 5,
+                speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
                     l("Oh... Ok, I will be around here if you change your mind.");
                 break;
         }
@@ -49,7 +49,7 @@
     if (getq (ArtisQuests_Fexil) == 1)
     {
         select (l("I have your pass from the Merchant Guild."));
-        speech 5,
+        speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
             l("Oh! You saved me, I was too afraid to unpack my stuff without this pass."),
             l("Hey, I remember you, we were on the same boat, you are the castaway.");
 
@@ -57,12 +57,12 @@
                         l("You're confusing me with someone else.")))
         {
             case 1:
-                speech 5,
+                speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
                     l("Oh sure I remember you."),
                     l("The travel was fine for you? It was terrible for me, I was sea-sick.");
                 break;
             case 2:
-                speech 5,
+                speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
                     l("Ah, I didn't have much sleep, it's possible.");
                 break;
         }
@@ -95,7 +95,7 @@
             break;
 
         case 3:
-            speech 5,
+            speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
                 l("Awesome. How many of those do you want to give me?");
 
             do
@@ -103,13 +103,13 @@
                 input .@amount;
                 if (.@amount < 1)
                 {
-                    speech 5,
+                    speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
                         l("Please enter a valid amount.");
                     continue;
                 }
                 if (.@amount > countitem(FluffyFur))
                 {
-                    speech 5,
+                    speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
                         l("You don't have enough @@s on you.", getitemlink(FluffyFur));
                     continue;
                 }
@@ -118,7 +118,7 @@
             } while (1);
 
             .@price = 15 * .@amount;
-            speech 5,
+            speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
                 l("Deal, I offer you @@ E!", .@price);
 
             delitem FluffyFur, .@amount;
@@ -127,7 +127,7 @@
             break;
 
         case 4:
-            speech 5,
+            speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
                 l("Oh... Well, I just started to trade... Thus my technique may not be the best."),
                 lg("Anyway, if you ever feel interested, just check my bag!");
             break;
diff --git a/npc/001-1/manhole.txt b/npc/001-1/manhole.txt
index f0717e04..f2bae5f0 100644
--- a/npc/001-1/manhole.txt
+++ b/npc/001-1/manhole.txt
@@ -15,7 +15,7 @@
         end;
     }
 
-    narrator(6,
+    narrator(S_LAST_BLANK_LINE | S_LAST_NEXT,
         l("You hear some creeping and crawling sounds from the murkiness below."),
         l("..."),
         l("Do you want to enter in sewer?"));
@@ -38,7 +38,7 @@ OnInit:
         end;
     }
 
-    narrator(6,
+    narrator(S_LAST_BLANK_LINE | S_LAST_NEXT,
         l("You hear some creeping and crawling sounds from the murkiness below."),
         l("..."),
         l("Do you want to enter in sewer?"));
diff --git a/npc/001-1/panels.txt b/npc/001-1/panels.txt
index 46383e2f..a82fbabd 100644
--- a/npc/001-1/panels.txt
+++ b/npc/001-1/panels.txt
@@ -5,7 +5,7 @@
 //    Panels to give advice and some random information to players.
 
 001-1,180,25,0	script	#ArtisPanel1	NPC_NO_SPRITE,{
-    narrator 4,
+    narrator S_LAST_NEXT,
         l("You step on something, a panel half overgrown by moss, it has writing on it...");
 
     mesq l("Don't fall!");
@@ -22,7 +22,7 @@ OnInit:
 }
 
 001-1,95,51,0	script	#ArtisPanel2	NPC_NO_SPRITE,{
-    narrator 4,
+    narrator S_LAST_NEXT,
         l("You step on something, a shaky and fragile panel with barely visible inscriptions on it...");
 
     mesq l("Beware of falling stones from the cliff!");
@@ -39,12 +39,12 @@ OnInit:
 }
 
 001-1,103,66,0	script	#ArtisPanel3	NPC_NO_SPRITE,{
-    narrator 4,
+    narrator S_LAST_NEXT,
         l("You step on something, a panel with a bitten corner and clear inscriptions on it...");
 
     mesq l("Warning! Dangerous fish, do not fall into the lake!");
     next;
-    narrator 4,
+    narrator S_LAST_NEXT,
         l("Somebody tried to stroke the word \"fish\" and tried to replace it with \"sharkes\".");
 
     closedialog;
diff --git a/npc/001-1/qonan.txt b/npc/001-1/qonan.txt
index b237de07..f82bf78a 100644
--- a/npc/001-1/qonan.txt
+++ b/npc/001-1/qonan.txt
@@ -17,7 +17,7 @@
     if (.@q == 2) goto L_ItemFound;
     if (.@q == 3) goto L_QuestDone;
 
-    speech 2,
+    speech S_LAST_BLANK_LINE,
         l("We haven't met, right?"),
         l("My name is Q'Onan, I'm a member of Nard's crew."),
         l("I have a lot of work here, so I don't even have time to go to the town."),
@@ -26,13 +26,13 @@
     switch (select (l("Go on."), l("I don't have the time sorry.")))
     {
         case 2:
-        speech 5,
+        speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
             l("No problem, see you next time.");
         closedialog;
         close;
     }
 
-    speech 3,
+    speech S_FIRST_BLANK_LINE | S_LAST_BLANK_LINE,
         l("Before I joined Nard, I used to be a thief."),
         l("I'm not proud of it, but I had to steal money from others to keep on living."),
         l("Anyway, the last time I stole something I was almost caught."),
@@ -55,23 +55,23 @@
             getrandompoint(178,26,182,29);
             npcdebug "Chest buriad at (" + .move__rand_x + "," + .move__rand_y + ")";
             shovel_addquest("001-1", .move__rand_x, .move__rand_y, "QOnanFoundItem");
-            speech 3,
+            speech S_FIRST_BLANK_LINE | S_LAST_BLANK_LINE,
                 l("Alright, you will need this shovel."),
                 l("You should check on the highest part of the cliff, I was hiding there."),
                 l("I hope to see you soon.");
             getitem IronShovel, 1;
             close;
         case 2:
-            speech 3,
+            speech S_FIRST_BLANK_LINE | S_LAST_BLANK_LINE,
                 l("Come on, don't be a coward!"),
                 l("Anyway, let me know if you change your mind.");
             close;
     }
 
 L_QuestGiven:
-    speech 4, lg("I asked you to do me a favor, did you forget?");
+    speech S_LAST_NEXT, lg("I asked you to do me a favor, did you forget?");
     select l("What should I do, again?");
-    speech 1,
+    speech S_FIRST_BLANK_LINE,
         l("Please find the small chest, buried somewhere on Artis hill."),
         l("You should check on the highest part of the cliff, I was hiding there."),
         l("Bring it to me, and you will get your reward.");
@@ -103,7 +103,7 @@ OnInit:
 function	script	QOnanFoundItem	{
     setq ArtisQuests_QOnan, 2;
     // getitem SmallChest, 1;
-    narrator 1,
+    narrator S_FIRST_BLANK_LINE,
        l("You found a small chest, surprisingly heavy for it's size."),
        l("It's probably full of coins, but no matter how hard you try to open it, you can't."),
        l("Better take it back to Q'Onan.");
diff --git a/npc/001-1/qpid.txt b/npc/001-1/qpid.txt
index 91d48f27..6a81f78a 100644
--- a/npc/001-1/qpid.txt
+++ b/npc/001-1/qpid.txt
@@ -7,10 +7,10 @@
 001-1,65,116,0	script	Q'Pid#001-1	NPC_QPID,{
 
     function riddle_enigma {
-        speech 5,
+        speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
             l("Ok fine, you have up to 3 tries, here is the riddle:"),
             l("What is growing and shrinking at the same time?");
-        narrator 4,
+        narrator S_LAST_NEXT,
             l("You need to type the answer of this riddle in the NPC window."),
             l("The answer is a single word, without conjugation."),
             l("You can also answer in your native language or in English.");
@@ -22,14 +22,14 @@
 
             if (riddlevalidation (.@answer$, "life", l("life")))
             {
-                speech 5,
+                speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
                     l("Oh..."),
                     l("You seem more cultivated than you look.");
 
                 if (getq (ArtisQuests_Enora) == 7)
                 {
                     setq (ArtisQuests_Enora, 9);
-                    speech 12,
+                    speech S_LAST_NEXT | S_NO_NPC_NAME,
                         l("Fine, take these potions, I will replenish them in the next couple hours anyway.");
                 }
 
@@ -37,7 +37,7 @@
             }
             else if (.@i < 3)
             {
-                speech 5,
+                speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
                     l("Too bad, try again.");
             }
             else
@@ -45,7 +45,7 @@
                 if (getq (ArtisQuests_Enora) == 7)
                 {
                     setq (ArtisQuests_Enora, 8);
-                    speech 5,
+                    speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
                         l("You failed!"),
                         l("Ivan is the one you should look for now."),
                         l("He is in a small house between the dock's warehouse and the dojo."),
@@ -54,7 +54,7 @@
                 }
                 else
                 {
-                    speech 5,
+                    speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
                         l("You failed!");
                 }
 
@@ -66,7 +66,7 @@
     }
 
     function enora_quest {
-        speech 5,
+        speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
             l("She wants? What if I don't want?"),
             l("I'm not a pawn of the Legion, I don't have to obey you!"),
             l("Oh and guess what! I'm almost out of potions anyway.");
@@ -80,7 +80,7 @@
                 return;
         }
 
-        speech 5,
+        speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
             l("You don't seem to be from the Legion, let's do a game."),
             l("If you find the correct answer, I will give you these potions..."),
             l("But if you fail, you will have to get them from the alchemist."),
@@ -94,7 +94,7 @@
     }
 
     function alchemist_information {
-        speech 5,
+        speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
             l("Do? I don't do them."),
             l("I'm sure that you already knew the answer, didn't you?"),
             l("You tried to embarrass me, am I right?!"),
@@ -111,7 +111,7 @@
                 mesn;
                 break;
             case 2:
-                speech 5, l("You are honest, I like it.");
+                speech S_FIRST_BLANK_LINE | S_LAST_NEXT, l("You are honest, I like it.");
                 break;
         }
         mesq l("Is that all you had to say?");
@@ -120,7 +120,7 @@
         return;
     }
 
-    speech 4,
+    speech S_LAST_NEXT,
         l("What?");
 
     do
@@ -151,7 +151,7 @@
                 alchemist_information;
                 break;
             case 5:
-                speech 5,
+                speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
                     l("It's a poem, about poems... Why are you asking that?"),
                     l("Because I am a Kralog I can't read such things? That's rubbish."),
                     l("I borrowed it from the library, you should try to cultivate yourself more instead of insinuate things about people you don't know!");
diff --git a/npc/001-1/rumly.txt b/npc/001-1/rumly.txt
index 50f6136b..f6a9126a 100644
--- a/npc/001-1/rumly.txt
+++ b/npc/001-1/rumly.txt
@@ -20,7 +20,7 @@
     stopnpctimer;
     initnpctimer;
 
-    speech 4,
+    speech S_LAST_NEXT,
         l("Hey you, do you have any @@s?", getitemlink(Plushroom));
 
 L_Menu:
@@ -36,12 +36,12 @@ L_Menu:
     switch (@menu)
     {
         case 1:
-            speech 5,
+            speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
                 l("Wind and grass is nice and cool, so juicy sweet..."),
                 l("Our only wish to eat a plush, so juicy sweet...");
             goto L_Menu;
         case 2:
-            speech 5,
+            speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
                 lg("Why are you asking? And who are you too? I've never seen you around before..."),
                 lg("Wait, are you one of those from the Legion of Gasaron? I didn't do anything wrong, I promise!"),
                 l("I... I just like to eat the purple and delightful... And natural, and...");
@@ -51,12 +51,12 @@ L_Menu:
             {
                 case 1: break;
                 case 2:
-                    speech 5,
+                    speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
                         l("No! No, no, my precious plushrooms! Don’t take me to them, they wants my precious.");
                     goto L_Quit;
             }
 
-            speech 5,
+            speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
                 l("I won't forget it, I swear on my precious plushrooms!"),
                 l("There is an unknown side effect to these plushrooms, they can free you from your past mistakes."),
                 l("You can use it to clear your stats, to start freshly if you see what I mean..."),
@@ -77,7 +77,7 @@ L_Menu:
                         setq General_Rumly, 2;
                     }
 
-                    speech 5,
+                    speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
                         l("Great! Can't wait for some tasty mushrooms!");
 
                     goto L_Menu;
@@ -98,17 +98,17 @@ L_Menu:
 
             if (.@rand)
             {
-                speech 5,
+                speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
                     l("See you! And come back with the plushrooms!");
             }
             else
             {
-                speech 5,
+                speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
                     l("Oh noes!"),
                     l("A rabbit!"),
                     l("He has a guns!"),
                     l("*Bang bang*");
-                narrator 4,
+                narrator S_LAST_NEXT,
                     l("Rumly is hiding behind the tree.");
             }
 
@@ -118,7 +118,7 @@ L_Menu:
 L_ResetStats:
     if (.@visited == 1)
     {
-        speech 5,
+        speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
             lg("Changed your mind, uh?"),
             l("Very good."),
             l("Status point reset can't be undone. Do you really want this?"),
@@ -126,7 +126,7 @@ L_ResetStats:
     }
     else
     {
-        speech 5,
+        speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
             lg("Are you sure about this?");
     }
 
@@ -136,7 +136,7 @@ L_ConfirmReset:
                    lg("I won't need it, thank you.")))
     {
         case 1:
-            speech 5,
+            speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
                 l("Let me just have a quick look at you. Hm... I will need @@ @@s to reset your stats.", .@plush_count, getitemlink(Plushroom));
 
             select
@@ -152,7 +152,7 @@ L_ConfirmReset:
 
             delitem Plushroom, .@plush_count;
 
-            speech 5,
+            speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
                 l("Thank you."),
                 l("Now stand still... It should not take much time...");
 
@@ -164,14 +164,14 @@ L_ConfirmReset:
             }
             if (StatusPoint == .@wasSP)
             {
-                speech 4,
+                speech S_LAST_NEXT,
                     l("It seems that you have no status points to reset!"),
                     lg("But the plushroom you brought was really awesome you know."),
                     lg("Come back when you will really need me. And bring more plushrooms with you!");
             }
             else
             {
-                speech 4,
+                speech S_LAST_NEXT,
                     l("Let's see... @@ of your status points have just been reset!", StatusPoint - .@wasSP),
                     l("Spend it wisely this time."),
                     lg("But you are welcome to reset your stats again if you bring me some more plushrooms!");
@@ -189,7 +189,7 @@ L_Later:
     {
         setq General_Rumly, 2;
     }
-    speech 5,
+    speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
         l("Come back soon, and bring @@s!", getitemlink(Plushroom));
 
     goto L_Quit;
@@ -200,7 +200,7 @@ L_Never:
         setq General_Rumly, 1;
     }
 
-    speech 5,
+    speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
         lg("I am sure that you will change your mind.");
 
     goto L_Quit;
diff --git a/npc/001-1/salem.txt b/npc/001-1/salem.txt
index 3d6fd9c8..eee2a161 100644
--- a/npc/001-1/salem.txt
+++ b/npc/001-1/salem.txt
@@ -69,7 +69,7 @@
     {
         if (.PiouCaught)
         {
-        speech 0,
+        speech
             l("Look who is back..."),
             l("And with my piou. That's wonderful. I can only imagine how hard that little bugger was to catch!"),
             l("Great, and as I promised, I give you a 90% discount on the @@ of your choice.", getitemlink (PiouEgg));
@@ -87,13 +87,13 @@
             if (.@BoughtPiou == 0)
                 ArtisQuests_PiouDiscount = 0;
             else if (.@BoughtPiou == 4)
-                speech 1, l("See you next time!");
+                speech S_FIRST_BLANK_LINE, l("See you next time!");
 
             close;
         }
         else
         {
-            speech 0,
+            speech
                 l("Look who is back..."),
                 l("So, where is my piou? You should not keep an old man waiting. Go and catch it like you said you would.");
                 next;
@@ -101,7 +101,7 @@
         }
     }
 
-    speech 4,
+    speech S_LAST_NEXT,
         l("Good day, my friend, come closer, come closer!");
         l("Just look at my goods for sale! Fresh fruits and vegetables were shipped only this morning. And for reasonable price, of course.");
 
@@ -127,7 +127,7 @@ L_SalemMenuShop:
         case 3:
             if (.@q == 2 && ArtisQuests_PiouDiscount)
             {
-                speech 5,
+                speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
                     l("You still have a 90% discount on one piou.");
                 @ArtisQuests_PiouPrice = 3000;
             }
@@ -135,7 +135,7 @@ L_SalemMenuShop:
                 ArtisQuests_PiouDiscount = 0;
             break;
         case 4:
-            speech 5,
+            speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
                 l("I think that I've seen this weakling wandering around the beach south from here this morning.");
             break;
     }
@@ -145,7 +145,7 @@ L_SalemMenuShop:
     close;
 
 L_AboutPious:
-    speech 5,
+    speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
         l("Ah, the locals like keeping them as pets.");
         l("With proper training, a piou can become a good friend and faithful companion in your adventures.");
 
diff --git a/npc/001-2-0/resa.txt b/npc/001-2-0/resa.txt
index a15c71d3..4cb66bdf 100644
--- a/npc/001-2-0/resa.txt
+++ b/npc/001-2-0/resa.txt
@@ -17,7 +17,7 @@
 001-2-0,37,28,0	script	Resa	NPC_ELVEN_FEMALE_ARMOR_SHOP,{
 
     function explain_craft {
-        speech 5,
+        speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
             l("Did you see Don the blacksmith? He might know how you could improve your metal equipment."),
             l("Nevertheless, you can craft some cards that you can then attach to your equipment."),
             l("We sell a brimmed hat, you can craft a feather card and attach it to this hat to obtain an enhanced version of it!");
@@ -26,19 +26,19 @@
     }
 
     function enora_quest {
-        speech 5,
+        speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
             l("I thought that she would never come to pick it up!"),
             l("Here it is, a fashionable @@.", getitemlink (ArtisTankTop, CamelCottonDye)),
             l("I asked Calypsan to dye this tank top, now it has an unique look!");
 
-        narrator 4, l("You pick up the package.");
+        narrator S_LAST_NEXT, l("You pick up the package.");
 
         setq ArtisQuests_Enora, 6;
 
         return;
     }
 
-    speech 4,
+    speech S_LAST_NEXT,
         l("Welcome to my office."),
         l("What would you like today?");
 
diff --git a/npc/001-2-11/mona.txt b/npc/001-2-11/mona.txt
index 526c4d3f..05a4ddb8 100644
--- a/npc/001-2-11/mona.txt
+++ b/npc/001-2-11/mona.txt
@@ -13,7 +13,7 @@
 
     function find_daddy_quest
     {
-        speech 4,
+        speech S_LAST_NEXT,
             l("Hey you!");
 
         switch (select(l("Yes?"), l("Sorry, I have to go.")))
@@ -22,19 +22,19 @@
                 mes "";
                 break;
             case 2:
-                speech 5,
+                speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
                     l("No you don't have to go. I need your help, so you have to stay.");
                 break;
         }
 
-        speech 12,
+        speech S_LAST_NEXT | S_NO_NPC_NAME,
             l("Daddy did not come back home... He said that he would be back for lunch but it has already been a week!"),
             l("You have to find him, or else I will tell him that you did not help me.");
 
         switch (select(l("You do not give me much options."), l("The elder ran away from you.")))
         {
             case 1:
-                speech 5,
+                speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
                     l("He said that he would check why the manhole next to the house was doing weird sounds."),
                     l("But he never returned."),
                     l("Please find my daddy...");
@@ -42,7 +42,7 @@
                 setq ArtisQuests_MonaDad, 1;
                 break;
             case 2:
-                speech 1,
+                speech S_FIRST_BLANK_LINE,
                     l("I will tell my dad!");
                 break;
         }
diff --git a/npc/001-2-12/oscar.txt b/npc/001-2-12/oscar.txt
index 20c6d288..3beecf36 100644
--- a/npc/001-2-12/oscar.txt
+++ b/npc/001-2-12/oscar.txt
@@ -8,7 +8,7 @@
 
     function live_here_alone
     {
-        speech 5,
+        speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
             l("Meh!"),
             l("This is a harsh word to use, you are never alone in the beautiful place of Artis."),
             l("Mob is doing its daily noise, nature is singing its sumptuous melody, none is alone.");
@@ -68,39 +68,39 @@
     {
         .@item_index = -1;
 
-        speech 1,
+        speech S_FIRST_BLANK_LINE,
             l("What item would you like to bleach?");
 
-        narrator 5,
+        narrator S_FIRST_BLANK_LINE | S_LAST_NEXT,
             l("You can drag and drop an item to the NPC window or select an item through your inventory.");
 
         .@item_index = requestitemindex();
         if (!item_is_bleachable(.@item_index))
         {
-            speech 4,
+            speech S_LAST_NEXT,
                 l("You should know this, an item like this can't be bleached.");
 
             return;
         }
 
-        speech 4,
+        speech S_LAST_NEXT,
             l("Your mind is set? You will loose the color dye during this process.");
 
         switch (askyesno())
         {
             case 1:
-                speech 5,
+                speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
                     l("Ok, let me see..."),
                     l("...");
 
                 failedremovecardsindex .@item_index, 1;
 
-                speech 12,
+                speech S_LAST_NEXT | S_NO_NPC_NAME,
                     l("..."),
                     l("Here it is, clean like a whistle!");
                 break;
             case 2:
-                speech 5,
+                speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
                     l("Is it truly a hard choice to make?");
                 break;
         }
@@ -109,7 +109,7 @@
     }
 
     .@hour = gettime(GETTIME_HOUR);
-    speech 4, (.@hour > 6 && .@hour < 18) ? l("Good day to you.") : lg("Good night milady.", "Good evening sir.");
+    speech S_LAST_NEXT, (.@hour > 6 && .@hour < 18) ? l("Good day to you.") : lg("Good night milady.", "Good evening sir.");
 
     do
     {
@@ -127,7 +127,7 @@
                 live_here_alone();
                 break;
             case 3:
-                speech 5, l("I wish you a good time in town.");
+                speech S_FIRST_BLANK_LINE | S_LAST_NEXT, l("I wish you a good time in town.");
                 break;
         }
 
diff --git a/npc/001-2-19/lloyd.txt b/npc/001-2-19/lloyd.txt
index 67e3fbc0..6ba69ff2 100644
--- a/npc/001-2-19/lloyd.txt
+++ b/npc/001-2-19/lloyd.txt
@@ -21,7 +21,7 @@
 001-2-19,31,25,0	script	Lloyd the Banker	NPC_LLOYD,{
 
     function enora_quest {
-        speech 5,
+        speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
             l("Black iron... That is a very specific request that you have for me!"),
             l("Let me check in my inventory book..."),
             l("..."),
@@ -33,13 +33,13 @@
                         l("Chelios asked me to get it.")))
         {
             case 1:
-                speech 1,
+                speech S_FIRST_BLANK_LINE,
                     l("This is your first time asking for something, you won't pay this time, take it as a sign of good faith!"),
                     l("If you need something in the future, do not hesitate to pass by here, our stock is full of boxes collecting dust.");
                 emotion E_WINK;
                 break;
             case 2:
-                speech 1,
+                speech S_FIRST_BLANK_LINE,
                     l("Chelios... He is part of the Blacksmith House, is he not?"),
                     l("Since Don settled in Artis he and his band refused to register to the Merchant Guild."),
                     l("I will close an eye for once, but only because it's your first time asking for something!"),
@@ -53,13 +53,13 @@
     }
 
     function explain_guild {
-        speech 4,
+        speech S_LAST_NEXT,
             l("The guild is in charge of the commerce regularization throughout Artis and its surroundings."),
             l("With the help of the town hall and the Legion of Aemil we organize some auction and we help local merchants to launch their businesses."),
             l("We also feature some services like a storage and a bank for members."),
             l("Registration is open to everybody, but newcomers need to pay a fee for all of the paperwork.");
 
-        narrator 1,
+        narrator S_FIRST_BLANK_LINE,
             l("The bank and item storage is shared between all characters within a same account."),
             l("With it, you can safely move items and funds between your characters."),
             l("To move between characters that are on different accounts, you have to use the Trade function.");
@@ -67,41 +67,41 @@
     }
 
     function first_visit {
-        speech 4,
+        speech S_LAST_NEXT,
             l("Welcome!"),
             l("My name is Lloyd, I am a representative of the Merchant Guild of Artis.");
 
         selectd (l("My name is @@...", strcharinfo(0)));
 
-        speech 5,
+        speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
             l("\"@@\", I like this name!", strcharinfo(0)),
             l("Oh, wait a second...");
-        narrator 4,
+        narrator S_LAST_NEXT,
             l("Lloyd is searching something in his book.");
-        speech 4,
+        speech S_LAST_NEXT,
             l("I see."),
             lg("You are new around here, right?");
 
         if (selectd (l("How do you know?"), l("Yes I am.")) == 1)
         {
-            speech 5,
+            speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
                 l("Oh, it is simple. I have on this book the names of every citizen of Artis and its surroundings."),
                 l("And I have no mention of a so called \"@@\" on it!", strcharinfo(0));
         }
         else
         {
-            speech 5,
+            speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
                 l("I knew it!");
         }
 
-        speech 4,
+        speech S_LAST_NEXT,
             l("Let me explain to you what the Merchant Guild is for.");
 
         explain_guild;
         next;
 
         .@price = 500;
-        speech 4,
+        speech S_LAST_NEXT,
             l("The fee is of @@ E. So, do you want to register?", .@price);
 
         switch (selectd (l("Yes."),
@@ -110,14 +110,14 @@
             case 1:
                 if (Zeny < .@price)
                 {
-                    speech 5,
+                    speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
                         l("You do not seem to have enough money, come back later!");
                 }
                 else
                 {
                     Zeny = Zeny - .@price;
                     setq ArtisQuests_Lloyd, 1;
-                    speech 5,
+                    speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
                         l("Perfect!"),
                         l("I wrote your name on the book, you are now free to use the storage and bank services.");
                 }
@@ -130,7 +130,7 @@
     }
 
     function paper_to_deliver {
-        speech 5,
+        speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
             l("Now that you bring up that topic, that reminds me of something..."),
             l("Earlier today there was this young seller named Fexil that passed by here."),
             l("He asked to lend some money and a place to open his store, I think that he asked for a place on the merchant squares on the south-west of the city..."),
@@ -146,17 +146,17 @@
             switch (.@q)
             {
                 case 1:
-                    speech 5,
+                    speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
                         l("Thank you for this!");
                     setq ArtisQuests_Fexil, 1;
                     break;
                 case 2:
-                    speech 5,
+                    speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
                         l("You should look for a seller named Fexil around the merchant square."),
                         l("Ask other merchants, they might know where he is.");
                     break;
                 case 3:
-                    speech 5,
+                    speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
                         l("No problem, come back later if you changed your mind!");
                     break;
             }
@@ -172,7 +172,7 @@
         close;
     }
 
-    speech 4,
+    speech S_LAST_NEXT,
         l("Welcome to the Merchant Guild of Artis!"),
         l("What do you want today?");
 
@@ -208,7 +208,7 @@
             case 5:
                 if (getq(ArtisQuests_Fexil) >= 1)
                 {
-                    speech 5,
+                    speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
                         l("There are no tasks for you right now.");
                     continue;
                 }
@@ -219,7 +219,7 @@
         }
         if (@menu != 6)
         {
-            speech 13,
+            speech S_FIRST_BLANK_LINE | S_LAST_NEXT | S_NO_NPC_NAME,
                 l("Something else?");
         }
     } while (@menu != 6);
diff --git a/npc/001-2-21/julia.txt b/npc/001-2-21/julia.txt
index 24cf89f2..6ebd7438 100644
--- a/npc/001-2-21/julia.txt
+++ b/npc/001-2-21/julia.txt
@@ -116,7 +116,7 @@ L_BasicSkill:
     goto L_YNMenu;
 
 L_Enora:
-    speech 5,
+    speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
         l("Enora, from the Legion of Aemil, has been warned that you were aboard."),
         l("She is waiting for you on the dock."),
         l("Do you have any other questions for me?");
@@ -127,7 +127,7 @@ L_Quit:
     goodbye;
 
 L_Island:
-    speech 5,
+    speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
         l("Of course, as a fully-fledged crew member you can decide of the destination of La Johanne directly with Nard.");
         l("Do you have any other questions for me?");
     emotion E_HAPPY;
diff --git a/npc/001-2-21/note.txt b/npc/001-2-21/note.txt
index 91b7cdf7..cd1764ed 100644
--- a/npc/001-2-21/note.txt
+++ b/npc/001-2-21/note.txt
@@ -8,12 +8,12 @@
 //    A small note presenting the 6 main rules of Evol Online.
 
 001-2-21,29,25,0	script	Note#Artis	NPC_PAPER_NOTE,{
-    narrator 4,
+    narrator S_LAST_NEXT,
             l("There is a paper with some rules written on it.");
 
     GameRules 8 | 4;
 
-    narrator 8,
+    narrator S_NO_NPC_NAME,
         l("Following these lines are some other writings on this paper."),
         l("Do not give the password of your room to anybody! Keep it secret and try not to use the same one in any other room in the future. - Julia"),
         l("Does anyone know a good place to hang out in Esperia? - M. Arpan"),
diff --git a/npc/001-2-22/alige.txt b/npc/001-2-22/alige.txt
index 1599ec38..c381516d 100644
--- a/npc/001-2-22/alige.txt
+++ b/npc/001-2-22/alige.txt
@@ -231,7 +231,7 @@ L_NoReward:
 
 L_Drunk:
     setcamnpc;
-    speech 5,
+    speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
         l("I asked for food but... *hips* Ah, that'll do nicely!");
     restorecam;
 
diff --git a/npc/001-2-24/nard.txt b/npc/001-2-24/nard.txt
index 422eca36..6c845838 100644
--- a/npc/001-2-24/nard.txt
+++ b/npc/001-2-24/nard.txt
@@ -41,7 +41,7 @@
         l("How long will you stay here?"), -,
         rif(.@q > 0, lg("I'm lost, where should I go?")), L_Lost;
 
-    speech 5,
+    speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
         l("We just returned from a long journey and Artis is a good city to rest and to conclude our exchange."),
         l("I think that we will stay in port for a great time."),
         l("Although, if you want to visit a place nearby, we could take you there."),
@@ -51,7 +51,7 @@
                    l("Nowhere, I'm fine here.")))
     {
         case 1:
-            speech 5,
+            speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
                 l("Let's set sail then!");
 
             savepoint "000-2-1", 50, 38;
@@ -67,7 +67,7 @@
             closedialog;
             close;
         case 2:
-            speech 5,
+            speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
                 l("Ok we stay docked here if you need our help.");
 
             closedialog;
diff --git a/npc/001-2-26/ivan.txt b/npc/001-2-26/ivan.txt
index 1f1dcc85..6028f01a 100644
--- a/npc/001-2-26/ivan.txt
+++ b/npc/001-2-26/ivan.txt
@@ -7,7 +7,7 @@
 001-2-26,28,30,0	script	Ivan	NPC_IVAN,{
 
     function ivan_description {
-        speech 5,
+        speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
             l("I am an alchemist, I bear the name of Ivan."),
             l("I work under the protection and the supervision of the Legion of Aemil."),
             l("Alchemical studies are prohibited in every city of the Archipelagos, do not dare to practice it in a public zone!");
@@ -16,17 +16,17 @@
     }
 
     function enora_quest {
-        speech 5, l("How many? What kind? I can produce two dozen boxes per day.");
+        speech S_FIRST_BLANK_LINE | S_LAST_NEXT, l("How many? What kind? I can produce two dozen boxes per day.");
 
         select (l("5 Piberries Infusions"));
 
-        speech 5,
+        speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
             l("5 boxes... Alright, @@ are my speciality!", getitemlink (PiberriesInfusion)),
             l("I can prepare them in an hour or so!");
 
         select (l("You missunderstood, it's 5 potions."));
 
-        speech 5,
+        speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
             l("Why would the Legion request my help for only 5 potions?"),
             l("Is this some kind of joke?!");
 
@@ -36,12 +36,12 @@
             case 1:
                 break;
             case 2:
-                narrator 1, l("Ivan grumbles and resumes his work.");
+                narrator S_FIRST_BLANK_LINE, l("Ivan grumbles and resumes his work.");
                 emotion E_UPSET;
                 close;
         }
 
-        speech 5,
+        speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
             l("Oh... You should have started with this!"),
             l("I have some spare one, take them, and tell Enora that any fees are paid!");
 
@@ -57,7 +57,7 @@
         npctalk3 l("I'm busy, leave me alone.");
     }
 
-    speech 4, l("Yes what do you need?");
+    speech S_LAST_NEXT, l("Yes what do you need?");
 
     select
         rif(.@enora == 8, l("The Legion needs some potions.")),
diff --git a/npc/001-2-27/don.txt b/npc/001-2-27/don.txt
index 144879b3..a87bc86c 100644
--- a/npc/001-2-27/don.txt
+++ b/npc/001-2-27/don.txt
@@ -7,7 +7,7 @@
 001-2-27,35,29,0	script	Don#001-2-27	NPC_HUMAN_MALE_OLD,{
 
     function improve_equipment {
-        speech 5,
+        speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
             l("Different ways, each part of your equipment can be generally upgraded."),
             l("You have a level for each of your gear, by default when you buy or craft a piece, the level is set to 1."),
             l("You can also improve your equipment in a totally different way with the use of cards.");
@@ -15,7 +15,7 @@
     }
 
     function card_explanation {
-        speech 5,
+        speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
             l("There are two different kinds of cards, the first changes the style of your clothes, the second changes their stats."),
             l("I am not an expert of the first kind, but I know what I am talking about when it comes to improving equipment."),
             l("A stat card works on different pieces of equipment."),
@@ -27,13 +27,13 @@
     }
 
     function take_apprentice {
-        speech 5,
+        speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
             l("I do not.");
         emotion E_UPSET;
 
         select (l("What about Chelios?"));
 
-        speech 5,
+        speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
             l("Chelios was stubborn in his youth, he never stopped annoying me with his questions while I was working at the forge."),
             l("He did not change while growing up, I repeatedly asked him to leave the forge but in the end he installed himself in front of it..."),
             l("He is mature and he rarely ask questions so I am fine. I can not stand the sight of a whiner anyway.");
@@ -41,7 +41,7 @@
     }
 
     function good_blacksmith {
-        speech 5,
+        speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
             l("I do not like to brag about it but you won't find a better blacksmith on the whole island."),
             l("If you need somebody to craft a weapon or a plate from diagrams I am the one that you need.");
 
@@ -49,7 +49,7 @@
                         l("Ok.")))
         {
             case 1:
-                speech 5,
+                speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
                     l("You can try, but your chance of success is lesser than a well trained smith and master craftsman.");
                 break;
             case 2:
@@ -59,7 +59,7 @@
         return;
     }
 
-    speech 4,
+    speech S_LAST_NEXT,
         lg("Hi, what do you want kiddo?");
 
     do
diff --git a/npc/001-2-27/kaylo.txt b/npc/001-2-27/kaylo.txt
index 7f283394..d1ee5205 100644
--- a/npc/001-2-27/kaylo.txt
+++ b/npc/001-2-27/kaylo.txt
@@ -5,7 +5,7 @@
 //    Kaylo is the Shield seller in Don's Blacksmith house on Artis.
 
 001-2-27,27,28,0	script	Kaylo#001-2-27	NPC_KAYLO,{
-    speech 4,
+    speech S_LAST_NEXT,
         lg("Hi customer! What do you want today?");
 
     switch (select (
@@ -19,13 +19,13 @@
             shop "Store#Shield001-2-27";
             close;
         case 2:
-            speech 5,
+            speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
                 l("I used a card to improve my clothes."),
                 l("There are two different kinds of cards, the first changes the style of your clothes, the second changes their stats."),
                 l("You should discuss with Don and Calypsan if you want to learn more about it, they are masters on this area!");
             break;
         case 3:
-            speech 5,
+            speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
                 l("You are in the Blacksmith's house, by Jove!"),
                 l("Don is a renowned blacksmith throughout Andorra, it's crazy that you never heard of him.");
             break;
diff --git a/npc/001-2-27/lydon.txt b/npc/001-2-27/lydon.txt
index f7f84ee8..1245a105 100644
--- a/npc/001-2-27/lydon.txt
+++ b/npc/001-2-27/lydon.txt
@@ -5,7 +5,7 @@
 //    Lydon is the Weapon seller in Don's Blacksmith house on Artis.
 
 001-2-27,43,28,0	script	Lydon#001-2-27	NPC_LYDON,{
-    speech 4,
+    speech S_LAST_NEXT,
         lg("Hi customer! What do you want today?");
 
     switch (select (
@@ -18,7 +18,7 @@
             shop "Store#Weapon001-2-27";
             close;
         case 2:
-            speech 5,
+            speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
                 l("Chef? He is Don's apprentice, he works on his hammering skill day and night."),
                 l("He is very lucky that Don took him under his wing, but being the student of such a teacher is not easy every day!");
             break;
diff --git a/npc/001-2-28/jenna.txt b/npc/001-2-28/jenna.txt
index e052b521..4beb0604 100644
--- a/npc/001-2-28/jenna.txt
+++ b/npc/001-2-28/jenna.txt
@@ -23,7 +23,7 @@
         }
     }
 
-    speech 4, l("Do you want a drink?");
+    speech S_LAST_NEXT, l("Do you want a drink?");
 
     closedialog;
     shop "#Invisible001-2-28";
diff --git a/npc/001-2-28/note.txt b/npc/001-2-28/note.txt
index d7251a0e..c57a3f21 100644
--- a/npc/001-2-28/note.txt
+++ b/npc/001-2-28/note.txt
@@ -8,12 +8,12 @@
 //    A small note presenting the 7 main rules of Evol Online.
 
 001-2-28,36,28,0	script	Note#001-2-28	NPC_PAPER_NOTE,{
-    narrator 4,
+    narrator S_LAST_NEXT,
             l("There is a paper with some rules written on it.");
 
     GameRules 8 | 4;
 
-    narrator 8,
+    narrator S_NO_NPC_NAME,
         l("Following these lines are some other writings on this paper."),
         l("Do not give the password of your room to anybody! Keep it secret and try not to use the same one in any other room in the future. - Jenna");
 
diff --git a/npc/001-2-28/plush.txt b/npc/001-2-28/plush.txt
index bcf73e5a..1a9968e2 100644
--- a/npc/001-2-28/plush.txt
+++ b/npc/001-2-28/plush.txt
@@ -9,7 +9,7 @@
 001-2-28,28,28,0	script	Plush#001-2-28	NPC_RED,{
 
     function narrator_explication {
-        narrator 4,
+        narrator S_LAST_NEXT,
             l("You will respawn at this place if defeated in combat."),
             l("All you have to do is to select a bed in the upper level anytime after your reservation."),
             l("Unlike other respawn points, an inn can fully restore your HP."),
@@ -22,7 +22,7 @@
         .@price = getarg (0);
         if (Zeny < .@price)
         {
-            speech 5, l("You don't have enough money, bring @@ E.", .@price);
+            speech S_FIRST_BLANK_LINE | S_LAST_NEXT, l("You don't have enough money, bring @@ E.", .@price);
         }
         else
         {
@@ -31,7 +31,7 @@
             INN_REGISTER = REDPLUSH_INN;
             PC_IS_DEAD = false;
 
-            speech 5,
+            speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
                 lg("I registered you on the 4th room of the upper level.",
                    "I registered you on the 2nd room of the upper level."),
                 l("You can go upstairs and choose a different room if you want.");
@@ -42,7 +42,7 @@
     function register_room {
         .@price = lognbaselvl(100, 10);
 
-        speech 5,
+        speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
             l("That will be @@ E to set your respawn point", .@price),
             l("This will remain your respawn point until set elsewhere."),
             l("Is that okay?");
@@ -53,7 +53,7 @@
         }
         else
         {
-            speech 5,
+            speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
                 l("Come back later if you changed your mind!");
         }
 
@@ -67,13 +67,13 @@
         }
         else if (INN_REGISTER == REDPLUSH_INN)
         {
-            speech 5,
+            speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
                 lg("You are already registered here."),
                 l("Go on the upper level if you want to change your room or to use it.");
         }
         else
         {
-            speech 5,
+            speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
                 lg("If you are registered somewhere else you will loose that reservation."),
                 l("Do you still want to lodge here?");
 
@@ -85,7 +85,7 @@
         return;
     }
 
-    speech 4,
+    speech S_LAST_NEXT,
         l("Welcome to the Red Plush inn!"),
         l("What do you need?");
 
@@ -104,14 +104,14 @@
                 break;
             case 2:
                 emotion E_WINK;
-                speech 5,
+                speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
                     l("We offer a room for travelers passing by Artis, our beds are comfy and you can be guaranteed to be right as rain after a night here!"),
                     l("If you wake up at the inn after a harsh battle, you will find yourself revitalized in an instant unlike other places where you can rest.");
 
                 narrator_explication;
                 break;
             case 3:
-                speech 5,
+                speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
                     l("That poor one is doing his best to fly... But his last meal and the gravity is not helping him so far!");
                 break;
             case 4:
diff --git a/npc/001-2-33/lozerk.txt b/npc/001-2-33/lozerk.txt
index 50760cf8..648d0200 100644
--- a/npc/001-2-33/lozerk.txt
+++ b/npc/001-2-33/lozerk.txt
@@ -20,13 +20,13 @@
     // Quest-related functions
  
     function send_training {
-        speech 5,
+        speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
             lg("Oh, you were sent by Enora!"),
             l("If Enora thinks this is the right place for you, then she's probably be right. Did you know she's a lieutenant of the Legion?"),
             l("The rank of lieutenant is granted only to people with proper control of their skill and good judgment, like Enora. Or me, of course."),
             l("By the way, I'm Lozerk. Lieutenant Lozerk.");
         select(l("Pleasure to meet you. I am @@.", strcharinfo(PC_NAME)));
-        speech 5,         
+        speech S_FIRST_BLANK_LINE | S_LAST_NEXT,         
             lg("Oh, you are that person! You were stranded in the seas for a while, right? You look like it."),
             l("But don't you worry! I don't know how to get you back your memories, but we can work on your muscles for now!"),
             lg("After all, this is the Legion of Aemil! You want to be a great warrior? We'll make you one here!"),
@@ -42,7 +42,7 @@
     }
 
     function send_battle {
-        speech 5,
+        speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
             lg("So, did you get your blood boiling? Give the dummies a good lesson? Good!"),
             l("But since it's not dummies that will go after you out there, this training won't be enough."),
             lg("If you want to make a formidable foe for anyone, you'll need to train with real living opponents!"),
@@ -56,7 +56,7 @@
     }
 
     function send_qanon {
-        speech 5,
+        speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
             lg("And you won! That means you should be able to handle yourself in battle from now on."),
             lg("If you keep it up, you'll eventually become a fearsome warrior, just like me!"),
             l("Or almost like me, at the very least."),
@@ -74,7 +74,7 @@
     // Normal functions
  
     function tell_about_legion {
-        speech 5,
+        speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
             l("The Legion of Aemil is the greatest organization on all continent! A town cannot be safer than when it's under our protection."),
             l("This is where the bravest of warriors come together to put their skills to a good use, for a good cause."),
             l("Our building here is also the finest place in the town. Just go and see for yourself!");
@@ -83,7 +83,7 @@
     }
     
     function praise_sword {
-        speech 5,
+        speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
             l("Thanks!");
  
         return;
@@ -91,7 +91,7 @@
  
     // Conversation
  
-    speech 4,
+    speech S_LAST_NEXT,
         l("Welcome to the Legion of Aemil's building in Artis!");
 
     do{
diff --git a/npc/001-2-36/training_room_npc.txt b/npc/001-2-36/training_room_npc.txt
index d7f9e443..022b5d2e 100644
--- a/npc/001-2-36/training_room_npc.txt
+++ b/npc/001-2-36/training_room_npc.txt
@@ -63,7 +63,7 @@ start:
     getmapxy(.@map$, .@x, .@y, 0);
     if (.@x < 24 || .@x > 32 || .@y < 33 || .@y > 43)
     {
-        speech 1, l("Please enter the combat zone on the left.");
+        speech S_FIRST_BLANK_LINE, l("Please enter the combat zone on the left.");
         close;
     }
 
diff --git a/npc/001-2-4/books.txt b/npc/001-2-4/books.txt
index 39113fad..e0932405 100644
--- a/npc/001-2-4/books.txt
+++ b/npc/001-2-4/books.txt
@@ -22,7 +22,7 @@ OnInit:
 
         setnpcdialogtitle l(.book_name$);
 
-        narrator 1 | 4,
+        narrator S_FIRST_BLANK_LINE | S_LAST_NEXT,
             l("To get started with fishing, you'll need two things: a fishing rod and a bait."),
             l("You just need one fishing rod, although you should take more than one single bait.");
 
@@ -30,7 +30,7 @@ OnInit:
 
         do
         {
-            narrator 8,
+            narrator S_NO_NPC_NAME,
                 l("Please select a chapter:");
 
             mes "";
@@ -45,12 +45,12 @@ OnInit:
             switch(@menu)
             {
                 case 1:
-                    narrator 1 | 4,
+                    narrator S_FIRST_BLANK_LINE | S_LAST_NEXT,
                         l("You'll want your fishing rod to be flexible but solid."),
                         l("Comfortable grip is important especially for newcomers, since they'll be holding it for quite a while.");
                     break;
                 case 2:
-                    narrator 1 | 4,
+                    narrator S_FIRST_BLANK_LINE | S_LAST_NEXT,
                         l("You can use many diverse items to lure fishes."),
                         l("Some people prefer to catch fish using magic, but calling that \"fishing\" would be an insult to this traditional sport."),
                         l("Most common and widely popular in the fish realm are @@ and pieces of @@.",
@@ -61,20 +61,20 @@ OnInit:
                             getitemlink(UrchinMeat), getitemlink(TortugaTongue));
                     break;
                 case 3:
-                    narrator 1 | 4,
+                    narrator S_FIRST_BLANK_LINE | S_LAST_NEXT,
                         l("Find yourself a nice dry spot on a coast where you can easily reach into deep water."),
                         l("Fishing next to shallow water is not going to work well, because fishes seldom go there."),
                         l("You can easily identify fishing spots, small bubbles and fishes are visible from the surface."),
                         l("Don't forget to come as close as possible to these spots!");
                     break;
                 case 4:
-                    narrator 1 | 4,
+                    narrator S_FIRST_BLANK_LINE | S_LAST_NEXT,
                         l("Toss the hook into deep water by clicking on where you want to cast it."),
                         l("Make sure to put on a bait after you click, though!"),
                         l("After that, stay still and be patient, but also alert!");
                     break;
                 case 5:
-                    narrator 1 | 4,
+                    narrator S_FIRST_BLANK_LINE | S_LAST_NEXT,
                         l("To successfully catch a fish, you need to pull up your hook by clicking it, right after it submerges."),
                         l("Should you be too quick or wait too long, you will most likely fail.");
                     break;
diff --git a/npc/001-2-4/robin.txt b/npc/001-2-4/robin.txt
index ede5a705..320cf148 100644
--- a/npc/001-2-4/robin.txt
+++ b/npc/001-2-4/robin.txt
@@ -8,7 +8,7 @@
 
     function need_help
     {
-        speech 4,
+        speech S_LAST_NEXT,
             l("Do you need help with something?");
 
         switch (select(l("What kinds of books are there here?"),
@@ -41,13 +41,13 @@
             npctalkonce l("An explorer left behind some incomplete manuscripts about the people and dangers in the land of Kaizei.");
             break;
         case 4:
-            speech 4,
+            speech S_LAST_NEXT,
                 l("Ow-oh!"),
                 l("Introduce yourself instead of poking me around. I almost fell from the lader, savage...");
 
             setcamnpc "#001-2-4-Book1";
 
-            speech 8,
+            speech S_NO_NPC_NAME,
                 l("Go have a look at that shelf to my right, would you?"),
                 l("You clearly need to be more public-spirited.");
             break;
diff --git a/npc/001-2-41/edouard.txt b/npc/001-2-41/edouard.txt
index ea7ce202..23d1e621 100644
--- a/npc/001-2-41/edouard.txt
+++ b/npc/001-2-41/edouard.txt
@@ -93,7 +93,7 @@ OnInit:
             mes "";
             mesn;
         }
-        speech 12,
+        speech S_LAST_NEXT | S_NO_NPC_NAME,
             l("I am new in this town, just like you."),
             l("I came here, looking for a better life."),
             l("And so far, the Merchant Guild helped me find this appartment so I can't complain!"),
@@ -114,7 +114,7 @@ OnNotSit:
     close;
 
 OnChair:
-    speech 4,
+    speech S_LAST_NEXT,
         lg("Hello, young lady.", "Hello, young man.");
 
     if (Edouard_StoryTold == 0)
@@ -122,7 +122,7 @@ OnChair:
         tellStory;
     }
 
-    speech 12,
+    speech S_LAST_NEXT | S_NO_NPC_NAME,
         l("What would you like me to do?");
 
     do
@@ -141,13 +141,13 @@ OnChair:
                 break;
             case 2:
                 BarberChangeStyle;
-                speech 5,
+                speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
                     l("Enjoy your new style.");
                     l("Anything else?");
                 break;
             case 3:
                 BarberChangeColor;
-                speech 5,
+                speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
                     l("I hope you like this color.");
                     l("Anything else?");
                 break;
@@ -155,7 +155,7 @@ OnChair:
                 tellStory;
                 break;
             case 5:
-                speech 5,
+                speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
                     l("Feel free to come visit me another time.");
 
                 goodbye;
diff --git a/npc/001-2-5/books.txt b/npc/001-2-5/books.txt
index d8f3654b..c0d05df2 100644
--- a/npc/001-2-5/books.txt
+++ b/npc/001-2-5/books.txt
@@ -7,7 +7,7 @@
 001-2-5,30,32,0	script	#001-2-5-Book1	NPC_NO_SPRITE,{
 
     function read_book {
-        narrator 1,
+        narrator S_FIRST_BLANK_LINE,
             l("There are two kinds of dialogue, the ones with regular citizens, and the ones with other adventurers."),
             l("When you go near villagers, you can see a speech bubble above them, you can then talk to them by pressing the [T] key."),
             l("You can select a specific person with the [N] key, and then, press the [T] key when you are surrounded by more than one person."),
diff --git a/npc/001-2-6/books.txt b/npc/001-2-6/books.txt
index 41674afb..49c77f16 100644
--- a/npc/001-2-6/books.txt
+++ b/npc/001-2-6/books.txt
@@ -140,7 +140,7 @@ OnInit:
 001-2-6,54,28,0	script	#001-2-6-Book4	NPC_NO_SPRITE,{
 
     function read_book {
-        narrator 1,
+        narrator S_FIRST_BLANK_LINE,
             l("Aemil was once a magnificent land unknown to us all."),
             l("Before the end of the Mana War, a band of adventurers formed in the Ancean region of Argaes from those who had lost their homes and families."),
             l("They sailed from Hurnscald to Tulimshar and then Nivalis, the last permanent settlements of humans."),
diff --git a/npc/001-2-6/christopher.txt b/npc/001-2-6/christopher.txt
index 7e79af3c..1bef6786 100644
--- a/npc/001-2-6/christopher.txt
+++ b/npc/001-2-6/christopher.txt
@@ -7,7 +7,7 @@
 001-2-6,57,46,0	script	Christopher	NPC_CHRISTOPHER,{
     function ghost_in_the_library
     {
-        narrator 4,
+        narrator S_LAST_NEXT,
             l("Christopher is surrounded by the sunlight from the window.");
 
         speech
@@ -20,7 +20,7 @@
 
     function need_help
     {
-        speech 4,
+        speech S_LAST_NEXT,
             l("Do you need help with something?");
 
         switch (select(l("What kinds of books are there here?"),
diff --git a/npc/001-2-6/leonard.txt b/npc/001-2-6/leonard.txt
index 7f422973..7b238c1a 100644
--- a/npc/001-2-6/leonard.txt
+++ b/npc/001-2-6/leonard.txt
@@ -8,7 +8,7 @@
 
     function esperia_city
     {
-        speech 1,
+        speech S_FIRST_BLANK_LINE,
             l("You have put your finger on it, I am not."),
             l("I grew up and lived a good while in Esperia, the capital city."),
             l("This place is surrounded by two very important elements: academia and the arts. I was surrounded by theater, music, dance, museums..."),
@@ -22,7 +22,7 @@
 
     function need_help
     {
-        speech 4,
+        speech S_LAST_NEXT,
             l("Do you need help with something?");
 
         switch (select(l("What kinds of books are there here?"),
diff --git a/npc/001-2-9/janus.txt b/npc/001-2-9/janus.txt
index 01b49bbc..114401b6 100644
--- a/npc/001-2-9/janus.txt
+++ b/npc/001-2-9/janus.txt
@@ -16,7 +16,7 @@
     function create_party {
         .@party_price = 1000;
 
-        speech 5,
+        speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
             l("Creating a party has some advantages, it's a pretty good choice!"),
             l("I remember when I created my first party, we were amazed to share some experience with a small group of adventurer..."),
             l("Oh! And our party chat was really entertaining, I do highly recommend you to share this fun as well."),
@@ -27,7 +27,7 @@
         {
             if (Zeny < .@party_price)
             {
-                speech 5, l("You don't have enough money, bring @@ E.", .@party_price);
+                speech S_FIRST_BLANK_LINE | S_LAST_NEXT, l("You don't have enough money, bring @@ E.", .@party_price);
             }
             else
             {
@@ -35,7 +35,7 @@
                 setq General_Janus, 2;
                 skill NV_BASIC, 7, 0;
 
-                speech 5, l("Awesome, come back if you ever want to create a larger group!");
+                speech S_FIRST_BLANK_LINE | S_LAST_NEXT, l("Awesome, come back if you ever want to create a larger group!");
             }
         }
     }
@@ -43,7 +43,7 @@
     function create_guild {
         .@guild_price = 35000;
 
-        speech 5,
+        speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
             l("Oh oh... I see, your party became so big that you want to create an even larger structure?"),
             l("Or do you want to keep your friendships and adventures in different groups?"),
             l("Anyway, the guild creation is perfect for both!"),
@@ -56,7 +56,7 @@
         {
             if (Zeny < .@guild_price)
             {
-                speech 5, l("You don't have enough money, bring @@ E.", .@guild_price);
+                speech S_FIRST_BLANK_LINE | S_LAST_NEXT, l("You don't have enough money, bring @@ E.", .@guild_price);
             }
             else
             {
@@ -65,25 +65,25 @@
                 setq General_Janus, 3;
                 getitem GuildCertification, 1;
 
-                speech 5, l("Enjoy the fraternity and excitement of your future guild!");
+                speech S_FIRST_BLANK_LINE | S_LAST_NEXT, l("Enjoy the fraternity and excitement of your future guild!");
             }
         }
     }
 
     function explain_service {
-        speech 5,
+        speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
             l("You are on the human resource wing of the Town Hall."),
             l("We offer party and guild certifications and we can also teach you how to use some basic communication skills."),
             l("Do you know how to speak with people around you?");
 
         if (askyesno () == 2)
         {
-            speech 5,
+            speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
                 l("You lack some very basic skills...");
 
             if (compareandsetq (General_Janus, 0, 1))
             {
-                speech 12,
+                speech S_LAST_NEXT | S_NO_NPC_NAME,
                     l("This book contains everything you should know about it, take it!");
 
                 inventoryplace CommunicationTheory, 1;
@@ -91,7 +91,7 @@
             }
             else
             {
-                speech 12,
+                speech S_LAST_NEXT | S_NO_NPC_NAME,
                     l("You can read the book that I gave you earlier at the library if you lost it.");
             }
         }
@@ -99,7 +99,7 @@
         {
             if (compareandsetq (General_Janus, 0, 1))
             {
-                speech 12,
+                speech S_LAST_NEXT | S_NO_NPC_NAME,
                     l("Anyway."),
                     l("This book contains everything you should know about it, take it!");
 
@@ -113,18 +113,18 @@
     }
 
     function janus_is_not_ianus {
-        speech 1,
+        speech S_FIRST_BLANK_LINE,
             l("Janus!");
         emotion E_UPSET;
         next;
 
-        speech 12,
+        speech S_LAST_NEXT | S_NO_NPC_NAME,
             l("Ianus is from the Legion of Aemil, don't compare me to this brigand.");
 
         return;
     }
 
-    speech 4,
+    speech S_LAST_NEXT,
         lg("Welcome miss.", "Good day sir.");
 
     do
diff --git a/npc/008-1/confused-tree.txt b/npc/008-1/confused-tree.txt
index ffbc1686..cf4be9a2 100644
--- a/npc/008-1/confused-tree.txt
+++ b/npc/008-1/confused-tree.txt
@@ -23,7 +23,7 @@
                     l("Have you seen anything strange lately?"),
                     l("Do you know anything about the recent robberies?"));
 
-                narrator(1,
+                narrator(S_FIRST_BLANK_LINE,
                     l("..."),
                     l("It doesn't reply."));
             }
diff --git a/npc/functions/bank.txt b/npc/functions/bank.txt
index 95a51842..5b281379 100644
--- a/npc/functions/bank.txt
+++ b/npc/functions/bank.txt
@@ -8,14 +8,14 @@ function	script	MerchantGuild_Bank	{
     {
         if (BankVault > 0)
         {
-            speech 1 | 4,
+            speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
                     l("You currently have @@ Esperin on your bank account.",
                         format_number(BankVault)),
                     l("What do you want to do with your money?");
         }
         else
         {
-            speech 1 | 4,
+            speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
                 l("What do you want to do with your money?");
         }
 
@@ -27,7 +27,7 @@ function	script	MerchantGuild_Bank	{
         switch (@menu)
         {
             case 1:
-                speech 1 | 4,
+                speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
                     l("How much do you want to deposit?");
 
                 menuint
@@ -56,7 +56,7 @@ function	script	MerchantGuild_Bank	{
                 {
                     if (@menuret > Zeny)
                     {
-                        speech 1 | 4,
+                        speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
                             l("You do not have enough Esperin on yourself.");
                         break;
                     }
@@ -71,14 +71,14 @@ function	script	MerchantGuild_Bank	{
                         BankVault += .@deposit; // add to bank
                         Zeny -= .@deposit; // remove from inventory
 
-                        speech 1 | 4,
+                        speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
                             l("You made a cash deposit of @@ E.", format_number(.@deposit));
                     }
                 }
                 break;
 
             case 2:
-                speech 1 | 4,
+                speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
                     l("How much do you want to withdraw?");
 
                 menuint
@@ -107,7 +107,7 @@ function	script	MerchantGuild_Bank	{
                 {
                     if (@menuret > BankVault)
                     {
-                        speech 1 | 4,
+                        speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
                             l("You do not have enough Esperin on your bank account.");
                         break;
                     }
@@ -122,7 +122,7 @@ function	script	MerchantGuild_Bank	{
                         Zeny += .@withdrawal; // add to inventory
                         BankVault -= .@withdrawal; // remove from bank
 
-                        speech 1 | 4,
+                        speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
                             l("You withdrew a total of @@ E.", format_number(.@withdrawal));
                     }
                 }
diff --git a/npc/functions/barber.txt b/npc/functions/barber.txt
index 1023430c..b1e3dc38 100644
--- a/npc/functions/barber.txt
+++ b/npc/functions/barber.txt
@@ -22,7 +22,7 @@ function	script	BarberSayStyle	{
             message strcharinfo(0), l("@@", .@color_name$);
             break;
         case 3:
-            speech 5,
+            speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
                 l("Your hairstyle is @@ and its color is @@.", .@style_name$, .@color_name$);
             break;
     }
diff --git a/npc/functions/beds.txt b/npc/functions/beds.txt
index 6d59a075..4ab8b6a7 100644
--- a/npc/functions/beds.txt
+++ b/npc/functions/beds.txt
@@ -19,7 +19,7 @@ function	script	bedTouch	{
 }
 
 function	script	bedClic	{
-    narrator 4, l("Do you want to use this place as save point?");
+    narrator S_LAST_NEXT, l("Do you want to use this place as save point?");
 
     if (askyesno() == ASK_YES)
     {
diff --git a/npc/functions/fishing.txt b/npc/functions/fishing.txt
index 88fef427..8eadab89 100644
--- a/npc/functions/fishing.txt
+++ b/npc/functions/fishing.txt
@@ -222,7 +222,7 @@ function	script	fishing	{
 
 
     // begin fishing
-    narrator 4,
+    narrator S_LAST_NEXT,
         l("You see some fish reflecting the sun on the surface of the water."),
         l("What will be the bait for the fish?");
 
@@ -233,7 +233,7 @@ function	script	fishing	{
 
     if (.@bait < 1)
     {
-        narrator 1,
+        narrator S_FIRST_BLANK_LINE,
             l("You take your fishing rod and leave.");
 
         return -6;
@@ -255,7 +255,7 @@ function	script	fishing	{
 
     if (.@bait_c != true)
     {
-        narrator 1,
+        narrator S_FIRST_BLANK_LINE,
             l("This item cannot be used as bait here.");
 
         return -6;
@@ -263,7 +263,7 @@ function	script	fishing	{
 
     if (getvariableofnpc(.char_id, .@npc$) > 0)
     {
-        narrator 1,
+        narrator S_FIRST_BLANK_LINE,
             l("Somebody took your place on this spot!"),
             l("You take your fishing rod and leave.");
         return -8;
diff --git a/npc/functions/game-rules.txt b/npc/functions/game-rules.txt
index 5a420e76..f633ee5f 100644
--- a/npc/functions/game-rules.txt
+++ b/npc/functions/game-rules.txt
@@ -27,13 +27,13 @@ function	script	GameRules	{
     end;
 
     function read_book {
-        narrator 5 | 1,
+        narrator S_FIRST_BLANK_LINE | S_LAST_NEXT,
             l("This book outlines the laws of every city and holding in Gasaron."),
             l("The first page contains the universal rules that have been agreed upon throughout the land.");
 
-        GameRules 8 | 4;
+        GameRules S_NO_NPC_NAME | S_LAST_NEXT;
 
-        narrator 8,
+        narrator S_NO_NPC_NAME,
             l("The next page begins to list the complex trading laws of the City of Esperia"),
             l("All this seems unimportant to you right now.");
         close;
diff --git a/npc/functions/inventoryplace.txt b/npc/functions/inventoryplace.txt
index e92ec579..4a5e08ca 100644
--- a/npc/functions/inventoryplace.txt
+++ b/npc/functions/inventoryplace.txt
@@ -26,7 +26,7 @@ function	script	inventoryplace	{
 
     if (!checkweight2(.@item, .@amount))
     {
-        narrator 1,
+        narrator S_FIRST_BLANK_LINE,
             l("It looks like you can't carry anything else for now."),
             l("You should come back when you have some free space.");
 
diff --git a/npc/functions/legiontalk.txt b/npc/functions/legiontalk.txt
index b804d2a1..14743783 100644
--- a/npc/functions/legiontalk.txt
+++ b/npc/functions/legiontalk.txt
@@ -12,7 +12,7 @@ function	script	legiontalk	{
     {
         case 0:
             npctalk3 l("Do I look like a tree? I feel like one.");
-            //speech 4,
+            //speech S_LAST_NEXT,
             //    l("Do you feel too weak even to do damage to this areas wishy-washy wildlife?"),
             //    l("Then concentrate your anger upon the trees hereabouts, you will gain experience whilst leveling your sword skill on them."),
             //    l("Oh, and a fruit may even fall for you if you are lucky! But stay alert to pick up your drops.");
diff --git a/npc/functions/sailortalk.txt b/npc/functions/sailortalk.txt
index 38225d4e..49bc62f8 100644
--- a/npc/functions/sailortalk.txt
+++ b/npc/functions/sailortalk.txt
@@ -12,7 +12,7 @@ function	script	sailortalk	{
     if (.@rand == 0) goodbye;
     if (.@rand == 1)
     {
-        speech 4,
+        speech S_LAST_NEXT,
             l("These purple mushrooms are called @@s. There are plenty of 'em on this island!", getitemlink(Plushroom)),
             l("It's a kind of mushroom that tastes like a marshmallow and looks like a plush! @@, get it?", getitemlink(Plushroom)),
             l("These funny fungi are mushrooming all around this island. Just pick some @@s and have a try.", getitemlink(Plushroom));
@@ -21,7 +21,7 @@ function	script	sailortalk	{
     if (.@rand == 3) npctalk3 l("So finally someone has came to visit me?");
     if (.@rand == 4)
     {
-        speech 4,
+        speech S_LAST_NEXT,
             l("A sunny and hot day,"),
             l("a quiet place,"),
             l("a ground!"),
diff --git a/npc/items/shovel.txt b/npc/items/shovel.txt
index d85280e1..f01a0fcb 100644
--- a/npc/items/shovel.txt
+++ b/npc/items/shovel.txt
@@ -47,7 +47,7 @@
         .@playertick = .PlayerTiredTime - readparam(bStr);
         if (@ShovelLastUsed + max(4, .@playertick) > .@tick)
         {
-            narrator 1,
+            narrator S_FIRST_BLANK_LINE,
                 lg("You are exhausted, you should rest a bit.");
             return 1;
         }
@@ -71,18 +71,18 @@
                 deletearray $WorldBuriedTreasures_x[.@i], 1;
                 deletearray $WorldBuriedTreasures_y[.@i], 1;
                 getitem .@id, .@amount;
-                narrator 1,
+                narrator S_FIRST_BLANK_LINE,
                     l("You found something!"),
                     l("It's @@ @@.", .@amount, getitemname(.@id));
                 return 1;
             }
         }
-        narrator 1, l("Sadly, you found nothing but dirt.");
+        narrator S_FIRST_BLANK_LINE, l("Sadly, you found nothing but dirt.");
         return 0;
     }
 
     function Bury {
-        narrator 3, l("What would you like to bury?");
+        narrator S_FIRST_BLANK_LINE | S_LAST_BLANK_LINE, l("What would you like to bury?");
         .@items$ = "";
         getinventorylist;
         for (.@i = 0; .@i < @inventorylist_count; .@i++)
@@ -95,7 +95,7 @@
         .@amount = 1;
         if (@inventorylist_amount[.@idx] > 1)
         {
-            narrator 3, l("Amount?");
+            narrator S_FIRST_BLANK_LINE | S_LAST_BLANK_LINE, l("Amount?");
             input .@amount, 1, @inventorylist_amount[.@idx];
         }
 
@@ -107,7 +107,7 @@
         $WorldBuriedTreasures_map$[.@wtc] = .@map$;
         $WorldBuriedTreasures_x[.@wtc] = .@x;
         $WorldBuriedTreasures_y[.@wtc] = .@y;
-        narrator 1, l("You buried @@ @@.", .@amount, getitemname(.@id));
+        narrator S_FIRST_BLANK_LINE, l("You buried @@ @@.", .@amount, getitemname(.@id));
 
         return 0;
     }
@@ -139,7 +139,7 @@ OnUse:
         close;
     }
 
-    narrator 2,
+    narrator S_LAST_BLANK_LINE,
         l("You hold the shovel in your hands."),
         l("What are you going to do?");
 
@@ -162,7 +162,7 @@ OnUse:
             Bury();
             break;
         case 3:
-            narrator 1, l("You hide your shovel.");
+            narrator S_FIRST_BLANK_LINE, l("You hide your shovel.");
             break;
     }
     close;