change *strcharinfo to use constants

1 files changed, 51 insertions, 51 deletions

diff --git a/npc/events/christmas_2005.txt b/npc/events/christmas_2005.txt
index db2423e8f..795b50256 100644
--- a/npc/events/christmas_2005.txt
+++ b/npc/events/christmas_2005.txt
@@ -256,7 +256,7 @@ prontera,155,285,3	script	Enjoy#enjoy	4_M_MONK,{
 			mes "and tell him about our plan.";
 			mes "On a way back, bring as many phalanges as you can. ";
 			next;
-			mes "["+ strcharinfo(0) +"]";
+			mes "["+ strcharinfo(PC_NAME) +"]";
 			mes "Alright,sir!!!";
 			next;
 			mes "[Enjoy]";
@@ -272,7 +272,7 @@ prontera,155,285,3	script	Enjoy#enjoy	4_M_MONK,{
 			mes "We are not being jealous,";
 			mes "It's just not right leading a loose life!";
 			next;
-			mes "["+ strcharinfo(0) +"]";
+			mes "["+ strcharinfo(PC_NAME) +"]";
 			mes "Let's punish!!!!!!!!!!!!!!!!!!!!!!!!!!!";
 			christ_solo05 = 1;
 			close;
@@ -336,7 +336,7 @@ prontera,155,285,3	script	Enjoy#enjoy	4_M_MONK,{
 			mes "Fine!!";
 			mes "You are all ready!!!";
 			next;
-			mes "["+ strcharinfo(0) +"]";
+			mes "["+ strcharinfo(PC_NAME) +"]";
 			mes "Wait!!";
 			mes "Where's other people??";
 			next;
@@ -352,7 +352,7 @@ prontera,155,285,3	script	Enjoy#enjoy	4_M_MONK,{
 			donpcevent "Mas#mas02::OnCommandOn";
 			donpcevent "Event#event02::OnCommandOn";
 			next;
-			mes "["+ strcharinfo(0) +"]";
+			mes "["+ strcharinfo(PC_NAME) +"]";
 			mes "Oh.. Yup!!!";
 			next;
 			mes "[Enjoy]";
@@ -416,32 +416,32 @@ prontera,155,285,3	script	Enjoy#enjoy	4_M_MONK,{
 			donpcevent "Mas#mas02::OnCommandOff";
 			donpcevent "Event#event02::OnCommandOff";
 			close2;
