Systematically fix most if not every improper instance of npctalk

17 files changed, 84 insertions, 84 deletions

diff --git a/npc/002-1/itka.txt b/npc/002-1/itka.txt
index 42ae91bd..53dfda46 100644
--- a/npc/002-1/itka.txt
+++ b/npc/002-1/itka.txt
@@ -8,7 +8,7 @@
     close;
 
 OnTimer300000:
-    npctalk strnpcinfo(0), "Come to The Wizard's Rest!";
+    npctalk "Come to The Wizard's Rest!";
     setnpctimer 0;
     end;
 
diff --git a/npc/006-1/miriam.txt b/npc/006-1/miriam.txt
index fdbbdf1c..687e7c60 100644
--- a/npc/006-1/miriam.txt
+++ b/npc/006-1/miriam.txt
@@ -219,7 +219,7 @@ L_LetsDoThis:
     message strcharinfo(0), "Miriam quickly grabs your arm and pull you to the place where she is sitting.";
     // Warp the player to the place where the NPC is defined, so he can't cheat.
     warp "032-1",55,21;
-    npctalk strnpcinfo(0), "Run " +strcharinfo(0)+ ", run!";
+    npctalk "Run " +strcharinfo(0)+ ", run!";
     QUEST_MIRIAM = 5;
     QUEST_MIRIAM_run = gettimetick(2);
     end;
diff --git a/npc/007-2/witch.txt b/npc/007-2/witch.txt
index 6dcd7d5c..254fa4ea 100644
--- a/npc/007-2/witch.txt
+++ b/npc/007-2/witch.txt
@@ -519,18 +519,18 @@ L_ReactToPlayersReturn:
     end;
 
 L_SurprisedByHeroWin:
-    npctalk strnpcinfo(0), "(How is it possible... " + $@iLLIA_HERO$ + " survived...)";
+    npctalk "(How is it possible... " + $@iLLIA_HERO$ + " survived...)";
     emotion EMOTE_SURPRISE;
     goto L_EndQuest;
 
 L_Disappoint:
-    npctalk strnpcinfo(0), "Oh no... It seems " + $@iLLIA_HERO$ + " did not make it... Who will save my sister now?";
+    npctalk "Oh no... It seems " + $@iLLIA_HERO$ + " did not make it... Who will save my sister now?";
     emotion EMOTE_SAD;
     goto L_EndQuest;
 
 L_PlayerGaveUp:
     close2;
-    npctalk strnpcinfo(0), "Well... It seems you can't do it " + $@iLLIA_HERO$ + ". I knew it as soon as I saw you!";
+    npctalk "Well... It seems you can't do it " + $@iLLIA_HERO$ + ". I knew it as soon as I saw you!";
     emotion EMOTE_UPSET;
     goto L_EndQuest;
 
@@ -574,30 +574,30 @@ OnTimer3000:
 OnTimer2500:
     if ($@iLLIA_STATUS != 3)
         end;
-    npctalk strnpcinfo(0), $@iLLIA_HERO$ + ", " + $@iLLIA_HELPER1$ + ", " + $@iLLIA_HELPER2$ + ", " + $@iLLIA_HELPER3$ + ", listen!";
+    npctalk $@iLLIA_HERO$ + ", " + $@iLLIA_HELPER1$ + ", " + $@iLLIA_HELPER2$ + ", " + $@iLLIA_HELPER3$ + ", listen!";
     end;
 
 OnTimer7500:
     if ($@iLLIA_STATUS != 3)
         end;
-    npctalk strnpcinfo(0), "I will teleport the 4 of you in a forest that isn't far from the waterfall.";
+    npctalk "I will teleport the 4 of you in a forest that isn't far from the waterfall.";
     end;
 
 OnTimer14000:
     if ($@iLLIA_STATUS != 3)
         end;
-    npctalk strnpcinfo(0), "Each of you takes one of these rings. They will allow you to come back here when needed.";
+    npctalk "Each of you takes one of these rings. They will allow you to come back here when needed.";
     end;
 
 OnTimer24000:
     if ($@iLLIA_STATUS != 3)
         end;
     if ($Illia_Luvia_Harvest < 10)
-        npctalk strnpcinfo(0), "Do your best and save my sister!";
+        npctalk "Do your best and save my sister!";
     if ($Illia_Luvia_Harvest >= 10 && $Illia_Luvia_Harvest < 35)
