change *strcharinfo to use constants

6 files changed, 94 insertions, 94 deletions

diff --git a/npc/custom/etc/bank_kafra.txt b/npc/custom/etc/bank_kafra.txt
index c4e16a9ec..375a9f611 100644
--- a/npc/custom/etc/bank_kafra.txt
+++ b/npc/custom/etc/bank_kafra.txt
@@ -20,7 +20,7 @@
 
 -	script	Bank Clerk::bankg	4_M_ZONDAOYAJI,{
 	mes"[Maniss]";
-	mes strcharinfo(0)+", welcome to the 2nd Bank of Prontera!";
+	mes strcharinfo(PC_NAME)+", welcome to the 2nd Bank of Prontera!";
 
 	set @kb_int,(gettime(GETTIME_MONTH)*31)+gettime(GETTIME_DAYOFMONTH); //today's number
 	set @income,0;
diff --git a/npc/custom/etc/lottery.txt b/npc/custom/etc/lottery.txt
index 13d60ec2f..421fccc78 100644
--- a/npc/custom/etc/lottery.txt
+++ b/npc/custom/etc/lottery.txt
@@ -293,7 +293,7 @@ LWinBig:
 	mes "Jackpot!";
 	mes "You've won ^0000FF" + $L_Prize_Money + "z^000000.";
 	Zeny += $L_Prize_Money;
-	announce "Lottery: " + strcharinfo(0) + " has won the JACKPOT of " + $L_Prize_Money + "z!",8;
+	announce "Lottery: " + strcharinfo(PC_NAME) + " has won the JACKPOT of " + $L_Prize_Money + "z!",8;
 	set #LID,0;
 	close;
 
@@ -303,7 +303,7 @@ LWinSmall:
 	mes "You have matched at least 4 numbers!";
 	mes "You've won ^0000FF" + $L_Prize_Money_Small + "z^000000.";
 	Zeny += $L_Prize_Money_Small;
-	announce "Lottery: " + strcharinfo(0) + " has won a prize of " + $L_Prize_Money_Small + "z!",8;
+	announce "Lottery: " + strcharinfo(PC_NAME) + " has won a prize of " + $L_Prize_Money_Small + "z!",8;
 	set #LID,0;
 	close;
 
diff --git a/npc/custom/etc/marriage.txt b/npc/custom/etc/marriage.txt
index 2af343023..76b0429c8 100644
--- a/npc/custom/etc/marriage.txt
+++ b/npc/custom/etc/marriage.txt
@@ -82,11 +82,11 @@ prt_church,100,123,4	script	Vomars	1_M_PASTOR,{
 		close;
 	} // End official iRO dialog
 
-	if (strcharinfo(0) == $wed_groom$) {
+	if (strcharinfo(PC_NAME) == $wed_groom$) {
 		SF_Groom();
 		end;
 	}
-	if (strcharinfo(0) == $wed_bride$) {
+	if (strcharinfo(PC_NAME) == $wed_bride$) {
 		SF_Bride();
 		end;
 	}
@@ -102,11 +102,11 @@ prt_church,100,123,4	script	Vomars	1_M_PASTOR,{
 	mes "I am going to wed "+$wed_groom$+" and "+$wed_bride$+", do you have an objection to it?";
 	if (select("Sorry, please go on.","Yes, I actually do.") == 2) {
 		//Abort
-		npctalk "Ladies and gentlemen, "+strcharinfo(0)+" has an objection to the wedding!";
+		npctalk "Ladies and gentlemen, "+strcharinfo(PC_NAME)+" has an objection to the wedding!";
 		SF_wed_end();
 		mes "Why should they not be wed?";
 		input $@msg$;
-		npctalk strcharinfo(0)+"'s objection is: "+$@msg$;
+		npctalk strcharinfo(PC_NAME)+"'s objection is: "+$@msg$;
 		emotion e_sob;
 		mes "I see...";
 	} else
@@ -319,7 +319,7 @@ function SF_StartCeremony {
 	set $wed_bride_progress,5;
 	set $wed_groom_progress,5;
 	set $@msg$,$wed_groom$;
-	if (strcharinfo(0) == $wed_groom$)
+	if (strcharinfo(PC_NAME) == $wed_groom$)
 		set $@msg$,$wed_bride$;
 	if (marriage($@msg$) == 0) {
 		next;
@@ -531,7 +531,7 @@ function SF_Register {
 }
 
 function SF_WedProgress {
-	if (strcharinfo(0) == $wed_groom$) {
+	if (strcharinfo(PC_NAME) == $wed_groom$) {
 		mes "["+@name$+"]";
 		if ($wed_bride_progress > 0)
 			mes "The Priest will handle the rest of the ceremony.";
@@ -539,7 +539,7 @@ function SF_WedProgress {
 			mes "Tell your bride to register, what is taking so long? Time is running out.";
 		close;
 	}
-	if (strcharinfo(0) == $wed_bride$) {
+	if (strcharinfo(PC_NAME) == $wed_bride$) {
 		mes "["+@name$+"]";
 		if ($wed_groom_progress > 0)
 			mes "The Priest will handle the rest of the ceremony.";
@@ -720,13 +720,13 @@ function SF_TryRegister {
 	sc_start SC_WEDDING,3600000,1; //Start Wedding Effect (SC_WEDDING)
 	if (@bride) {
 		set $wed_bride_progress,1;
-		set $wed_bride$,strcharinfo(0);
+		set $wed_bride$,strcharinfo(PC_NAME);
 		$wed_bride_sex = Sex;
 		if ($@wedding_effect == 1) //Store account id for effect.
 			set $wedding_effect_id, getcharid(3);
 	} else {
 		set $wed_groom_progress,1;
-		set $wed_groom$,strcharinfo(0);
+		set $wed_groom$,strcharinfo(PC_NAME);
 		$wed_groom_sex = Sex;
 		if ($@wedding_effect == 2) //Store account id for effect.
 			set $wedding_effect_id, getcharid(3);
@@ -867,7 +867,7 @@ prt_church,94,99,4	script	Sister Lisa	1_F_PRIEST,{
 			}
 			mes "["+@name$+"]";
 			set $@divorcee,getpartnerid();
-			set $@divorcer$,strcharinfo(0);
+			set $@divorcer$,strcharinfo(PC_NAME);
 			set $@divorce_progress,1;
 			initnpctimer;
 			mes "Very well, get your partner to confirm, and I will collect the fee for filing the divorce then.";
@@ -877,7 +877,7 @@ prt_church,94,99,4	script	Sister Lisa	1_F_PRIEST,{
 end;
 
 function SF_InProgress {
-	if (strcharinfo(0) == $@divorcer$) {
+	if (strcharinfo(PC_NAME) == $@divorcer$) {
 		mes "["+@name$+"]";
 		mes "...I am still waiting for your partner to confirm the divorce procedure.";
 		close;
@@ -912,7 +912,7 @@ function SF_InProgress {
 		close;
 	}
 	Zeny -= $@wed_divorce_fee;
-	announce $@divorcer$+" has just divorced "+strcharinfo(0)+"...", 8;
+	announce $@divorcer$+" has just divorced "+strcharinfo(PC_NAME)+"...", 8;
 	mes "["+@name$+"]";
 	mes "Your divorce has been filed. You are no longer wed.";
 	emotion e_sob;
diff --git a/npc/custom/etc/monster_arena.txt b/npc/custom/etc/monster_arena.txt
index 3a25679aa..24edd14d9 100644
--- a/npc/custom/etc/monster_arena.txt
+++ b/npc/custom/etc/monster_arena.txt
@@ -71,27 +71,27 @@ L_Info:
 // Monster Summon Function //
 function	script	monstersummon	{
 	// 1. ---Change to Add Monsters--- //
-	if (#monster == 10) summon strcharinfo(0) + "'s Poring",1002, "OnPoringKilled";
-	if (#monster == 20) summon strcharinfo(0) + "'s Fabre",1007, "OnFaberKilled";
-	if (#monster == 30) summon strcharinfo(0) + "'s Lunatic",1063, "OnLunaticKilled";
-	if (#monster == 31) summon strcharinfo(0) + "'s Drops",1113, "OnDropsKilled";
-	if (#monster == 32) summon strcharinfo(0) + "'s Picky",1049, "OnPickyKilled";
-	if (#monster == 40) summon strcharinfo(0) + "'s ChonChon",1011, "OnChonChonKilled";
-	if (#monster == 41) summon strcharinfo(0) + "'s Super Picky",1050, "OnSPickyKilled";
-	if (#monster == 42) summon strcharinfo(0) + "'s Willow",1010, "OnWillowKilled";
-	if (#monster == 50) summon strcharinfo(0) + "'s Roda Frog",1012, "OnRodaKilled";
-	if (#monster == 51) summon strcharinfo(0) + "'s Condor",1009, "OnCondorKilled";
-	if (#monster == 60) summon strcharinfo(0) + "'s Thief Bug Larva",1051, "OnThiefKilled";
-	if (#monster == 70) summon strcharinfo(0) + "'s Savage Babe",1167, "OnSavageKilled";
-	if (#monster == 80) summon strcharinfo(0) + "'s Familiar",1005, "OnFamiliarKilled";
-	if (#monster == 81) summon strcharinfo(0) + "'s Hornet",1004, "OnHornetKilled";
-	if (#monster == 90) summon strcharinfo(0) + "'s Desert Wolf Puppy",1107, "OnPuppyKilled";
-	if (#monster == 91) summon strcharinfo(0) + "'s Spore",1014, "OnSporeKilled";
-	if (#monster == 92) summon strcharinfo(0) + "'s Rocker",1052, "OnRockerKilled";
-	if (#monster == 100) summon strcharinfo(0) + "'s Skeleton",1076, "OnSkeletonKilled";
-	if (#monster == 101) summon strcharinfo(0) + "'s Plankton",1161, "OnPlanktonKilled";
-	if (#monster == 102) summon strcharinfo(0) + "'s Antonio",1247, "OnAntonioKilled";
-	if (#monster == 103) summon strcharinfo(0) + "'s Thief Bug Female",1053, "OnThiefFemaleKilled";
+	if (#monster == 10) summon strcharinfo(PC_NAME) + "'s Poring",1002, "OnPoringKilled";
+	if (#monster == 20) summon strcharinfo(PC_NAME) + "'s Fabre",1007, "OnFaberKilled";
+	if (#monster == 30) summon strcharinfo(PC_NAME) + "'s Lunatic",1063, "OnLunaticKilled";
+	if (#monster == 31) summon strcharinfo(PC_NAME) + "'s Drops",1113, "OnDropsKilled";
+	if (#monster == 32) summon strcharinfo(PC_NAME) + "'s Picky",1049, "OnPickyKilled";
+	if (#monster == 40) summon strcharinfo(PC_NAME) + "'s ChonChon",1011, "OnChonChonKilled";
+	if (#monster == 41) summon strcharinfo(PC_NAME) + "'s Super Picky",1050, "OnSPickyKilled";
+	if (#monster == 42) summon strcharinfo(PC_NAME) + "'s Willow",1010, "OnWillowKilled";
+	if (#monster == 50) summon strcharinfo(PC_NAME) + "'s Roda Frog",1012, "OnRodaKilled";
+	if (#monster == 51) summon strcharinfo(PC_NAME) + "'s Condor",1009, "OnCondorKilled";
+	if (#monster == 60) summon strcharinfo(PC_NAME) + "'s Thief Bug Larva",1051, "OnThiefKilled";
+	if (#monster == 70) summon strcharinfo(PC_NAME) + "'s Savage Babe",1167, "OnSavageKilled";
+	if (#monster == 80) summon strcharinfo(PC_NAME) + "'s Familiar",1005, "OnFamiliarKilled";
+	if (#monster == 81) summon strcharinfo(PC_NAME) + "'s Hornet",1004, "OnHornetKilled";
+	if (#monster == 90) summon strcharinfo(PC_NAME) + "'s Desert Wolf Puppy",1107, "OnPuppyKilled";
+	if (#monster == 91) summon strcharinfo(PC_NAME) + "'s Spore",1014, "OnSporeKilled";
+	if (#monster == 92) summon strcharinfo(PC_NAME) + "'s Rocker",1052, "OnRockerKilled";
+	if (#monster == 100) summon strcharinfo(PC_NAME) + "'s Skeleton",1076, "OnSkeletonKilled";
+	if (#monster == 101) summon strcharinfo(PC_NAME) + "'s Plankton",1161, "OnPlanktonKilled";
+	if (#monster == 102) summon strcharinfo(PC_NAME) + "'s Antonio",1247, "OnAntonioKilled";
+	if (#monster == 103) summon strcharinfo(PC_NAME) + "'s Thief Bug Female",1053, "OnThiefFemaleKilled";
 	close;
 }
 
@@ -146,46 +146,46 @@ L_Start:
 
 	// Special Summons //
 Special1:
-	summon strcharinfo(0) + "'s Assault Team",1002, "OnPoringKilled";
-	summon strcharinfo(0) + "'s Assault Team",1002, "OnPoringKilled";
-	summon strcharinfo(0) + "'s Assault Team",1002, "OnPoringKilled";
-	summon strcharinfo(0) + "'s Assault Team",1002, "OnPoringKilled";
-	summon strcharinfo(0) + "'s Assault Team",1002, "OnPoringKilled";
-	summon strcharinfo(0) + "'s Assault Team",1002, "OnPoringKilled";
-	summon strcharinfo(0) + "'s Assault Team",1002, "OnPoringKilled";
-	summon strcharinfo(0) + "'s Assault Team",1002, "OnPoringKilled";
-	summon strcharinfo(0) + "'s Assault Team",1002, "OnPoringKilled";
-	summon strcharinfo(0) + "'s Assault Team",1002, "OnPoringKilled";
-	summon strcharinfo(0) + "'s Assault Team",1002, "OnPoringKilled";
-	summon strcharinfo(0) + "'s Assault Team",1002, "OnPoringKilled";
-	summon strcharinfo(0) + "'s Assault Team",1002, "OnPoringKilled";
-	summon strcharinfo(0) + "'s Assault Team",1002, "OnPoringKilled";
-	summon strcharinfo(0) + "'s Assault Team",1002, "OnPoringKilled";
-	summon strcharinfo(0) + "'s Assault Team",1002, "OnPoringKilled";
-	summon strcharinfo(0) + "'s Assault Team",1002, "OnPoringKilled";
-	summon strcharinfo(0) + "'s Assault Team",1002, "OnPoringKilled";
-	summon strcharinfo(0) + "'s Assault Team",1002, "OnPoringKilled";
-	summon strcharinfo(0) + "'s Assault Team",1002, "OnPoringKilled";
-	summon strcharinfo(0) + "'s Assault Team",1002, "OnPoringKilled";
-	summon strcharinfo(0) + "'s Assault Team",1002, "OnPoringKilled";
-	summon strcharinfo(0) + "'s Assault Team",1002, "OnPoringKilled";
-	summon strcharinfo(0) + "'s Assault Team",1002, "OnPoringKilled";
+	summon strcharinfo(PC_NAME) + "'s Assault Team",1002, "OnPoringKilled";
+	summon strcharinfo(PC_NAME) + "'s Assault Team",1002, "OnPoringKilled";
+	summon strcharinfo(PC_NAME) + "'s Assault Team",1002, "OnPoringKilled";
+	summon strcharinfo(PC_NAME) + "'s Assault Team",1002, "OnPoringKilled";
+	summon strcharinfo(PC_NAME) + "'s Assault Team",1002, "OnPoringKilled";
+	summon strcharinfo(PC_NAME) + "'s Assault Team",1002, "OnPoringKilled";
+	summon strcharinfo(PC_NAME) + "'s Assault Team",1002, "OnPoringKilled";
+	summon strcharinfo(PC_NAME) + "'s Assault Team",1002, "OnPoringKilled";
+	summon strcharinfo(PC_NAME) + "'s Assault Team",1002, "OnPoringKilled";
+	summon strcharinfo(PC_NAME) + "'s Assault Team",1002, "OnPoringKilled";
+	summon strcharinfo(PC_NAME) + "'s Assault Team",1002, "OnPoringKilled";
+	summon strcharinfo(PC_NAME) + "'s Assault Team",1002, "OnPoringKilled";
+	summon strcharinfo(PC_NAME) + "'s Assault Team",1002, "OnPoringKilled";
+	summon strcharinfo(PC_NAME) + "'s Assault Team",1002, "OnPoringKilled";
+	summon strcharinfo(PC_NAME) + "'s Assault Team",1002, "OnPoringKilled";
+	summon strcharinfo(PC_NAME) + "'s Assault Team",1002, "OnPoringKilled";
+	summon strcharinfo(PC_NAME) + "'s Assault Team",1002, "OnPoringKilled";
+	summon strcharinfo(PC_NAME) + "'s Assault Team",1002, "OnPoringKilled";
+	summon strcharinfo(PC_NAME) + "'s Assault Team",1002, "OnPoringKilled";
+	summon strcharinfo(PC_NAME) + "'s Assault Team",1002, "OnPoringKilled";
+	summon strcharinfo(PC_NAME) + "'s Assault Team",1002, "OnPoringKilled";
+	summon strcharinfo(PC_NAME) + "'s Assault Team",1002, "OnPoringKilled";
+	summon strcharinfo(PC_NAME) + "'s Assault Team",1002, "OnPoringKilled";
+	summon strcharinfo(PC_NAME) + "'s Assault Team",1002, "OnPoringKilled";
 	close;
 
 Special2:
-	summon strcharinfo(0) + "'s Mastering",1090, "OnSpecialKilled";
+	summon strcharinfo(PC_NAME) + "'s Mastering",1090, "OnSpecialKilled";
 	close;
 
 Special3:
-	summon strcharinfo(0) + "'s Eclipse",1093, "OnSpecialKilled";
+	summon strcharinfo(PC_NAME) + "'s Eclipse",1093, "OnSpecialKilled";
 	close;
 
 Special4:
-	summon strcharinfo(0) + "'s Dragon Fly",1091, "OnSpecialKilled";
+	summon strcharinfo(PC_NAME) + "'s Dragon Fly",1091, "OnSpecialKilled";
 	close;
 
 Special5:
-	summon strcharinfo(0) + "'s Toad",1089, "OnSpecialKilled";
+	summon strcharinfo(PC_NAME) + "'s Toad",1089, "OnSpecialKilled";
 	close;
 
 L_Exit:
@@ -222,7 +222,7 @@ L_High:
 	close2;
 	savepoint "gon_test",56,99;
 	set @battle,1;
-	atcommand strcharinfo(0) + "@option 64 0 64";
+	atcommand strcharinfo(PC_NAME) + "@option 64 0 64";
 	warp "gon_test",72,87;
 	end;
 
@@ -230,7 +230,7 @@ L_4to6:
 	close2;
 	savepoint "gon_test",56,99;
 	set @battle,1;
-	atcommand strcharinfo(0) + "@option 64 0 64";
+	atcommand strcharinfo(PC_NAME) + "@option 64 0 64";
 	warp "gon_test",57,86;
 	end;
 
@@ -238,7 +238,7 @@ L_1to3:
 	close2;
 	savepoint "gon_test",56,99;
 	set @battle,1;
-	atcommand strcharinfo(0) + "@option 64 0 64";
+	atcommand strcharinfo(PC_NAME) + "@option 64 0 64";
 	warp "gon_test",43,87;
 	end;
 
@@ -246,7 +246,7 @@ L_Exit:
 	close2;
 	savepoint "prontera",149,186;
 	set @battle,0;
-	atcommand strcharinfo(0) + "@option 0 0 0";
+	atcommand strcharinfo(PC_NAME) + "@option 0 0 0";
 	warp "prontera",149,186;
 	end;
 
@@ -254,7 +254,7 @@ L_Spec:
 	close2;
 	savepoint "gon_test",56,99;
 	set @battle,0;
-	atcommand strcharinfo(0) + "@option 0 0 0";
+	atcommand strcharinfo(PC_NAME) + "@option 0 0 0";
 	warp "gon_test",57,99;
 	end;
 
@@ -296,7 +296,7 @@ gon_test,52,103,6	script	Monster Trainer	4_M_BARBER,{
 	close;
 
 L_Mon:
-	mes "Welcome back, " + strcharinfo(0) + ".";
+	mes "Welcome back, " + strcharinfo(PC_NAME) + ".";
 	mes "Your monster has " + #monpoints + " exp points.";
 	next;
 	if (@fighting == 1) goto L_Heal;
@@ -712,10 +712,10 @@ gon_test,56,91,6	script	OnSpecialKilled	FAKE_NPC,{
 }
 
 function	script	duelkill	{
-	if (strcharinfo(0) == $@duelist1$ || strcharinfo(0) == $@duelist2$) goto L_Heal;
+	if (strcharinfo(PC_NAME) == $@duelist1$ || strcharinfo(PC_NAME) == $@duelist2$) goto L_Heal;
 	end;
 L_Heal:
-	announce strcharinfo(0) + " won the Duel",1;
+	announce strcharinfo(PC_NAME) + " won the Duel",1;
 	set @fighting,0;
 	set #heal,0;
 	set @healing,0;
@@ -723,7 +723,7 @@ L_Heal:
 }
 
 function	script	illegalkill	{
-	announce "Illegal Kill by " + strcharinfo(0) + " Detected",1;
+	announce "Illegal Kill by " + strcharinfo(PC_NAME) + " Detected",1;
 	percentheal -100,-100;
 	end;
 }
@@ -790,10 +790,10 @@ gon_test,58,103,5	script	Duel Master#01	4_F_03,{
 	if (#monster > 79 && #monster < 90) set $@monster1,8;
 	if (#monster > 89 && #monster < 100) set $@monster1,9;
 	if (#monster > 99 && #monster < 110) set $@monster1,10;
-	set $@duelist1$,strcharinfo(0);
+	set $@duelist1$,strcharinfo(PC_NAME);
 	set @battle,1;
-	announce strcharinfo(0) + " [Monster Level: " + $@monster1 + "] is waiting for a duel",1;
-	atcommand strcharinfo(0) + "@option 64 0 64";
+	announce strcharinfo(PC_NAME) + " [Monster Level: " + $@monster1 + "] is waiting for a duel",1;
+	atcommand strcharinfo(PC_NAME) + "@option 64 0 64";
 	warp "gon_test",49,5;
 	close;
 
@@ -818,10 +818,10 @@ L_Duel2:
 	if (#monster > 79 && #monster < 90) set $@monster2,8;
 	if (#monster > 89 && #monster < 100) set $@monster2,9;
 	if (#monster > 99 && #monster < 110) set $@monster2,10;
-	set $@duelist2$,strcharinfo(0);
+	set $@duelist2$,strcharinfo(PC_NAME);
 	set @battle,1;
-	announce strcharinfo(0) + " [Monster Level: " + $@monster2 + "] has joined the duel",1;
-	atcommand strcharinfo(0) + "@option 64 0 64";
+	announce strcharinfo(PC_NAME) + " [Monster Level: " + $@monster2 + "] has joined the duel",1;
+	atcommand strcharinfo(PC_NAME) + "@option 64 0 64";
 	warp "gon_test",49,5;
 	close;
 
@@ -834,7 +834,7 @@ L_Dueling:
 
 L_Spec:
 	set @battle,0;
-	atcommand strcharinfo(0) + "@option 64 0 64";
+	atcommand strcharinfo(PC_NAME) + "@option 64 0 64";
 	warp "gon_test",49,5;
 	close;
 
@@ -863,11 +863,11 @@ gon_test,42,8,5	script	Duel Master#02	4_F_03,{
 	close;
 
 L_Leave:
-	if ($@duelist1$ == strcharinfo(0)) goto L_Leave1;
-	if ($@duelist2$ == strcharinfo(0)) goto L_Leave2;
+	if ($@duelist1$ == strcharinfo(PC_NAME)) goto L_Leave1;
+	if ($@duelist2$ == strcharinfo(PC_NAME)) goto L_Leave2;
 
 L_Leave3:
-	atcommand strcharinfo(0) + "@option 0 0 0";
+	atcommand strcharinfo(PC_NAME) + "@option 0 0 0";
 	set @battle,0;
 	warp "gon_test",57,99;
 	close;
@@ -876,14 +876,14 @@ L_Leave1:
 	set $@duelist1$,$@duelist2$;
 	set $@monster1,$@monster2;
 	set $@duel,$@duel-1;
-	announce strcharinfo(0) + " stopped dueling",1;
+	announce strcharinfo(PC_NAME) + " stopped dueling",1;
 	goto L_Leave3;
 
 L_Leave2:
 	set $@duelist2$,"";
 	set $@monster2,0;
 	set $@duel,$@duel-1;
-	announce strcharinfo(0) + " stopped dueling",1;
+	announce strcharinfo(PC_NAME) + " stopped dueling",1;
 	goto L_Leave3;
 }
 
diff --git a/npc/custom/etc/morroc_raceway.txt b/npc/custom/etc/morroc_raceway.txt
index 87f91ff7e..745b1d779 100644
--- a/npc/custom/etc/morroc_raceway.txt
+++ b/npc/custom/etc/morroc_raceway.txt
@@ -74,7 +74,7 @@ L_Menu:
 	addtimer 2000, "Starter::OnCount2000";
 	addtimer 3000, "Starter::OnCount3000";
 	addtimer 4000, "Starter::OnCount4000";
-	announce strcharinfo(0) + "Started a countdown",1;
+	announce strcharinfo(PC_NAME) + "Started a countdown",1;
 	announce "Get ready to race!",1;
 	close;
 
@@ -135,7 +135,7 @@ pvp_y_1-5,73,247,5	script	Check Point 2	HIDDEN_NPC,6,6,{
 OnTouch:
 	if (@race != 1) goto L_Miss;
 	set @race,2;
-	announce "[" + strcharinfo(0) +"] has reached Checkpoint [1]",1;
+	announce "[" + strcharinfo(PC_NAME) +"] has reached Checkpoint [1]",1;
 	end;
 L_Miss:
 	mes "You have missed a Checkpoint. Please go back.";
@@ -148,7 +148,7 @@ pvp_y_1-5,77,44,5	script	Check Point 3	HIDDEN_NPC,6,6,{
 OnTouch:
 	if (@race != 2) goto L_Miss;
 	set @race,3;
-	announce "[" + strcharinfo(0) +"] has reached Checkpoint [2]",1;
+	announce "[" + strcharinfo(PC_NAME) +"] has reached Checkpoint [2]",1;
 	end;
 L_Miss:
 	mes "You have missed a Checkpoint. Please go back.";
@@ -161,7 +161,7 @@ pvp_y_1-5,249,60,5	script	Check Point 4	HIDDEN_NPC,6,6,{
 OnTouch:
 	if (@race != 3) goto L_Miss;
 	set @race,4;
-	announce "[" + strcharinfo(0) +"] has reached Checkpoint [3]",1;
+	announce "[" + strcharinfo(PC_NAME) +"] has reached Checkpoint [3]",1;
 	end;
 L_Miss:
 	mes "You have missed a Checkpoint. Please go back.";
@@ -174,7 +174,7 @@ pvp_y_1-5,255,256,5	script	Check Point 5	HIDDEN_NPC,6,6,{
 OnTouch:
 	if (@race != 4) goto L_Miss;
 	set @race,5;
-	announce "[" + strcharinfo(0) +"] has reached Checkpoint [4]",1;
+	announce "[" + strcharinfo(PC_NAME) +"] has reached Checkpoint [4]",1;
 	end;
 L_Miss:
 	mes "You have missed a Checkpoint. Please go back.";
@@ -189,7 +189,7 @@ OnTouch:
 	if (@race != 5) goto L_Miss;
 	set @race,6;
 	set $@position,$@position+1;
-	announce "[" + strcharinfo(0) +"] has reached The Finish line! [Position: " + $@position + "]",1;
+	announce "[" + strcharinfo(PC_NAME) +"] has reached The Finish line! [Position: " + $@position + "]",1;
 	end;
 L_Miss:
 	mes "You have missed a Checkpoint. Please go back.";
diff --git a/npc/custom/etc/shifty_assassin.txt b/npc/custom/etc/shifty_assassin.txt
index ccc9810c3..4acf7c8ac 100644
--- a/npc/custom/etc/shifty_assassin.txt
+++ b/npc/custom/etc/shifty_assassin.txt
@@ -116,7 +116,7 @@ morocc,148,86,5	script	Shifty Assassin	4_F_JOB_ASSASSIN,{
 				set #ninjasr,@number-@ninjasurvived;
 				mes "Your attack failed and only ^FF0000" + #ninjasr + "^000000 Ninjas survived.";
 
-				announce @name$+" has survived " + strcharinfo(0) +"'s Ninja attack.",8;
+				announce @name$+" has survived " + strcharinfo(PC_NAME) +"'s Ninja attack.",8;
 				close;
 			}
 			// SUCCESSFUL ATTACK //
@@ -127,8 +127,8 @@ morocc,148,86,5	script	Shifty Assassin	4_F_JOB_ASSASSIN,{
 			set #ninjasr,@number-@ninjasurvived;
 			mes "Your attack succeeded but only ^FF0000" + #ninjasr + "^000000 Ninjas survived.";
 
-			atcommand strcharinfo(0) + "@kill "+@name$;
-			announce @name$+" has been assassinated by " + strcharinfo(0) +"'s Ninjas.",bc_npc;
+			atcommand strcharinfo(PC_NAME) + "@kill "+@name$;
+			announce @name$+" has been assassinated by " + strcharinfo(PC_NAME) +"'s Ninjas.",bc_npc;
 			close;
 		case 3:
 			mes "[Shifty Assassin]";