-			mapannounce "prontera", "Single soldiers "+ strcharinfo(0) +"'s sorrow spread all over the town.",bc_map,0x66FFCC;
-			monster "prontera",155,300,""+ strcharinfo(0) +"'s anguish",1062,1,"Enjoy#enjoy::OnMyMobDead";
-			monster "prontera",156,300,""+ strcharinfo(0) +"'s jealousy",1062,1,"Enjoy#enjoy::OnMyMobDead";
-			monster "prontera",157,300,""+ strcharinfo(0) +"'s despair",1062,1,"Enjoy#enjoy::OnMyMobDead";
-			monster "prontera",158,300,""+ strcharinfo(0) +"'s frustration",1062,1,"Enjoy#enjoy::OnMyMobDead";
-			monster "prontera",154,300,""+ strcharinfo(0) +"'s bombing",1062,1,"Enjoy#enjoy::OnMyMobDead";
-			monster "prontera",158,299,""+ strcharinfo(0) +"'s grudge",1246,1,"Enjoy#enjoy::OnMyMobDead";
-			monster "prontera",157,299,""+ strcharinfo(0) +"'s curse",1246,1,"Enjoy#enjoy::OnMyMobDead";
-			monster "prontera",156,299,""+ strcharinfo(0) +"'s anger",1246,1,"Enjoy#enjoy::OnMyMobDead";
-			monster "prontera",155,299,""+ strcharinfo(0) +"'s grief",1246,1,"Enjoy#enjoy::OnMyMobDead";
-			monster "prontera",154,299,""+ strcharinfo(0) +"'s hatred",1246,1,"Enjoy#enjoy::OnMyMobDead";
-			monster "prontera",158,298,""+ strcharinfo(0) +"'s a bitter taste of solo",1245,1,"Enjoy#enjoy::OnMyMobDead";
-			monster "prontera",157,298,""+ strcharinfo(0) +"'s couple punisher",1245,1,"Enjoy#enjoy::OnMyMobDead";
-			monster "prontera",156,298,""+ strcharinfo(0) +"'s loneliness",1245,1,"Enjoy#enjoy::OnMyMobDead";
-			monster "prontera",155,298,""+ strcharinfo(0) +"'s sobbing",1245,1,"Enjoy#enjoy::OnMyMobDead";
-			monster "prontera",154,298,""+ strcharinfo(0) +"'s darkness",1245,1,"Enjoy#enjoy::OnMyMobDead";
-			monster "prontera",158,297,""+ strcharinfo(0) +"'s depression",1244,1,"Enjoy#enjoy::OnMyMobDead";
-			monster "prontera",157,297,""+ strcharinfo(0) +"'s estrangement",1244,1,"Enjoy#enjoy::OnMyMobDead";
-			monster "prontera",156,297,""+ strcharinfo(0) +"'s nightmare",1244,1,"Enjoy#enjoy::OnMyMobDead";
-			monster "prontera",155,297,""+ strcharinfo(0) +"'s wail",1244,1,"Enjoy#enjoy::OnMyMobDead";
-			monster "prontera",154,297,""+ strcharinfo(0) +"'s whisper",1244,1,"Enjoy#enjoy::OnMyMobDead";
-			monster "prontera",158,296,""+ strcharinfo(0) +"'s regret",1588,1,"Enjoy#enjoy::OnMyMobDead";
-			monster "prontera",157,296,""+ strcharinfo(0) +"'s shadow",1588,1,"Enjoy#enjoy::OnMyMobDead";
-			monster "prontera",156,296,""+ strcharinfo(0) +"'s couplebreaker",1588,1,"Enjoy#enjoy::OnMyMobDead";
-			monster "prontera",155,296,""+ strcharinfo(0) +"'s sadness",1588,1,"Enjoy#enjoy::OnMyMobDead";
-			monster "prontera",154,296,""+ strcharinfo(0) +"'s symbol of brokenheart",1588,1,"Enjoy#enjoy::OnMyMobDead";
+			mapannounce "prontera", "Single soldiers "+ strcharinfo(PC_NAME) +"'s sorrow spread all over the town.",bc_map,0x66FFCC;
+			monster "prontera",155,300,""+ strcharinfo(PC_NAME) +"'s anguish",1062,1,"Enjoy#enjoy::OnMyMobDead";
+			monster "prontera",156,300,""+ strcharinfo(PC_NAME) +"'s jealousy",1062,1,"Enjoy#enjoy::OnMyMobDead";
+			monster "prontera",157,300,""+ strcharinfo(PC_NAME) +"'s despair",1062,1,"Enjoy#enjoy::OnMyMobDead";
+			monster "prontera",158,300,""+ strcharinfo(PC_NAME) +"'s frustration",1062,1,"Enjoy#enjoy::OnMyMobDead";
+			monster "prontera",154,300,""+ strcharinfo(PC_NAME) +"'s bombing",1062,1,"Enjoy#enjoy::OnMyMobDead";
+			monster "prontera",158,299,""+ strcharinfo(PC_NAME) +"'s grudge",1246,1,"Enjoy#enjoy::OnMyMobDead";
+			monster "prontera",157,299,""+ strcharinfo(PC_NAME) +"'s curse",1246,1,"Enjoy#enjoy::OnMyMobDead";
+			monster "prontera",156,299,""+ strcharinfo(PC_NAME) +"'s anger",1246,1,"Enjoy#enjoy::OnMyMobDead";
+			monster "prontera",155,299,""+ strcharinfo(PC_NAME) +"'s grief",1246,1,"Enjoy#enjoy::OnMyMobDead";
+			monster "prontera",154,299,""+ strcharinfo(PC_NAME) +"'s hatred",1246,1,"Enjoy#enjoy::OnMyMobDead";
+			monster "prontera",158,298,""+ strcharinfo(PC_NAME) +"'s a bitter taste of solo",1245,1,"Enjoy#enjoy::OnMyMobDead";
+			monster "prontera",157,298,""+ strcharinfo(PC_NAME) +"'s couple punisher",1245,1,"Enjoy#enjoy::OnMyMobDead";
+			monster "prontera",156,298,""+ strcharinfo(PC_NAME) +"'s loneliness",1245,1,"Enjoy#enjoy::OnMyMobDead";
+			monster "prontera",155,298,""+ strcharinfo(PC_NAME) +"'s sobbing",1245,1,"Enjoy#enjoy::OnMyMobDead";
+			monster "prontera",154,298,""+ strcharinfo(PC_NAME) +"'s darkness",1245,1,"Enjoy#enjoy::OnMyMobDead";
+			monster "prontera",158,297,""+ strcharinfo(PC_NAME) +"'s depression",1244,1,"Enjoy#enjoy::OnMyMobDead";
+			monster "prontera",157,297,""+ strcharinfo(PC_NAME) +"'s estrangement",1244,1,"Enjoy#enjoy::OnMyMobDead";
+			monster "prontera",156,297,""+ strcharinfo(PC_NAME) +"'s nightmare",1244,1,"Enjoy#enjoy::OnMyMobDead";
+			monster "prontera",155,297,""+ strcharinfo(PC_NAME) +"'s wail",1244,1,"Enjoy#enjoy::OnMyMobDead";
+			monster "prontera",154,297,""+ strcharinfo(PC_NAME) +"'s whisper",1244,1,"Enjoy#enjoy::OnMyMobDead";
+			monster "prontera",158,296,""+ strcharinfo(PC_NAME) +"'s regret",1588,1,"Enjoy#enjoy::OnMyMobDead";
+			monster "prontera",157,296,""+ strcharinfo(PC_NAME) +"'s shadow",1588,1,"Enjoy#enjoy::OnMyMobDead";
+			monster "prontera",156,296,""+ strcharinfo(PC_NAME) +"'s couplebreaker",1588,1,"Enjoy#enjoy::OnMyMobDead";
+			monster "prontera",155,296,""+ strcharinfo(PC_NAME) +"'s sadness",1588,1,"Enjoy#enjoy::OnMyMobDead";
+			monster "prontera",154,296,""+ strcharinfo(PC_NAME) +"'s symbol of brokenheart",1588,1,"Enjoy#enjoy::OnMyMobDead";
 			donpcevent "Enjoy#enjoy::OnCommandGo";
 			end;
 		}
