NPC dialogue revamp. Fix bug in 12 affected dialogues.

12 files changed, 15 insertions, 15 deletions

diff --git a/npc/000-0-0/q'onan.txt b/npc/000-0-0/q'onan.txt
index 5769c42b..18fc05d1 100644
--- a/npc/000-0-0/q'onan.txt
+++ b/npc/000-0-0/q'onan.txt
@@ -9,13 +9,13 @@
     set @q, rand(2);
     if (@q == 0) goto l_Zzz;
 
-    npctalk "Rrrr... Pchhhh...";
+    npctalk3 "Rrrr... Pchhhh...";
 
     close;
 
 l_Zzz:
 
-    npctalk "Zzzzzzzzz";
+    npctalk3 "Zzzzzzzzz";
 
     close;
 
diff --git a/npc/000-1/astapolos.txt b/npc/000-1/astapolos.txt
index 7664a67a..29edc84c 100644
--- a/npc/000-1/astapolos.txt
+++ b/npc/000-1/astapolos.txt
@@ -150,7 +150,7 @@ l_TaskDone:
     close;
 
 l_Whyning:
-    npctalk "Then leave me alone.";
+    npctalk3 "Then leave me alone.";
 
     closedialog;
     close;
diff --git a/npc/000-1/chest.txt b/npc/000-1/chest.txt
index 9db0850f..d502b04b 100644
--- a/npc/000-1/chest.txt
+++ b/npc/000-1/chest.txt
@@ -32,7 +32,7 @@ l_Give:
 
     set zeny, zeny + 100;
     getitem "OldBook", 1;
-    npctalk "You open the treasure chest.";
+    npctalk3 "You open the treasure chest.";
 
 l_Close:
     setnpcdir 6;
diff --git a/npc/000-1/darlin.txt b/npc/000-1/darlin.txt
index a37d34fa..a9ae6dd7 100644
--- a/npc/000-1/darlin.txt
+++ b/npc/000-1/darlin.txt
@@ -125,7 +125,7 @@ l_GoDown:
 
 l_Bye:
     setcamnpc;
-    npctalk "FINE, BYE!";
+    npctalk3 "FINE, BYE!";
 
     closedialog;
     close;
diff --git a/npc/000-1/silvio.txt b/npc/000-1/silvio.txt
index 0ddcaf25..b19e75a6 100644
--- a/npc/000-1/silvio.txt
+++ b/npc/000-1/silvio.txt
@@ -180,7 +180,7 @@ l_Sailors:
     close;
 
 l_Quit:
-    npctalk "Give me a kiss before you say goodbye!";
+    npctalk3 "Give me a kiss before you say goodbye!";
 
     closedialog;
     close;
diff --git a/npc/000-2-0/billybons.txt b/npc/000-2-0/billybons.txt
index b7b4f0f8..5a2439d3 100644
--- a/npc/000-2-0/billybons.txt
+++ b/npc/000-2-0/billybons.txt
@@ -72,7 +72,7 @@ l_Secret:
     close;
 
 l_Hic:
-    npctalk "*hic*";
+    npctalk3 "*hic*";
 
     close;
 
diff --git a/npc/000-2-0/doors.txt b/npc/000-2-0/doors.txt
index 366fba52..0bf32e55 100644
--- a/npc/000-2-0/doors.txt
+++ b/npc/000-2-0/doors.txt
@@ -49,7 +49,7 @@ l_GotoNard:
     close;
 
 l_End:
-    npctalk "The door is locked.";
+    npctalk3 "The door is locked.";
 
     close;
 }
diff --git a/npc/000-2-0/julia.txt b/npc/000-2-0/julia.txt
index c505efb2..dd1ee400 100644
--- a/npc/000-2-0/julia.txt
+++ b/npc/000-2-0/julia.txt
@@ -263,7 +263,7 @@ l_Rumors:
     close;
 
 l_Quit:
-    npctalk "Bye!";
+    npctalk3 "Bye!";
     closedialog;
     close;
 }
diff --git a/npc/000-2-1/chest.txt b/npc/000-2-1/chest.txt
index fe615679..a6214373 100644
--- a/npc/000-2-1/chest.txt
+++ b/npc/000-2-1/chest.txt
@@ -30,7 +30,7 @@ l_Give:
     setq ShipQuests_Arpan, 2;
     getitem "CreasedShirt", 1;
     getitem "CreasedShorts", 1;
-    npctalk "You take the clothes from the chest.";
+    npctalk3 "You take the clothes from the chest.";
     goto l_Quit;
 
 OnTimer220:
@@ -40,7 +40,7 @@ OnTimer220:
     end;
 
 l_Talk:
-    npctalk "You should talk to Magic Arpan first.";
+    npctalk3 "You should talk to Magic Arpan first.";
 
     close;
 
diff --git a/npc/000-2-1/devis.txt b/npc/000-2-1/devis.txt
index 06ed168d..6973735a 100644
--- a/npc/000-2-1/devis.txt
+++ b/npc/000-2-1/devis.txt
@@ -13,12 +13,12 @@
     goto l_Grm;
 
 l_Zzz:
-    npctalk "Zzzzzzzzz";
+    npctalk3 "Zzzzzzzzz";
 
     close;
 
 l_Grm:
-    npctalk "Ggrmm... Grmmmm...";
+    npctalk3 "Ggrmm... Grmmmm...";
 
     close;
 }
diff --git a/npc/000-2-1/q'onan.txt b/npc/000-2-1/q'onan.txt
index e2baa8ea..8f5dbb03 100644
--- a/npc/000-2-1/q'onan.txt
+++ b/npc/000-2-1/q'onan.txt
@@ -15,7 +15,7 @@
 
 l_Zzz:
 
-    npctalk "Zzzzzzzzz";
+    npctalk3 "Zzzzzzzzz";
 
     close;
 
diff --git a/npc/functions/savepoint.txt b/npc/functions/savepoint.txt
index d4b339ab..9a8eae78 100644
--- a/npc/functions/savepoint.txt
+++ b/npc/functions/savepoint.txt
@@ -6,7 +6,7 @@
 
 function	script	SavePoint	{
 
-    npctalk "Your position has been saved.";
+    npctalk3 "Your position has been saved.";
 
     savepoint @map$, @x, @y;
     set @q, getcharid(3);