-        npctalk strnpcinfo(0), "This will be quite dangerous, but do your best and save my sister!";
+        npctalk "This will be quite dangerous, but do your best and save my sister!";
     if ($Illia_Luvia_Harvest >= 35)
-        npctalk strnpcinfo(0), "This will be awfully dangerous, but do your best and save my sister!";
+        npctalk "This will be awfully dangerous, but do your best and save my sister!";
     end;
 
 OnTimer34000:
@@ -609,7 +609,7 @@ OnTimer34000:
     areatimer 0, "007-2", 0, 0, 57, 55, 3500, "Valia::OnWarpHelper1";
     areatimer 0, "007-2", 0, 0, 57, 55, 4000, "Valia::OnWarpHelper2";
     areatimer 0, "007-2", 0, 0, 57, 55, 4500, "Valia::OnWarpHelper3";
-    npctalk strnpcinfo(0), "Spiralis Major!";
+    npctalk "Spiralis Major!";
     misceffect FX_BLUE_MAGIC_CAST;
     end;
 
@@ -627,19 +627,19 @@ OnTimer150000:
     if ($@iLLIA_STATUS != 1)
         end;
     $@iLLIA_STATUS = 2;
-    npctalk strnpcinfo(0), $@iLLIA_HERO$ + ", I am ready to cast the teleport spell. You and your comrades should not wait any longer!";
+    npctalk $@iLLIA_HERO$ + ", I am ready to cast the teleport spell. You and your comrades should not wait any longer!";
     end;
 
 OnTimer280000:
     if ($@iLLIA_STATUS != 2)
         end;
-    npctalk strnpcinfo(0), "Hurry up " + $@iLLIA_HERO$ + ", I am losing patience.";
+    npctalk "Hurry up " + $@iLLIA_HERO$ + ", I am losing patience.";
     end;
 
 OnTimer300000:
     if ($@iLLIA_STATUS != 2)
         end;
-    npctalk strnpcinfo(0), $@iLLIA_HERO$ + ", you and your missing comrades made me lose a precious time! Out of my sight!";
+    npctalk $@iLLIA_HERO$ + ", you and your missing comrades made me lose a precious time! Out of my sight!";
     emotion EMOTE_UPSET;
     if (attachrid($@iLLIA_HERO_ID))
         goto L_KillHero;
diff --git a/npc/009-7/debug.txt b/npc/009-7/debug.txt
index 47ee823c..00fcc643 100644
--- a/npc/009-7/debug.txt
+++ b/npc/009-7/debug.txt
@@ -142,14 +142,14 @@ OnInit:
 
     // debug messages below
 OnKillerNotInDuel:
-    npctalk strnpcinfo(0), "WARNING: The victim was not killed by its adversary. Aborting duel...";
+    npctalk "WARNING: The victim was not killed by its adversary. Aborting duel...";
     end;
 
 OnVictimNotInDuel:
-    npctalk strnpcinfo(0), "WARNING: The victim is not part of the duel";
+    npctalk "WARNING: The victim is not part of the duel";
     end;
 
 OnVictimInDuelNoDuel:
-    npctalk strnpcinfo(0), "WARNING: The victim is part of the duel but no duel is ongoing at the moment.";
+    npctalk "WARNING: The victim is part of the duel but no duel is ongoing at the moment.";
     end;
 }
diff --git a/npc/009-7/rouge.txt b/npc/009-7/rouge.txt
index 157da9fb..fb26d42a 100644
--- a/npc/009-7/rouge.txt
+++ b/npc/009-7/rouge.txt
@@ -100,30 +100,30 @@ L_End:
     close;
 
 OnAnnounceNext:
-    npctalk strnpcinfo(0), "##0The next battle ("+ $@Duel_Queue_ID[0] +") is ##1" + $@Duel_Queue_Red$[0] + "##0 vs. ##3" + $@Duel_Queue_Blue$[0] + "##0.The battle will start in "+ $@Duel_TimeBeforeWarp +" seconds.";
+    npctalk "##0The next battle ("+ $@Duel_Queue_ID[0] +") is ##1" + $@Duel_Queue_Red$[0] + "##0 vs. ##3" + $@Duel_Queue_Blue$[0] + "##0.The battle will start in "+ $@Duel_TimeBeforeWarp +" seconds.";
     end;
 
 OnAnnounceIntrusion:
-    npctalk strnpcinfo(0), "Intrusion detected. Annihilation in progress... Done.";
+    npctalk "Intrusion detected. Annihilation in progress... Done.";
     end;
 
 OnAnnounceTimeOut:
-    npctalk strnpcinfo(0), "Time limit reached! Both player lose!";
+    npctalk "Time limit reached! Both player lose!";
     end;
 
 OnAnnounceRedWins:
-    npctalk strnpcinfo(0), $@Duel_Queue_Red$[0] + " wins the duel against "+ $@Duel_Queue_Blue$[0] +"!";
+    npctalk $@Duel_Queue_Red$[0] + " wins the duel against "+ $@Duel_Queue_Blue$[0] +"!";
     end;
 
 OnAnnounceRedForfeit:
-    npctalk strnpcinfo(0), $@Duel_Queue_Red$[0] + " wins by forfeit!";
+    npctalk $@Duel_Queue_Red$[0] + " wins by forfeit!";
     end;
 
 OnAnnounceBlueWins:
-    npctalk strnpcinfo(0), $@Duel_Queue_Blue$[0] + " wins the duel against "+ $@Duel_Queue_Red$[0] +"!";
+    npctalk $@Duel_Queue_Blue$[0] + " wins the duel against "+ $@Duel_Queue_Red$[0] +"!";
     end;
 
 OnAnnounceBlueForfeit:
-    npctalk strnpcinfo(0), $@Duel_Queue_Blue$[0] + " wins by forfeit!";
+    npctalk $@Duel_Queue_Blue$[0] + " wins by forfeit!";
     end;
 }