@@ -607,7 +607,7 @@ prontera,188,177,4	script	Happymerry#happymerry	4_M_LGTMAN,{
 		mes "I hate christmas~!";
 		emotion e_sob;
 		next;
-		mes "["+ strcharinfo(0) +"]";
+		mes "["+ strcharinfo(PC_NAME) +"]";
 		mes "Are...you...?";
 		next;
 		mes "[Happymerry]";
@@ -618,7 +618,7 @@ prontera,188,177,4	script	Happymerry#happymerry	4_M_LGTMAN,{
 		mes "Blessing? Gloria~~?!";
 		mes "Couples~~duh~!!!!!!";
 		next;
-		mes "["+ strcharinfo(0) +"]";
+		mes "["+ strcharinfo(PC_NAME) +"]";
 		mes "You seem to be the right one!!!";
 		mes "Enjoy is waiting for you.";
 		mes "let's go!!!";
@@ -637,7 +637,7 @@ prontera,188,177,4	script	Happymerry#happymerry	4_M_LGTMAN,{
 		mes "So,where is Enjoy?";
 		mes "Where is he?!";
 		next;
-		mes "["+ strcharinfo(0) +"]";
+		mes "["+ strcharinfo(PC_NAME) +"]";
 		mes "He's waiting for you!";
 		mes "Go ahead~";
 		mes "I'll follow you after contacting others.";
