change *strcharinfo to use constants

11 files changed, 57 insertions, 57 deletions

diff --git a/npc/re/instances/BakonawaLake.txt b/npc/re/instances/BakonawaLake.txt
index 8e1afe859..8214a3039 100644
--- a/npc/re/instances/BakonawaLake.txt
+++ b/npc/re/instances/BakonawaLake.txt
@@ -104,7 +104,7 @@ ma_scene01,174,179,4	script	Taho	4_M_DEWZATIMAN,{
 				mes "The party leader did not generate the dungeon yet.";
 				close;
 			} else {
-				mapannounce "ma_scene01","A party member, "+strcharinfo(0)+" of the party "+getpartyname(.@party_id)+" is entering the dungeon, "+.@md_name$+".",bc_map,"0x00ff99"; //FW_NORMAL 12 0 0
+				mapannounce "ma_scene01","A party member, "+strcharinfo(PC_NAME)+" of the party "+getpartyname(.@party_id)+" is entering the dungeon, "+.@md_name$+".",bc_map,"0x00ff99"; //FW_NORMAL 12 0 0
 				setquest 12278;
 				warp "1@ma_b",64,51;
 				end;
diff --git a/npc/re/instances/BangungotHospital.txt b/npc/re/instances/BangungotHospital.txt
index 66ed61f8a..d45fdfc23 100644
--- a/npc/re/instances/BangungotHospital.txt
+++ b/npc/re/instances/BangungotHospital.txt
@@ -267,7 +267,7 @@ L_Enter:
 		mes "appeared again.";
 		next;
 		mes "[Nurse Maenne]";
-		mes strcharinfo(0) + "'s help";
+		mes strcharinfo(PC_NAME) + "'s help";
 		mes "is needed again.";
 		mes "Please, could you give me";
 		mes "one more chance?";
@@ -312,7 +312,7 @@ L_Enter:
 			mes "The party leader did not generate the dungeon yet.";
 			close;
 		} else {
-			mapannounce "ma_dun01", getpartyname(getcharid(1))+" party's "+strcharinfo(0)+" member entered "+.@md_name$+".",bc_map,"0x00ff99";
+			mapannounce "ma_dun01", getpartyname(getcharid(1))+" party's "+strcharinfo(PC_NAME)+" member entered "+.@md_name$+".",bc_map,"0x00ff99";
 			if (getarg(1)) {
 				if (questprogress(9223)) {
 					completequest 9223;
@@ -382,7 +382,7 @@ sec_in02,27,30,0	script	Bangungot Gate	2_MONEMUS,{
 	end;
 OnTouch:
 	.@map$ = instance_mapname("1@ma_h");
-	mapannounce .@map$,"Bangungot: You silly "+strcharinfo(0)+" ....",bc_map,"0xFF82FF";
+	mapannounce .@map$,"Bangungot: You silly "+strcharinfo(PC_NAME)+" ....",bc_map,"0xFF82FF";
 	mapannounce .@map$,"Bangungot: Get out before you die...",bc_map,"0xFF82FF";
 	areamonster .@map$,44,156,46,158,"Bangungot's Mangkukulam",2339,1,instance_npcname("#Memorial Start")+"::OnMyMobDead";
 	donpcevent instance_npcname("#Memorial Start_time")+"::OnEnable";
diff --git a/npc/re/instances/BuwayaCave.txt b/npc/re/instances/BuwayaCave.txt
index 8d1639ea1..878000d0f 100644
--- a/npc/re/instances/BuwayaCave.txt
+++ b/npc/re/instances/BuwayaCave.txt
@@ -98,7 +98,7 @@ ma_fild02,312,317,5	script	Guard#buwaya_cave	4_MAL_SOLDIER,{
 				if (.@instance < 0) {
 					mes "[Guard]";
 					mes "Party name is... "+getpartyname(.@party_id)+".";;
-					mes "Party leader is... "+strcharinfo(0);
+					mes "Party leader is... "+strcharinfo(PC_NAME);
 					mes "^0000ff"+.@md_name$+"^000000 cannot be opened now.";
 					mes "Please try a moment later.";
 					close;
@@ -159,7 +159,7 @@ OnTouch:
 			mes "The party leader did not generate the dungeon yet.";
 			close;
 		} else {
-			mapannounce "ma_fild02",getpartyname(getcharid(1))+" party's "+strcharinfo(0)+" member began hunting Buwaya in Buwaya Cave.",bc_map,"0x00ff99"; //FW_NORMAL 12 0 0
+			mapannounce "ma_fild02",getpartyname(getcharid(1))+" party's "+strcharinfo(PC_NAME)+" member began hunting Buwaya in Buwaya Cave.",bc_map,"0x00ff99"; //FW_NORMAL 12 0 0
 			setquest 4229;
 			warp "1@ma_c",35,57;
 			end;
diff --git a/npc/re/instances/EclageInterior.txt b/npc/re/instances/EclageInterior.txt
index 9ee105bb9..9b232ac99 100644
--- a/npc/re/instances/EclageInterior.txt
+++ b/npc/re/instances/EclageInterior.txt
@@ -114,7 +114,7 @@ ecl_hub01,130,15,0	script	It is closed shut.	CLEAR_NPC,{
 						close;
 					}
 					close2;
-					mapannounce "ecl_hub01",getpartyname(.@party_id) + " Party leader " + strcharinfo(0) + " is entering " + .@md_name$,bc_map,"0x00ff99";
+					mapannounce "ecl_hub01",getpartyname(.@party_id) + " Party leader " + strcharinfo(PC_NAME) + " is entering " + .@md_name$,bc_map,"0x00ff99";
 					warp "1@ecl",60,50;
 					end;
 				}
@@ -145,7 +145,7 @@ ecl_hub01,130,15,0	script	It is closed shut.	CLEAR_NPC,{
 	mes "Farewell, then!";
 	specialeffect EF_BEGINSPELL3;
 	next;
-	mes "[" + strcharinfo(0) + "]";
+	mes "[" + strcharinfo(PC_NAME) + "]";
 	mes "No...way!!!";
 	specialeffect2 EF_LORD;
 	percentheal -99,0;
@@ -228,7 +228,7 @@ OnTouch:
     next;
     mes "We couldn't communicate with them either, and one of them seemed furious after looking around and finding out that its fellows are defeated.";
     next;
-    mes "[" + strcharinfo(0) + "]";
+    mes "[" + strcharinfo(PC_NAME) + "]";
     mes "They look as if they are incarnation of Morroc.";
     mes "Is the King of Domons after the Orb?";
     mes "Or is it just a coincidence?";
@@ -368,7 +368,7 @@ OnInstanceInit:
 	next;
 	cutin "minuel01",4;
 	mes "[Minuel]";
-	mes "" + strcharinfo(0) + "Sir,";
+	mes "" + strcharinfo(PC_NAME) + "Sir,";
 	mes "Although you're detained on suspicion of being responsible for the recent incident in the lighting room,";
 	mes "there are some witnesses to prove your innocence.";
 	next;
@@ -416,7 +416,7 @@ OnInstanceInit:
 	cutin "",255;
 	mes "[Loki]";
 	mes "It's because of this.";
-	mes "" + strcharinfo(0) + "It was inside the body of -";
+	mes "" + strcharinfo(PC_NAME) + "It was inside the body of -";
 	mes "This is how powerful Shenime is.";
 	next;
 	mes "On Loki's palm, there rested a small, thin, and dried piece of thorn.";
@@ -433,7 +433,7 @@ OnInstanceInit:
 	mes "His power enbales him to control another person directly or mentally influence that person indirectly through a part of his body.";
 	next;
 	select("Now that I think about it...");
-	mes "[" + strcharinfo(0) + "]";
+	mes "[" + strcharinfo(PC_NAME) + "]";
 	mes "Right before coming here, Shenime reached his hand out to me and I felt a spark when I held his hand.";
 	mes "I thought it was just my imagination and ignored it...maybe that's when he...";
 	next;
@@ -456,7 +456,7 @@ OnInstanceInit:
 	next;
 	mes "[Nydhog]";
 	mes "I swear by the name of the guardian of Yggdrasil, too.";
-	mes "" + strcharinfo(0) + "- will by no means do such a thing.";
+	mes "" + strcharinfo(PC_NAME) + "- will by no means do such a thing.";
 	next;
 	cutin "hisie02",0;
 	mes "[Hisie]";
@@ -479,7 +479,7 @@ OnInstanceInit:
 	cutin "",255;
 	mes "[Loki]";
 	mes "Someone has to take the responsibility here then.";
-	mes "In all probablility," + strcharinfo(0) + "it will be you.";
+	mes "In all probablility," + strcharinfo(PC_NAME) + "it will be you.";
 	next;
 	cutin "hisie02",0;
 	mes "[Hisie]";
@@ -504,7 +504,7 @@ OnInstanceInit:
 	mes "[Hisie]";
 	mes "Thank you for your help.";
 	mes "We will take off now.";
-	mes "Let's go." + strcharinfo(0) + ".";
+	mes "Let's go." + strcharinfo(PC_NAME) + ".";
 	ep14_2_mylord = 30;
 	changequest 7450,7451;
 	erasequest 7450;
diff --git a/npc/re/instances/HazyForest.txt b/npc/re/instances/HazyForest.txt
index c5e37ee3b..7b12e1649 100644
--- a/npc/re/instances/HazyForest.txt
+++ b/npc/re/instances/HazyForest.txt
@@ -101,7 +101,7 @@ bif_fild01,158,340,5	script	Laphine Soldier#mist	4_M_FAIRYSOLDIER,{
 		case 1:
 			mes "[Laphine Soldier]";
 			mes "Party Name "+getpartyname(.@party_id)+"...";
-			mes "Party Leader "+strcharinfo(0)+"...";
+			mes "Party Leader "+strcharinfo(PC_NAME)+"...";
 			.@instance = instance_create(.@md_name$, .@party_id);
 			if (.@instance < 0) {
 				mes "Hmm...";
@@ -177,7 +177,7 @@ bif_fild01,161,355,0	script	Log Tunnel	CLEAR_NPC,{
 	} else {
 		if (questprogress(7211,PLAYTIME) == 2) erasequest 7211;
 		if (!questprogress(7211,PLAYTIME)) setquest 7211;
-		mapannounce "bif_fild01",getpartyname(getcharid(1))+" party's "+strcharinfo(0)+" member is entering the Mistwood Maze.",bc_map,"0x00ff99"; //FW_NORMAL 12 0 0
+		mapannounce "bif_fild01",getpartyname(getcharid(1))+" party's "+strcharinfo(PC_NAME)+" member is entering the Mistwood Maze.",bc_map,"0x00ff99"; //FW_NORMAL 12 0 0
 		warp "1@mist",89,29;
 		close;
 	}
@@ -581,12 +581,12 @@ OnTimer3000:
 		mes "That's my name.";
 		mes "And yours?";
 		next;
-		mes "["+strcharinfo(0)+"]";
+		mes "["+strcharinfo(PC_NAME)+"]";
 		mes "....";
-		mes "...."+strcharinfo(0)+" sir.";
+		mes "...."+strcharinfo(PC_NAME)+" sir.";
 		next;
 		mes "[Loki]";
-		mes "I see. "+strcharinfo(0)+".";
+		mes "I see. "+strcharinfo(PC_NAME)+".";
 		mes "I'm asking you again.";
 		mes "Do you plan to pass through this forest?";
 		next;
@@ -905,7 +905,7 @@ mora,48,152,3	script	Sharp Eyed Man	4_M_ROKI2,{
 			break;
 		}
 		mes "[Nydhogg the Guardian]";
-		mes strcharinfo(0)+"...";
+		mes strcharinfo(PC_NAME)+"...";
 		mes "Thanks for listening to my long story.";
 		next;
 		mes "[Nydhogg the Guardian]";
diff --git a/npc/re/instances/MalangdoCulvert.txt b/npc/re/instances/MalangdoCulvert.txt
index ff472e23d..e44fed03b 100644
--- a/npc/re/instances/MalangdoCulvert.txt
+++ b/npc/re/instances/MalangdoCulvert.txt
@@ -422,7 +422,7 @@ mal_in01,160,34,4	script	Missing, the Cleaner	4_CAT_SAILOR2,{
 				.@instance = instance_create(.@md_name$,.@party_id);
 				if (.@instance < 0) {
 					mes "Party name: "+getpartyname(.@party_id);
-					mes "Party leader: "+strcharinfo(0);
+					mes "Party leader: "+strcharinfo(PC_NAME);
 					mes "^0000ff"+.@md_name$+"^000000 - Reservation Failed!";
 					close;
 				}
@@ -468,7 +468,7 @@ L_Enter:
 		mes "The party leader has not reserved entrance to the dungeon yet.";
 		close;
 	}
-	mapannounce "mal_in01", strcharinfo(0)+" of the party "+getpartyname(.@party_id)+" is entering the Culvert.",bc_map,"0x00ff99";
+	mapannounce "mal_in01", strcharinfo(PC_NAME)+" of the party "+getpartyname(.@party_id)+" is entering the Culvert.",bc_map,"0x00ff99";
 	if (!questprogress(12254)) setquest 12254;
 	warp "1@pump",63,98;
 	end;
@@ -761,7 +761,7 @@ OnEnable:
 	copyarray .@partymemberaid[0],$@partymemberaid[0],$@partymembercount;
 	for(.@i = 0; .@i<$@partymembercount; ++.@i) {
 		if (attachrid(.@partymemberaid[.@i])) {
-			if (strcharinfo(3) == .@map$)
+			if (strcharinfo(PC_MAP) == .@map$)
 				viewpoint 0,.@x,.@y,.@index,0xFFFF00;
 			detachrid;
 		}
diff --git a/npc/re/instances/OctopusCave.txt b/npc/re/instances/OctopusCave.txt
index c2087649c..84b323361 100644
--- a/npc/re/instances/OctopusCave.txt
+++ b/npc/re/instances/OctopusCave.txt
@@ -108,7 +108,7 @@ mal_dun01,151,235,5	script	Starfish	4_ASTER,{
 				if (.@instance < 0) {
 					mes "[Starfish]";
 					mes "Party name is... "+getpartyname(.@party_id)+".";
-					mes "Party leader is... "+strcharinfo(0)+".";
+					mes "Party leader is... "+strcharinfo(PC_NAME)+".";
 					mes "^0000ff"+.@md_name$+"^000000, I cannot open now, hehe.";
 					mes "Now is not the time, please wait.";
 					close;
@@ -161,7 +161,7 @@ mal_dun01,153,237,5	script	Weird Entrance	CLEAR_NPC,{
 				mes "Big trouble is waiting, if you go in now.";
 				close;
 			}
-			mapannounce "mal_dun01", getpartyname(getcharid(1))+" party's "+strcharinfo(0)+" member started to hunt the Octopus!",bc_map,"0x00ff99";
+			mapannounce "mal_dun01", getpartyname(getcharid(1))+" party's "+strcharinfo(PC_NAME)+" member started to hunt the Octopus!",bc_map,"0x00ff99";
 			if (!questprogress(4197)) setquest 4197;
 			warp "1@cash",199,99;
 			end;
diff --git a/npc/re/instances/OldGlastHeim.txt b/npc/re/instances/OldGlastHeim.txt
index 329bee220..3bef4589d 100644
--- a/npc/re/instances/OldGlastHeim.txt
+++ b/npc/re/instances/OldGlastHeim.txt
@@ -114,7 +114,7 @@ glast_01,204,273,6	script	Hugin#ghinstance	4_M_SAGE_C,{
 			.@instance = instance_create(.@md_name$, .@party_id);
 			if (.@instance < 0) {
 				mesf("Party Name: %s", .@p_name$);
-				mesf("Party Leader: %s", strcharinfo(0));
+				mesf("Party Leader: %s", strcharinfo(PC_NAME));
 				mesf("^0000ff%s^000000 - Reservation Failed!", .@md_name$);
 				close;
 			}
@@ -134,7 +134,7 @@ glast_01,204,273,6	script	Hugin#ghinstance	4_M_SAGE_C,{
 						"The party leader did not generate the dungeon yet.", .@md_name$);
 				close;
 			}
-			mapannounce("glast_01", sprintf(_$("%s, member of the party %s entered the instance %s."), strcharinfo(0), .@p_name$, .@md_name$), bc_map, C_SPRINGGREEN);
+			mapannounce("glast_01", sprintf(_$("%s, member of the party %s entered the instance %s."), strcharinfo(PC_NAME), .@p_name$, .@md_name$), bc_map, C_SPRINGGREEN);
 			setquest 12317;
 			warp "1@gl_k", 150, 20;
 			end;
@@ -179,7 +179,7 @@ glast_01,204,273,6	script	Hugin#ghinstance	4_M_SAGE_C,{
 	npctalk(_("Are you the one Herico sent to help me?"));
 	next;
 	select("Oh. Well I...");
-	mesf("[%s]", strcharinfo(0));
+	mesf("[%s]", strcharinfo(PC_NAME));
 	mes("Ah yes, I am. Herico told me to meet you.");
 	unittalk(getcharid(3), _("Ah yes, I am. Herico told me to meet you."));
 	next;
@@ -189,7 +189,7 @@ glast_01,204,273,6	script	Hugin#ghinstance	4_M_SAGE_C,{
 	npctalk(_("We don't have much time. We must report to Sir. Heinrich about Himelmez's invasion."));
 	next;
 	select("Himelmez...");
-	mesf("[%s]", strcharinfo(0));
+	mesf("[%s]", strcharinfo(PC_NAME));
 	mes("Who is Himelmez?");
 	unittalk(getcharid(3), _("Who is Himelmez?"));
 	next;
@@ -287,7 +287,7 @@ OnEnable:
 	}
 	cutin("gl_heinrich2", 2);
 	select("Sir. Heinrich. Varmundt...");
-	mesf("[%s]", strcharinfo(0));
+	mesf("[%s]", strcharinfo(PC_NAME));
 	mes("Sir. Heinrich. Do you know what is happening in the castle now?");
 	unittalk(getcharid(3), _("Sir. Heinrich. Do you know what is happening in the castle now?"));
 	next;
@@ -300,7 +300,7 @@ OnEnable:
 	npctalk(_("What is it? Something wrong with the castle?"));
 	next;
 	select("Himelmez's invasion...");
-	mesf("[%s]", strcharinfo(0));
+	mesf("[%s]", strcharinfo(PC_NAME));
 	mes("Dead man's Valkyrie, Himelmez is coming to take the Ymir's Heart piece hidden inside this castle!");
 	unittalk(getcharid(3), _("Dead man's Valkyrie, Himelmez is coming to take the Ymir's Heart piece hidden inside this castle!"));
 	next;
@@ -319,7 +319,7 @@ OnEnable:
 	npctalk(_("We must hide the heart piece to a safe place before Himelmez's attack starts!"), instance_npcname("Varmundt#ghinstance2"));
 	next;
 	select("Even if you don't believe me...");
-	mesf("[%s]", strcharinfo(0));
+	mesf("[%s]", strcharinfo(PC_NAME));
 	mes("I can't make you believe me, but there's no time to argue!");
 	unittalk(getcharid(3), _("I can't make you believe me, but there's no time to argue!"));
 	cutin("gl_barmund2", 255);
@@ -811,7 +811,7 @@ OnMyMobDead:
 	npctalk(_("Save me! Save me!!!"));
 	next;
 	select("Hold on!Are you the only survivor?");
-	mesf("[%s]", strcharinfo(0));
+	mesf("[%s]", strcharinfo(PC_NAME));
 	mes("Hold on!\r"
 		"Are you the only survivor?");
 	unittalk(getcharid(3), _("Hold on! Are you the only survivor?"));
@@ -828,7 +828,7 @@ OnMyMobDead:
 	npctalk(_("Altar boy Domun : All I could do was... Just hide in here... Nothing, nothing I could do..."));
 	next;
 	select("Pull it together!");
-	mesf("[%s]", strcharinfo(0));
+	mesf("[%s]", strcharinfo(PC_NAME));
 	mes("Wake up kid! Go east and find the middle passage to the outside! That is safe!");
 	unittalk(getcharid(3), _("Wake up kid! Go east and find the middle passage to the outside! That is safe!")); // Displays 1st Letter of char name in small?
 	next;
@@ -839,7 +839,7 @@ OnMyMobDead:
 	npctalk(_("Altar boy Domun : To the east passage? Alone? How?"));
 	next;
 	select("I will give you a weapon.");
-	mesf("[%s]", strcharinfo(0));
+	mesf("[%s]", strcharinfo(PC_NAME));
 	mes("Here's a weapon. Just close your eye and swing for those monsters.");
 	unittalk(getcharid(3), _("Here's a weapon. Just close your eye and swing for those monsters."));
 	next;
@@ -909,7 +909,7 @@ OnMyMobDead:
 	specialeffect EF_CRASHEARTH;
 	next;
 	select("Relax! I'm not a monster!");
-	mesf("[%s]", strcharinfo(0));
+	mesf("[%s]", strcharinfo(PC_NAME));
 	mes("Relax! I am Human. Are you alone? Anyone else here?");
 	unittalk(getcharid(3), _("Relax! I am Human. Are you alone? Anyone else here?"));
 	next;
@@ -918,7 +918,7 @@ OnMyMobDead:
 	npctalk(_("Holgren the Destroyer : It's only me alive."));
 	next;
 	select("It's dangerous here...");
-	mesf("[%s]", strcharinfo(0));
+	mesf("[%s]", strcharinfo(PC_NAME));
 	mes("It's dangerous here. You know the way to the middle passage? Can you move?");
 	unittalk(getcharid(3), _("It's dangerous here. You know the way to the middle passage? Can you move?")); // Displays 1st Letter of char name in small?
 	next;
@@ -927,7 +927,7 @@ OnMyMobDead:
 	npctalk(_("Holgren the Destroyer : Yes, I can move. I need to get out of here."));
 	next;
 	select("Be safe...");
-	mesf("[%s]", strcharinfo(0));
+	mesf("[%s]", strcharinfo(PC_NAME));
 	mes("Sorry, I can't go with you.");
 	unittalk(getcharid(3), _("Sorry, I can't go with you."));
 	next;
diff --git a/npc/re/instances/WolfchevLaboratory.txt b/npc/re/instances/WolfchevLaboratory.txt
index 16eaad351..ce0ca4c31 100644
--- a/npc/re/instances/WolfchevLaboratory.txt
+++ b/npc/re/instances/WolfchevLaboratory.txt
@@ -1876,7 +1876,7 @@ lhz_dun04,151,276,3	script	Researcher#memo	4_LGTSCIENCE,{
 							instance_init(.@instance);
 							mes "[Wolfchev]";
 							mes "Alright! I have marked lan entering system code as";
-							mes "^0000ff"+ strcharinfo(1) +"^000000 party leader's name ^0000ff"+ strcharinfo(PC_NAME) +"^000000!!.";
+							mes "^0000ff"+ strcharinfo(PC_PARTY) +"^000000 party leader's name ^0000ff"+ strcharinfo(PC_NAME) +"^000000!!.";
 							next;
 							mes "[Wolfchev]";
 							mes "Now, your party is free to pass the entrance.";
@@ -1938,7 +1938,7 @@ lhz_dun04,147,279,0	script	Laboratory Entrance#memo	CLEAR_NPC,{
 			mes "You have been wounded by laboratory entrance system attack.";
 			close;
 		} else {
-			mapannounce "lhz_dun04","Laboratory entrance system ["+ strcharinfo(1) +"] member ["+ strcharinfo(PC_NAME) +"] access granted..",bc_map,"0x0DF297";
+			mapannounce "lhz_dun04","Laboratory entrance system ["+ strcharinfo(PC_PARTY) +"] member ["+ strcharinfo(PC_NAME) +"] access granted..",bc_map,"0x0DF297";
 			setquest 5112;
 			warp "1@lhz.gat", 45, 148;
 			close;
diff --git a/npc/re/instances/ghost_palace.txt b/npc/re/instances/ghost_palace.txt
index ea8f3d853..8b0bbb866 100644
--- a/npc/re/instances/ghost_palace.txt
+++ b/npc/re/instances/ghost_palace.txt
@@ -94,7 +94,7 @@ dali02,44,129,5	script	Unpleasent Royal Guard	4_M_SAKRAYROYAL,{
 	.@md_name$ = "Ghost Palace";
 	if (.@instance < 0) {
 		mesf("Party Name: %s", .@p_name$);
-		mesf("Party Leader: %s", strcharinfo(0));
+		mesf("Party Leader: %s", strcharinfo(PC_NAME));
 		mesf("^0000FF%s^000000 - Reservation Failed!", .@md_name$);
 		close();
 	}
@@ -155,7 +155,7 @@ dali02,41,134,0	script	Interdimensional Device::gpportal	PORTAL,{
 		mes("^FF0000Inside the device you see a dark hole. If you wish to enter you may wish to talk to the Unpleasant Royal Guard first.^000000");
 		close();
 	}
-	mapannounce("dali", sprintf(_$("%s of the party, %s, is entering the Ghost Palace."), strcharinfo(0), getpartyname(getcharid(1))), bc_map, C_SPRINGGREEN);
+	mapannounce("dali", sprintf(_$("%s of the party, %s, is entering the Ghost Palace."), strcharinfo(PC_NAME), getpartyname(getcharid(1))), bc_map, C_SPRINGGREEN);
 	if (!questprogress(1260)) setquest 1260;
 	setquest 1261;
 	warp("1@spa", 198, 188);
@@ -548,7 +548,7 @@ OnInstanceInit:
 		"Did you see?");
 	npctalk(_("Okay, that is good. A traveler. Did you see?"), instance_npcname("Sakray#gp5"));
 	next;
-	mesf("[%s]", strcharinfo(0));
+	mesf("[%s]", strcharinfo(PC_NAME));
 	mes("Sakray, What do you want sympathy? Or is it a trap?");
 	unittalk(getcharid(3), _("Sakray, What do you want sympathy? Or is it a trap?"));
 	next;
@@ -556,7 +556,7 @@ OnInstanceInit:
 	mes("Non...I did not need to make an effort to catch a novice.");
 	npctalk(_("Non...I did not need to make an effort to catch a novice."), instance_npcname("Sakray#gp5"));
 	next;
-	mesf("[%s]", strcharinfo(0));
+	mesf("[%s]", strcharinfo(PC_NAME));
 	mes("If so... then why...?");
 	unittalk(getcharid(3), _("If so... then why...?"));
 	next;
@@ -578,7 +578,7 @@ OnInstanceInit:
 	mes("[Sakray]");
 	mes("Can you set yourself free from this curse?");
 	next;
-	mesf("[%s]", strcharinfo(0));
+	mesf("[%s]", strcharinfo(PC_NAME));
 	mes("...");
 	unittalk(getcharid(3), _("..."));
 	next;
diff --git a/npc/re/instances/saras_memory.txt b/npc/re/instances/saras_memory.txt
index bb7dbdeec..17e075f0f 100644
--- a/npc/re/instances/saras_memory.txt
+++ b/npc/re/instances/saras_memory.txt
@@ -188,7 +188,7 @@ dali,138,118,0	script	Dimensional Device#dimen	PORTAL,{
 			.@instance = instance_create(.@md_name$, .@party_id);
 			if (.@instance < 0) {
 				mesf("Party Name: %s", .@p_name$);
-				mesf("Party Leader: %s", strcharinfo(0));
+				mesf("Party Leader: %s", strcharinfo(PC_NAME));
 				mesf("^0000FF%s^000000 - Reservation Failed!", .@md_name$);
 				close;
 			}
@@ -207,7 +207,7 @@ dali,138,118,0	script	Dimensional Device#dimen	PORTAL,{
 					"The party leader did not generate the dungeon yet.", .@md_name$);
 				close;
 			}
-			mapannounce("dali", sprintf(_$("%s, member of the party %s entered the instance %s."), strcharinfo(0), .@p_name$, .@md_name$), bc_map, C_SPRINGGREEN);
+			mapannounce("dali", sprintf(_$("%s, member of the party %s entered the instance %s."), strcharinfo(PC_NAME), .@p_name$, .@md_name$), bc_map, C_SPRINGGREEN);
 			setquest 15002;
 			warp "1@sara", 250, 155;
 			end;
@@ -221,7 +221,7 @@ dali,138,118,0	script	Dimensional Device#dimen	PORTAL,{
 1@sara,261,156,5	script	A girl#sarains	4_F_SARAH_BABY,{
 	if (getcharid(0) != getpartyleader(getcharid(1), 2))
 		end;
-	mesf("[%s]", strcharinfo(0));
+	mesf("[%s]", strcharinfo(PC_NAME));
 	mes("Where am I?");
 	unittalk(getcharid(3), _("Where am I?"));
 	next;
@@ -230,7 +230,7 @@ dali,138,118,0	script	Dimensional Device#dimen	PORTAL,{
 	mes("Hello! This is the village of Payon. You don't seem to be from around here...");
 	npctalk(_("A girl : Hello! This is the village of Payon. You don't seem to be from around here..."));
 	next;
-	mesf("[%s]", strcharinfo(0));
+	mesf("[%s]", strcharinfo(PC_NAME));
 	mes("Are you from here? You don't seem to quite match the locals either.");
 	unittalk(getcharid(3), _("Are you from here? You don't seem to quite match to locals either."));
 	next;
@@ -242,7 +242,7 @@ dali,138,118,0	script	Dimensional Device#dimen	PORTAL,{
 	mes("My father is doyen of this village! I just take after my mother.");
 	donpcevent instance_npcname("Sara Irene#saratalk")+"::OnChat1";
 	next;
-	mesf("[%s]", strcharinfo(0));
+	mesf("[%s]", strcharinfo(PC_NAME));
 	mes("Oh! I am sorry! Uh... Why are you standing out here all alone?");
 	unittalk(getcharid(3), _("Oh! I am sorry! Uh... Why are you standing out here all alone?"));
 	next;
@@ -1091,7 +1091,7 @@ OnMyMobDead:
 	mes("I have been looking for you Sara. Please come with daddy it is very dangerous here!");
 	donpcevent instance_npcname("Doyen Irene#sarains2")+"::OnChat2";
 	next;
-	mesf("[%s]", strcharinfo(0));
+	mesf("[%s]", strcharinfo(PC_NAME));
 	mes("I won't let you take Sara!");
 	unittalk(getcharid(3), _("I won't let you take Sara!"));
 	next;
@@ -1100,7 +1100,7 @@ OnMyMobDead:
 	mes("The murderer is here! Guards! We will finish him once and for all!");
 	donpcevent instance_npcname("Doyen Irene#sarains2")+"::OnChat3";
 	next;
-	mesf("[%s]", strcharinfo(0));
+	mesf("[%s]", strcharinfo(PC_NAME));
 	mes("Sara... run! Save yourself!");
 	unittalk(getcharid(3), _("Sara... run! Save yourself!"));
 	next;
@@ -1233,7 +1233,7 @@ OnMyMobDead:
 	mes("Why.. *hack* are you trying to kill my wife and daughter?");
 	npctalk(_("Why.. *hack* are you trying to kill my wife and daughter?"));
 	next;
-	mesf("[%s]", strcharinfo(0));
+	mesf("[%s]", strcharinfo(PC_NAME));
 	mes("What are you talking about? We saw you standing over Sara's mother with your sword COVERED in blood!");
 	unittalk(getcharid(3), _("What are you talking about? We saw you standing over Sara's mother with your sword COVERED in blood!"));
 	next;
@@ -1257,7 +1257,7 @@ OnMyMobDead:
 	mes("If.. you are not the assassin sent to kill my wife and daughter, who are you?");
 	npctalk(_("If.. you are not the assassin sent to kill my wife and daughter, who are you?"));
 	next;
-	mesf("[%s]", strcharinfo(0));
+	mesf("[%s]", strcharinfo(PC_NAME));
 	mes("I am just an adventurer who was passing through. I heard some men plotting their deaths and needed to intervene.");
 	unittalk(getcharid(3), _("I am just an adventurer who was passing through. I heard some men plotting their deaths and needed to intervene."));
 	next;
@@ -1270,11 +1270,11 @@ OnMyMobDead:
 	mes("Strange men... I bet they were some of the village elders. Ugh...");
 	npctalk(_("Strange men... I bet they were some of the village elders. Ugh..."));
 	next;
-	mesf("[%s]", strcharinfo(0));
+	mesf("[%s]", strcharinfo(PC_NAME));
 	mes("There might be more assassins so we have to find Sara as fast as we can.");
 	unittalk(getcharid(3), _("There might be more assassins so we have to find Sara as fast as we can."));
 	next;
-	mesf("[%s]", strcharinfo(0));
+	mesf("[%s]", strcharinfo(PC_NAME));
 	mes("Sara believes that you killed her mother. We need to tell her the truth.");
 	unittalk(getcharid(3), _("Sara believes that you killed her mother. We need to tell her the truth."));
 	next;