diff --git a/npc/010-2/band.txt b/npc/010-2/band.txt
index a94fc3a7..e667163d 100644
--- a/npc/010-2/band.txt
+++ b/npc/010-2/band.txt
@@ -13,7 +13,7 @@
     end;
 }
 function	script	DimondBand	{
-    npctalk strnpcinfo(0), $@SongLyrics$[$@LyricSpot];
+    npctalk $@SongLyrics$[$@LyricSpot];
     $@LyricSpot = ($@LyricSpot + 1);
     if (getarraysize($@SongLyrics$) <= $@LyricSpot)
         $@LyricSpot = 0;
diff --git a/npc/011-1/oscar.txt b/npc/011-1/oscar.txt
index 7e5f9481..e6780ff3 100644
--- a/npc/011-1/oscar.txt
+++ b/npc/011-1/oscar.txt
@@ -312,7 +312,7 @@ L_TimerFunction:
         goto L_AllPumpkinsDead;
     // A quick "cheer up"
     if ($@HalloweenQuest_PumpkinsTimer == 300)
-        npctalk strnpcinfo(0), "Hurry up " + $@HalloweenQuest_PumpkinHunter$ + "! My farm is being ruined!";
+        npctalk "Hurry up " + $@HalloweenQuest_PumpkinHunter$ + "! My farm is being ruined!";
     // 7 mins max
     if ($@HalloweenQuest_PumpkinsTimer > 420)
         goto L_PumpkinsRuined;
@@ -337,7 +337,7 @@ OnTimer6000:
     if ($@HalloweenQuest_PumpkinsState != 0)
         end;
     emotion EMOTE_AFRAID;
-    npctalk strnpcinfo(0), "Oh no, these pumpkins look strange and infested with bugs! Help me get rid of them " + $@HalloweenQuest_PumpkinHunter$ + "!";
+    npctalk "Oh no, these pumpkins look strange and infested with bugs! Help me get rid of them " + $@HalloweenQuest_PumpkinHunter$ + "!";
     $@HalloweenQuest_PumpkinsState = 1;
     setnpctimer 0;
     end;
@@ -383,7 +383,7 @@ L_KillBadHunter:
     end;
 
 L_PumpkinsRuined:
-    npctalk strnpcinfo(0), "No! " + $@HalloweenQuest_PumpkinHunter$ + " how could you let that happen? All my farm is a mess now! All my trees are infested with bugs!";
+    npctalk "No! " + $@HalloweenQuest_PumpkinHunter$ + " how could you let that happen? All my farm is a mess now! All my trees are infested with bugs!";
     goto L_Fail;
 
 L_AllPumpkinsDead:
@@ -400,15 +400,15 @@ S_CheckPlayer:
     return;
 
 L_PlayerOff:
-    npctalk strnpcinfo(0), "What? Where is " + $@HalloweenQuest_PumpkinHunter$ + "? Someone, help me!";
+    npctalk "What? Where is " + $@HalloweenQuest_PumpkinHunter$ + "? Someone, help me!";
     goto L_Fail;
 
 L_PlayerLeft:
-    npctalk strnpcinfo(0), "What the!! " + $@HalloweenQuest_PumpkinHunter$ + " left me alone with all this! Someone, help me!";
+    npctalk "What the!! " + $@HalloweenQuest_PumpkinHunter$ + " left me alone with all this! Someone, help me!";
     goto L_Fail;
 
 L_PlayerDead:
-    npctalk strnpcinfo(0), "Oh no I can't believe it! " + $@HalloweenQuest_PumpkinHunter$ + " just died! Someone, help me!";
+    npctalk "Oh no I can't believe it! " + $@HalloweenQuest_PumpkinHunter$ + " just died! Someone, help me!";
     goto L_Fail;
 
 L_Fail:
@@ -425,7 +425,7 @@ L_Success:
         goto L_PlayerOff;
     Quest_Halloween = 6;
     emotion EMOTE_GRIN;
-    npctalk strnpcinfo(0), "Hurray, " + $@HalloweenQuest_PumpkinHunter$ + " you did it! Thank you thank you! Come here!";
+    npctalk "Hurray, " + $@HalloweenQuest_PumpkinHunter$ + " you did it! Thank you thank you! Come here!";
     goto L_Clean;
 
 L_Clean:
diff --git a/npc/011-6/crastur.txt b/npc/011-6/crastur.txt
index 5042d0e5..e178fcab 100644
--- a/npc/011-6/crastur.txt
+++ b/npc/011-6/crastur.txt
@@ -149,7 +149,7 @@ L_Regular:
         "\"Ugh, no. I have to leave now. Bye.\"", L_close;
 
 L_Insult:
-    npctalk strnpcinfo(0), "Crastur : Die " + strcharinfo(0) + "!";
+    npctalk "Crastur : Die " + strcharinfo(0) + "!";
     heal -10000, 0;
     emotion EMOTE_VICIOUS;
     mes "[Crastur]";
diff --git a/npc/029-2/tanisha.txt b/npc/029-2/tanisha.txt
index 4e5abe42..0e2c24cb 100644
--- a/npc/029-2/tanisha.txt
+++ b/npc/029-2/tanisha.txt
@@ -209,7 +209,7 @@ L_Next2:
     goto L_Fight_Again;
 
 L_Fighting:
-    npctalk strnpcinfo(0), "##3I believe in you!", strcharinfo(0);
+    npctalk "##3I believe in you!", strcharinfo(0);
     end;
 
 OnTimer1000:
@@ -236,16 +236,16 @@ OnTick:
     if (Hp > 20)
         end;
     heal MaxHp, 0;
-    npctalk strnpcinfo(0), "##3You're doing good!", strcharinfo(0);
+    npctalk "##3You're doing good!", strcharinfo(0);
     end;
 
 OnMaggotDeath:
     if (@Maggot_Kills == 1)
-        npctalk strnpcinfo(0), "##3Aaahhhh... another one! It will crawl up your legs!", strcharinfo(0);
+        npctalk "##3Aaahhhh... another one! It will crawl up your legs!", strcharinfo(0);
     if (@Maggot_Kills == 2)
-        npctalk strnpcinfo(0), "##3Ohh... Irrhk... Eeeeww... They just appear from nowhere!", strcharinfo(0);
+        npctalk "##3Ohh... Irrhk... Eeeeww... They just appear from nowhere!", strcharinfo(0);
     if (@Maggot_Kills == 3)
-        npctalk strnpcinfo(0), "##3Yuck... I think I am getting sick.", strcharinfo(0);
+        npctalk "##3Yuck... I think I am getting sick.", strcharinfo(0);
     if (isin("029-2", 98, 84, 106, 89))
         @Maggot_Kills = @Maggot_Kills + 1;
     if (@Maggot_Kills < 5)
diff --git a/npc/029-3/parua.txt b/npc/029-3/parua.txt
index bfa3e4ba..8a908cf7 100644
--- a/npc/029-3/parua.txt
+++ b/npc/029-3/parua.txt
@@ -46,7 +46,7 @@ L_Paying:
 L_StartFight:
     if (getmapusers("029-3") < 5)
         goto L_NotEnoughPlayers;
-    npctalk strnpcinfo(0), "Let the battle begin!";
+    npctalk "Let the battle begin!";
     $@FIGHT_CAVE_STATUS = 1;
     $@FIGHT_CAVE_LEVEL = 1;
     $@FIGHT_CAVE_PLAYER_COUNT = getmapusers("029-3");
@@ -350,7 +350,7 @@ OnInit:
     goto L_CleanUp;
 
 L_CleanUp:
-    npctalk strnpcinfo(0), "Game Over";
+    npctalk "Game Over";
     $@candor_npctalk$ = "The dungeon is now ready for its next victims.";
     donpcevent "#CandorAnnouncer::OnCommandTalk";
     areatimer 0, "029-3", 20, 20, 70, 60, 10, "Parua::OnReward";
@@ -366,7 +366,7 @@ L_CleanUp:
     end;
 
 L_CleanUp_Announcement:
-    npctalk strnpcinfo(0), $@SPONSOR$ + " lost the money invested in the fight, since there are less than 5 players in the cave";
+    npctalk $@SPONSOR$ + " lost the money invested in the fight, since there are less than 5 players in the cave";
     $@SPONSOR$ = "";
     $@ANNOUNCE_TIME = 0;
     $@FIGHT_CAVE_STATUS = 0;
diff --git a/npc/030-4/mana_battery.txt b/npc/030-4/mana_battery.txt
index 5126099d..32e6dcfb 100644
--- a/npc/030-4/mana_battery.txt
+++ b/npc/030-4/mana_battery.txt
@@ -103,7 +103,7 @@ L_Start:
     next;
     mes "it seems like this will not turn out as planned, Look this Guard of Honour is going crazy!";
     next;
-    npctalk strnpcinfo(0), "The Guards are out of control!";
+    npctalk "The Guards are out of control!";
     if ($@XmasBattleStatus)
         goto L_BattleAlreadyStarted;
     $@XmasBattleStatus = @xmas_battle_status;
diff --git a/npc/031-4/cindyCave.txt b/npc/031-4/cindyCave.txt
index 284a58f8..c3db9b5d 100644
--- a/npc/031-4/cindyCave.txt
+++ b/npc/031-4/cindyCave.txt
@@ -42,7 +42,7 @@ L_Try_Cage:
     mes "You get an uncomfortable feeling and Cindy starts to shiver.";
     if ($@FIGHT_YETI_STATUS != 0)
         goto L_Yeti;
-    npctalk strnpcinfo(0), "Oh no, the Yetis...";
+    npctalk "Oh no, the Yetis...";
 
     // initialize fight
     $@FIGHT_YETI_STATUS = 1;
diff --git a/npc/033-1/kimarr.txt b/npc/033-1/kimarr.txt
index 74ae45a1..cc76ce97 100644
--- a/npc/033-1/kimarr.txt
+++ b/npc/033-1/kimarr.txt
@@ -70,7 +70,7 @@ L_Ask:
         "Maybe later.",L_close;
 
 L_AlreadyGotReward:
-    npctalk strnpcinfo(0), strcharinfo(0) + " killed " + $@Fluffy_Kills + " Fluffies and has once again proven to be a good hunter.";
+    npctalk strcharinfo(0) + " killed " + $@Fluffy_Kills + " Fluffies and has once again proven to be a good hunter.";
     message strcharinfo(0), "Kimarr: Once again you prove your worth as a hunter! You killed " + $@Fluffy_Kills + " Fluffies.";
     callsub S_Clean;
     goto L_close;
@@ -81,7 +81,7 @@ L_Reward1:
     if (@state >= 2)
         goto L_AlreadyGotReward;
 
-    npctalk strnpcinfo(0), "Hooray! " + strcharinfo(0) + " killed " + $@Fluffy_Kills + " Fluffies and is now a worthy hunter.";
+    npctalk "Hooray! " + strcharinfo(0) + " killed " + $@Fluffy_Kills + " Fluffies and is now a worthy hunter.";
 
     // as far as I can tell, this fails because it won't resume from the "next"
     // when the script is executed via the "OnFluffyDeath" callback
@@ -161,19 +161,19 @@ L_Action:
         areatimer 0, "033-1", 79, 28, 88, 42, 10, "Kimarr::OnTooMany";
 
     if ($@Fluffy_Time == 180)
-        npctalk strnpcinfo(0), strcharinfo(0) + ", you have 3 minutes.";
+        npctalk strcharinfo(0) + ", you have 3 minutes.";
     if ($@Fluffy_Time == 120)
-        npctalk strnpcinfo(0), "You have 2 minutes left.";
+        npctalk "You have 2 minutes left.";
     if ($@Fluffy_Time == 60)
-        npctalk strnpcinfo(0), "You have 1 minute left.";
+        npctalk "You have 1 minute left.";
     if ($@Fluffy_Time == 30)
-        npctalk strnpcinfo(0), "You have 30 seconds left.";
+        npctalk "You have 30 seconds left.";
     if ($@Fluffy_Time == 15)
-        npctalk strnpcinfo(0), "You have 15 seconds left.";
+        npctalk "You have 15 seconds left.";
     if ($@Fluffy_Time == 10)
-        npctalk strnpcinfo(0), "You have 10 seconds left.";
+        npctalk "You have 10 seconds left.";
     if ($@Fluffy_Time == 5)
-        npctalk strnpcinfo(0), "You have 5 seconds left.";
+        npctalk "You have 5 seconds left.";
     $@Fluffy_Time = $@Fluffy_Time - 1;
     if ($@Fluffy_Time < 0)
         goto L_TimeOver;
@@ -184,21 +184,21 @@ L_ContinueTimer:
     end;
 
 L_GotOut:
-    npctalk strnpcinfo(0), "What a strange thing... " + $@Fluffy_Fighter$ + " just disappeared!";
+    npctalk "What a strange thing... " + $@Fluffy_Fighter$ + " just disappeared!";
     callsub S_Clean;
     end;
 
 OnTooMany:
     if (getcharid(3) == $@Fluffy_FighterID)
         end;
-    npctalk strnpcinfo(0), "Hey " + strcharinfo(0) + "! What are you doing there? This hunt is for " + $@Fluffy_Fighter$ + " alone!";
+    npctalk "Hey " + strcharinfo(0) + "! What are you doing there? This hunt is for " + $@Fluffy_Fighter$ + " alone!";
     warp "033-1", 77, 34;
     end;
 
 L_Died:
     warp "033-1", 77, 34;
     message strcharinfo(0), "You are dead.";
-    npctalk strnpcinfo(0), "Oh no! " + $@Fluffy_Fighter$ + " got overwhelmed!";
+    npctalk "Oh no! " + $@Fluffy_Fighter$ + " got overwhelmed!";
     callsub S_Clean;
     end;
 
@@ -291,7 +291,7 @@ L_Punish:
     if (@mobId == 1072)
         areamonster "033-1", 79, 29, 88, 42, "", 1072, 1, "Kimarr::OnYetiDeath";
 
-    npctalk strnpcinfo(0), strcharinfo(0) + "! This hunt is for " + $@Fluffy_Fighter$ + " alone!";
+    npctalk strcharinfo(0) + "! This hunt is for " + $@Fluffy_Fighter$ + " alone!";
     heal -Hp, 0;
     @mobId = 0;
     end;
@@ -369,7 +369,7 @@ L_FinallyInsertMe:
     goto L_Reward1;
 
 L_NotGoodEnough:
-    npctalk strnpcinfo(0),  "What a disappointment, " + strcharinfo(0) + " hunted only " + $@Fluffy_Kills + " Fluffies.";
+    npctalk  "What a disappointment, " + strcharinfo(0) + " hunted only " + $@Fluffy_Kills + " Fluffies.";
     message strcharinfo(0), "Kimarr: What a disappointment, you hunted only " + $@Fluffy_Kills + " Fluffies.";
     callsub S_Clean;
     end;
diff --git a/npc/051-1/desert.txt b/npc/051-1/desert.txt
index 172cb48e..07b84eb6 100644
--- a/npc/051-1/desert.txt
+++ b/npc/051-1/desert.txt
@@ -25,7 +25,7 @@
         "No", L_close;
 
 OnTimer1000:
-    npctalk strnpcinfo(0), "Youuuuuuu... Bring me souls... " + $@illia_num_sealed_souls + " fresh souls... Nooooow. And you shall paaass.";
+    npctalk "Youuuuuuu... Bring me souls... " + $@illia_num_sealed_souls + " fresh souls... Nooooow. And you shall paaass.";
     end;
 
 OnTimer4750:
@@ -33,7 +33,7 @@ OnTimer4750:
     end;
 
 OnTimer6500:
-    npctalk strnpcinfo(0), "Nooooo... Do not let these things take them from youuuuuu!";
+    npctalk "Nooooo... Do not let these things take them from youuuuuu!";
     stopnpctimer;
     setnpctimer 0;
     end;
diff --git a/npc/051-3/ambush.txt b/npc/051-3/ambush.txt
index 48a051a9..82252521 100644
--- a/npc/051-3/ambush.txt
+++ b/npc/051-3/ambush.txt
@@ -134,11 +134,11 @@ OnCommandTalk:
     end;
 
 OnTimer100:
-    npctalk strnpcinfo(0), "Did you think you could sneak in our den without a problem?";
+    npctalk "Did you think you could sneak in our den without a problem?";
     end;
 
 OnTimer3600:
-    npctalk strnpcinfo(0), "Drop your weapons, and come with us!";
+    npctalk "Drop your weapons, and come with us!";
     stopnpctimer;
     setnpctimer 0;
     end;
@@ -153,11 +153,11 @@ OnCommandTalk:
     end;
 
 OnTimer1500:
-    npctalk strnpcinfo(0), "W00t! More slaves!";
+    npctalk "W00t! More slaves!";
     end;
 
 OnTimer5500:
-    npctalk strnpcinfo(0), "Ahaha, that was easy! Ok, knock them out!";
+    npctalk "Ahaha, that was easy! Ok, knock them out!";
     stopnpctimer;
     setnpctimer 0;
     end;
diff --git a/npc/052-2/lobby.txt b/npc/052-2/lobby.txt
index 0245cc6b..d6bfb824 100644
--- a/npc/052-2/lobby.txt
+++ b/npc/052-2/lobby.txt
@@ -129,7 +129,7 @@ L_Continue:
 end;
 
 OnCommandTalk:
-    npctalk strnpcinfo(0), $@illia_lobby_voices$[$@illia_lobby_voices_index];
+    npctalk $@illia_lobby_voices$[$@illia_lobby_voices_index];
     end;
 
 }