@@ -689,7 +689,7 @@ prontera,62,339,3	script	Christ#christ	4_M_PECOKNIGHT,{
 		mes "Only thing I need is this chubby Pecopeco~!";
 		mes "";
 		next;
-		mes "["+ strcharinfo(0) +"]";
+		mes "["+ strcharinfo(PC_NAME) +"]";
 		mes "Um...";
 		next;
 		mes "[Christ]";
@@ -706,14 +706,14 @@ prontera,62,339,3	script	Christ#christ	4_M_PECOKNIGHT,{
 		mes "I'm not gonna be lonely~";
 		mes "No I won't!!!";
 		next;
-		mes "["+ strcharinfo(0) +"]";
+		mes "["+ strcharinfo(PC_NAME) +"]";
 		mes "Actually Enjoy told me...";
 		next;
 		mes "[Christ]";
 		mes "Huh? What did you say?";
 		mes "Enjoy? You know him? Then,you must be the one whom Happymerry sent!?";
 		next;
-		mes "["+ strcharinfo(0) +"]";
+		mes "["+ strcharinfo(PC_NAME) +"]";
 		mes "Yes~ Happymerry sent me...";
 		next;
 		mes "[Christ]";
@@ -783,7 +783,7 @@ prontera,163,66,7	script	Mas#mas	4_M_ALCHE_A,{
 		mes "No time to waste~~";
 		mes "Let's dig herbs.......";
 		next;
-		mes "["+ strcharinfo(0) +"]";
+		mes "["+ strcharinfo(PC_NAME) +"]";
 		mes "Hey~are you ok? Are you Mas?";
 		next;
 		mes "[Mas]";
@@ -794,7 +794,7 @@ prontera,163,66,7	script	Mas#mas	4_M_ALCHE_A,{
 		mes "Never mind!! What am I thinking?!!";
 		mes "Get away~I have dig herbs~";
 		next;
-		mes "["+ strcharinfo(0) +"]";
+		mes "["+ strcharinfo(PC_NAME) +"]";
 		mes "Mas!!";
 		mes "Are you ok?!";
 		mes "Christ sent me.";
@@ -809,7 +809,7 @@ prontera,163,66,7	script	Mas#mas	4_M_ALCHE_A,{
 		mes "[Mas]";
 		mes "...Are going with me?";
 		next;
-		mes "["+ strcharinfo(0) +"]";
+		mes "["+ strcharinfo(PC_NAME) +"]";
 		mes "No~~";
 		mes "I have something left to do.";
 		mes "I have to tell others about this.";
@@ -854,14 +854,14 @@ prontera,35,209,5	script	Event#event	4_M_SITDOWN,{
 		mes "[Event]";
 		mes "........................";
 		next;
-		mes "["+ strcharinfo(0) +"]";
+		mes "["+ strcharinfo(PC_NAME) +"]";
 		mes "...Are... you...?";
 		next;
 		mes "[Event]";
 		mes "...I love you too~!!!";
 		emotion e_omg,1;
 		next;
-		mes "["+ strcharinfo(0) +"]";
+		mes "["+ strcharinfo(PC_NAME) +"]";
 		mes "(Oh,my..)";
 		next;
 		mes "[Event]";
@@ -875,7 +875,7 @@ prontera,35,209,5	script	Event#event	4_M_SITDOWN,{
 		//Emotion "Event#event" ET_KIK
 		emotion e_kis;
 		next;
-		mes "["+ strcharinfo(0) +"]";
+		mes "["+ strcharinfo(PC_NAME) +"]";
 		mes "Mas sent me here.";
 		mes "You know about Enjoy's plan, right?";
 		mes "...Are you listening?";
@@ -896,7 +896,7 @@ prontera,35,209,5	script	Event#event	4_M_SITDOWN,{
 		mes "-and packed his stuff and bowed to Kafra.-";
 		mes "";
 		next;