@@ -162,49 +162,49 @@ L_TalkToHero:
 OnTimer1500:
     if ($@illia_level_5_progress != 4)
         end;
-    npctalk strnpcinfo(0), "Yes " + $@iLLIA_HERO$ + ", I am Luvia.";
+    npctalk "Yes " + $@iLLIA_HERO$ + ", I am Luvia.";
     end;
 
 OnTimer4500:
     if ($@illia_level_5_progress != 4)
         end;
-    npctalk strnpcinfo(0), "How nice of all of you to have come to save me!";
+    npctalk "How nice of all of you to have come to save me!";
     end;
 
 OnTimer7500:
     if ($@illia_level_5_progress != 4)
         end;
-    npctalk strnpcinfo(0), "But I fear...";
+    npctalk "But I fear...";
     end;
 
 OnTimer10500:
     if ($@illia_level_5_progress != 4)
         end;
-    npctalk strnpcinfo(0), "... that you are mistaken about who has to be saved!";
+    npctalk "... that you are mistaken about who has to be saved!";
     end;
 
 OnTimer13500:
     if ($@illia_level_5_progress != 4)
         end;
-    npctalk strnpcinfo(0), "Don't make these faces...";
+    npctalk "Don't make these faces...";
     end;
 
 OnTimer16500:
     if ($@illia_level_5_progress != 4)
         end;
-    npctalk strnpcinfo(0), "Valia is just helping me by sending new soldiers for my personal army!";
+    npctalk "Valia is just helping me by sending new soldiers for my personal army!";
     end;
 
 OnTimer21500:
     if ($@illia_level_5_progress != 4)
         end;
-    npctalk strnpcinfo(0), "So, if I may... Let's see what you are made of!";
+    npctalk "So, if I may... Let's see what you are made of!";
     end;
 
 OnTimer24500:
     if ($@illia_level_5_progress != 4)
         end;
-    npctalk strnpcinfo(0), "Demonotis!";
+    npctalk "Demonotis!";
     misceffect FX_EVIL_SUMMON;
     callsub S_GetHeroRect;
     areamonster "052-2", $@illia_lobby_x1, $@illia_lobby_y1, $@illia_lobby_x2, $@illia_lobby_y2, "", 1101, 20 + 16 - 480/(30+$Illia_Luvia_Harvest), "Luvia?::OnDSDeath";
@@ -214,7 +214,7 @@ OnTimer24500:
 OnTimer44000:
     if ($@illia_level_5_progress != 4)
         end;
-    npctalk strnpcinfo(0), "Demonotis!";
+    npctalk "Demonotis!";
     misceffect FX_EVIL_SUMMON;
     callsub S_GetHeroRect;
     areamonster "052-2", $@illia_lobby_x1, $@illia_lobby_y1, $@illia_lobby_x2, $@illia_lobby_y2, "", 1101, 28 + 16 - 480/(30+$Illia_Luvia_Harvest), "Luvia?::OnDSDeath";