-		mes "["+ strcharinfo(0) +"]";
+		mes "["+ strcharinfo(PC_NAME) +"]";
 		mes "Finally!!! Done telling everyone!!";
 		mes "Now I should get my ^0000FFBranch of Dead Tree^000000s packed up";
 		mes "and go punish singles!!!";
@@ -914,7 +914,7 @@ prontera,35,209,5	script	Event#event	4_M_SITDOWN,{
 		mes "-He  talked to his right hand-";
 		mes "-and packed his stuff and bowed to Kafra.-";
 		next;
-		mes "["+ strcharinfo(0) +"]";
+		mes "["+ strcharinfo(PC_NAME) +"]";
 		mes "Finally!!! Done telling everyone!!";
 		mes "Now I should get my things packed up";
 		mes "and go punish singles!!!";
@@ -929,7 +929,7 @@ prontera,35,209,5	script	Event#event	4_M_SITDOWN,{
 		mes "...I love you too~!!!";
 		emotion e_omg,1;
 		next;
-		mes "["+ strcharinfo(0) +"]";
+		mes "["+ strcharinfo(PC_NAME) +"]";
 		mes "(Oh.my~)";
 		next;
 		mes "[Event]";
@@ -1055,7 +1055,7 @@ prontera,156,242,0	script	Oholy#pron::OholyDup	1_F_PRIEST,{
 			next;
 			mes "[Oholy]";
 			mes "Well, please bring me back";
-			mes "Christmas carol music book, "+ strcharinfo(0) +".";
+			mes "Christmas carol music book, "+ strcharinfo(PC_NAME) +".";
 			mes "That little devil will be still";
 			mes "in the town because it only happened a few minutes ago.";
 			next;
@@ -1168,7 +1168,7 @@ prontera,156,242,0	script	Oholy#pron::OholyDup	1_F_PRIEST,{
 			mes "-You started humming then,-";
 			mes "-began to sing the next phase-";
 			next;
-			mes "["+ strcharinfo(0) +"]";
+			mes "["+ strcharinfo(PC_NAME) +"]";
 			mes "~Soon the snowflackes will fall~";
 			mes "~and tomorrow you'll see~";
 			mes "~Every wish, one and all,~";
@@ -1414,7 +1414,7 @@ function	script	F_carol_devi	{
 		mes "soul and be bound in a beneficial contract with me?";
 		emotion e_kis;
 		next;
-		mes "["+ strcharinfo(0) +"]";
+		mes "["+ strcharinfo(PC_NAME) +"]";
 		mes "Hey, you! Deviruchi!!!";
 		mes "What a brat!!! Gotcha!";
 		next;
@@ -1437,7 +1437,7 @@ function	script	F_carol_devi	{
 			enablenpc getarg(1);
 			disablenpc getarg(0);
 			next;
-			mes "["+ strcharinfo(0) +"]";
+			mes "["+ strcharinfo(PC_NAME) +"]";
 			mes "Rudolph... If... Foggy...";
 			mes "Sledge... Reindeer...";
 			mes "Hmm, I think I got what I need.";
@@ -1505,7 +1505,7 @@ function	script	F_carol_devi	{
 		mes "soul and be bound in a beneficial contract with me?";
 		emotion e_omg;
 		next;
-		mes "["+ strcharinfo(0) +"]";
+		mes "["+ strcharinfo(PC_NAME) +"]";
 		mes "Hey, you! Deviruchi!!!";
 		mes "What a brat!!! Gotcha!";
 		next;
@@ -1535,7 +1535,7 @@ function	script	F_carol_devi2	{
 	mes "soul and be bound in a beneficial contract with me?";
 	emotion e_omg;
 	next;
-	mes "["+ strcharinfo(0) +"]";
+	mes "["+ strcharinfo(PC_NAME) +"]";
 	mes "Hey, you! Deviruchi!!!";
 	mes "What a brat!!! Gotcha!";
 	next;