@@ -224,7 +224,7 @@ OnTimer44000:
 OnTimer77000:
     if ($@illia_level_5_progress != 4)
         end;
-    npctalk strnpcinfo(0), "Demonotis!";
+    npctalk "Demonotis!";
     misceffect FX_EVIL_SUMMON;
     callsub S_GetHeroRect;
     areamonster "052-2", $@illia_lobby_x1, $@illia_lobby_y1, $@illia_lobby_x2, $@illia_lobby_y2, "", 1101, 42 + 16 - 480/(30+$Illia_Luvia_Harvest), "Luvia?::OnDSDeath";
@@ -237,25 +237,25 @@ OnTimer77000:
 OnTimer6500:
     if ($@illia_level_5_progress != 6)
         end;
-    npctalk strnpcinfo(0), "Okay. You have some skill.";
+    npctalk "Okay. You have some skill.";
     end;
 
 OnTimer10000:
     if ($@illia_level_5_progress != 6)
         end;
-    npctalk strnpcinfo(0), "But that was only the beginning!";
+    npctalk "But that was only the beginning!";
     end;
 
 OnTimer13000:
     if ($@illia_level_5_progress != 6)
         end;
-    npctalk strnpcinfo(0), "I'll leave you in the good hands of your predecessors. Farewell!";
+    npctalk "I'll leave you in the good hands of your predecessors. Farewell!";
     end;
 
 OnTimer18500:
     if ($@illia_level_5_progress != 6)
         end;
-    npctalk strnpcinfo(0), "Demonotis Major!";
+    npctalk "Demonotis Major!";
     misceffect FX_EVIL_SUMMON;
     misceffect FX_MAGIC_DARK_EXPLOSION;
     callsub S_GetHeroRect;
@@ -279,7 +279,7 @@ OnTimer2000:
     setnpctimer 0;
     // Mock players randomly (more or less once every 40 secs) and if still enough mobs running after them
     if ($@illia_level_5_progress == 5 && rand(20) == 0 && (mobcount("052-2", "Luvia?::OnDSDeath") > 21))
-        npctalk strnpcinfo(0), "Ahaha! Run... Run!";
+        npctalk "Ahaha! Run... Run!";
     if ($@illia_level_5_progress == 5 && (mobcount("052-2", "Luvia?::OnDSDeath") <= 0))
         goto L_AllWavesClear;
     if ($@illia_level_5_progress == 7 && (mobcount("052-2", "Luvia?::OnWGDeath") <= 0))
diff --git a/npc/052-2/partyroom.txt b/npc/052-2/partyroom.txt
index 399c690d..dfd0613e 100644
--- a/npc/052-2/partyroom.txt
+++ b/npc/052-2/partyroom.txt
@@ -48,19 +48,19 @@ L_ShouldNotBeHere:
     end;
 
 OnTimer1000:
-    npctalk strnpcinfo(0), "Oh well, who thought you would survive so far?";
+    npctalk "Oh well, who thought you would survive so far?";
     end;
 
 OnTimer5000:
-    npctalk strnpcinfo(0), "All this way, for nothing, only to die from my hands...";
+    npctalk "All this way, for nothing, only to die from my hands...";
     end;
 
 OnTimer10000:
-    npctalk strnpcinfo(0), "Don't worry, you will continue to live, for my sake.";
+    npctalk "Don't worry, you will continue to live, for my sake.";
     end;
 
 OnTimer15000:
-    npctalk strnpcinfo(0), "One piece of advice: get prepared!";
+    npctalk "One piece of advice: get prepared!";
     stopnpctimer;
     setnpctimer 0;
     donpcevent "#LuviaDaemon::OnCommandInvoke";