Consolidated commands called in scripts to their lowercase version

- Added a note about variables and command scripts case sensitivity.
  Even though the engine still accepts variable, function and command
  names in a case insensitive way, it is discouraged to rely on such
  behavior. Please update your custom scripts as soon as possible.

Signed-off-by: Haru <haru@dotalux.com>

7 files changed, 92 insertions, 92 deletions

diff --git a/npc/events/nguild/nguild_dunsw.txt b/npc/events/nguild/nguild_dunsw.txt
index 2fd6b7594..9b24c50b6 100644
--- a/npc/events/nguild/nguild_dunsw.txt
+++ b/npc/events/nguild/nguild_dunsw.txt
@@ -14,7 +14,7 @@
 
 //==================================================
 function	script	F_GldDunSw	{
-	set .@GID, GetCastleData(getarg(0),1);
+	set .@GID, getcastledata(getarg(0),1);
 	if (.@GID == 0) {
 		mes "[ Echoing Voice ]";
 		mes " ' The one who can overcome an ordeal and show true bravery... will find the way... ' ";
diff --git a/npc/events/nguild/nguild_ev_agit.txt b/npc/events/nguild/nguild_ev_agit.txt
index 96c16136c..f35903828 100644
--- a/npc/events/nguild/nguild_ev_agit.txt
+++ b/npc/events/nguild/nguild_ev_agit.txt
@@ -21,10 +21,10 @@ function	script	F_AgitStart	{
 	set .@empx, getarg(2);
 	set .@empy, getarg(3);
 
-	MapRespawnGuildID .@map$,GetCastleData(.@map$,1),2;
+	maprespawnguildid .@map$,getcastledata(.@map$,1),2;
 	monster .@map$,.@empx,.@empy,"Emperium",1288,1,"Agit_"+.@castle$+"::OnAgitBreak";
-	GvgOn .@map$;
-	if (GetCastleData(.@map$,1) != 0) return;
+	gvgon .@map$;
+	if (getcastledata(.@map$,1) != 0) return;
 	end;
 }
 
@@ -35,10 +35,10 @@ function	script	F_GuildBreak	{
 
 	killmonsterall .@map$;
 
-	Announce "Guild Base [" + GetCastleName(.@map$) + "] has been abandoned.",0;
+	announce "Guild Base [" + getcastlename(.@map$) + "] has been abandoned.",0;
 	disablenpc "Kafra Staff#"+.@castle$;
 
-	SetCastleData .@map$,0,0;
+	setcastledata .@map$,0,0;
 	return;
 }
 
@@ -50,29 +50,29 @@ function	script	F_AgitBreak	{
 	set .@GID,getcharid(2);
 	if (.@GID <= 0) return;
 
-	set .@Economy,GetCastleData(.@map$,2) - 5;
+	set .@Economy,getcastledata(.@map$,2) - 5;
 	if (.@Economy < 0) set .@Economy, 0;
-	SetCastleData .@map$, 2, .@Economy;
+	setcastledata .@map$, 2, .@Economy;
 
-	set .@Defence,GetCastleData(.@map$,3) - 5;
+	set .@Defence,getcastledata(.@map$,3) - 5;
 	if (.@Defence < 0) set .@Defence, 0;
-	SetCastleData .@map$, 3, .@Defence;
+	setcastledata .@map$, 3, .@Defence;
 
-	SetCastleData .@map$,1, .@GID;
-	MapAnnounce .@map$,"The emperium has been destroyed.",bc_map,0x00CCFF;
-	Announce "The [" + GetCastleName(.@map$) + "] castle has been conquered by the [" + GetGuildName(.@GID) + "] guild.",bc_all;
+	setcastledata .@map$,1, .@GID;
+	mapannounce .@map$,"The emperium has been destroyed.",bc_map,0x00CCFF;
+	announce "The [" + getcastlename(.@map$) + "] castle has been conquered by the [" + getguildname(.@GID) + "] guild.",bc_all;
 	donpcevent "::OnRecvCastle"+.@castle$;
 
 	disablenpc "Kafra Staff#"+.@castle$;
 
 	// remove investment data and kafra
 	for( set .@i, 4; .@i <= 9; set .@i, .@i+1 )
-		SetCastleData .@map$, .@i, 0;
+		setcastledata .@map$, .@i, 0;
 
 	// if the new guild doesn't have Guardian Research, erase guardians
 	if( getgdskilllv(.@GID,10002) == 0 )
 		for( set .@i, 10; .@i <= 17; set .@i, .@i+1 )
-			SetCastleData .@map$, .@i, 0;
+			setcastledata .@map$, .@i, 0;
 
 	return;
 }
@@ -83,12 +83,12 @@ function	script	F_AgitEnd	{
 	set .@map$, getarg(0);
 	set .@castle$, getarg(1);
 
-	GvgOff .@map$;
+	gvgoff .@map$;
 	// Disable the following if statment to keep empty
 	// castles from being aquired after after WoE ends.
-	if (GetCastleData(.@map$,1) == 0) return;
-	MapRespawnGuildID .@map$,GetCastleData(.@map$,1),4;
-	KillMonster .@map$,"Agit_"+.@castle$+"::OnAgitBreak";
+	if (getcastledata(.@map$,1) == 0) return;
+	maprespawnguildid .@map$,getcastledata(.@map$,1),4;
+	killmonster .@map$,"Agit_"+.@castle$+"::OnAgitBreak";
 	end;
 }
 
@@ -98,7 +98,7 @@ OnInterIfInitOnce:
 	donpcevent "::OnRecvCastleN01";
 	end;
 OnRecvCastleN01:
-	RequestGuildInfo GetCastleData("nguild_alde",1);
+	requestguildinfo getcastledata("nguild_alde",1);
 	end;
 OnAgitStart:
 	callfunc "F_AgitStart","nguild_alde","N01",216,24;
@@ -111,8 +111,8 @@ OnGuildBreak:
 	callfunc "F_GuildBreak","nguild_alde","N01";
 	end;
 OnAgitEliminate:
-	MapRespawnGuildID "nguild_alde",GetCastleData("nguild_alde",1),6;
-	Monster "nguild_alde",216,24,"EMPERIUM",1288,1,"Agit_N01::OnAgitBreak";
+	maprespawnguildid "nguild_alde",getcastledata("nguild_alde",1),6;
+	monster "nguild_alde",216,24,"EMPERIUM",1288,1,"Agit_N01::OnAgitBreak";
 	end;
 OnAgitEnd:
 	callfunc "F_AgitEnd","nguild_alde","N01";
@@ -125,7 +125,7 @@ OnInterIfInitOnce:
 	donpcevent "::OnRecvCastleN02";
 	end;
 OnRecvCastleN02:
-	RequestGuildInfo GetCastleData("nguild_gef",1);
+	requestguildinfo getcastledata("nguild_gef",1);
 	end;
 OnAgitStart:
 	callfunc "F_AgitStart","nguild_gef","N02",198,182;
@@ -138,8 +138,8 @@ OnGuildBreak:
 	callfunc "F_GuildBreak","nguild_gef","N02";
 	end;
 OnAgitEliminate:
-	MapRespawnGuildID "nguild_gef",GetCastleData("nguild_gef",1),6;
-	Monster "nguild_gef",198,182,"EMPERIUM",1288,1,"Agit_N02::OnAgitBreak";
+	maprespawnguildid "nguild_gef",getcastledata("nguild_gef",1),6;
+	monster "nguild_gef",198,182,"EMPERIUM",1288,1,"Agit_N02::OnAgitBreak";
 	end;
 OnAgitEnd:
 	callfunc "F_AgitEnd","nguild_gef","N02";
@@ -152,7 +152,7 @@ OnInterIfInitOnce:
 	donpcevent "::OnRecvCastleN03";
 	end;
 OnRecvCastleN03:
-	RequestGuildInfo GetCastleData("nguild_pay",1);
+	requestguildinfo getcastledata("nguild_pay",1);
 	end;
 OnAgitStart:
 	callfunc "F_AgitStart","nguild_pay","N03",139,139;
@@ -165,8 +165,8 @@ OnGuildBreak:
 	callfunc "F_GuildBreak","nguild_pay","N03";
 	end;
 OnAgitEliminate:
-	MapRespawnGuildID "nguild_pay",GetCastleData("nguild_pay",1),6;
-	Monster "nguild_pay",139,139,"EMPERIUM",1288,1,"Agit_N03::OnAgitBreak";
+	maprespawnguildid "nguild_pay",getcastledata("nguild_pay",1),6;
+	monster "nguild_pay",139,139,"EMPERIUM",1288,1,"Agit_N03::OnAgitBreak";
 	end;
 OnAgitEnd:
 	callfunc "F_AgitEnd","nguild_pay","N03";
@@ -179,7 +179,7 @@ OnInterIfInitOnce:
 	donpcevent "::OnRecvCastleN04";
 	end;
 OnRecvCastleN04:
-	RequestGuildInfo GetCastleData("nguild_prt",1);
+	requestguildinfo getcastledata("nguild_prt",1);
 	end;
 OnAgitStart:
 	callfunc "F_AgitStart","nguild_prt","N04",197,197;
@@ -192,8 +192,8 @@ OnGuildBreak:
 	callfunc "F_GuildBreak","nguild_prt","N04";
 	end;
 OnAgitEliminate:
-	MapRespawnGuildID "nguild_prt",GetCastleData("nguild_prt",1),6;
-	Monster "nguild_prt",197,197,"EMPERIUM",1288,1,"Agit_N04::OnAgitBreak";
+	maprespawnguildid "nguild_prt",getcastledata("nguild_prt",1),6;
+	monster "nguild_prt",197,197,"EMPERIUM",1288,1,"Agit_N04::OnAgitBreak";
 	end;
 OnAgitEnd:
 	callfunc "F_AgitEnd","nguild_prt","N04";
diff --git a/npc/events/nguild/nguild_flags.txt b/npc/events/nguild/nguild_flags.txt
index 17e1db744..8c629adf9 100644
--- a/npc/events/nguild/nguild_flags.txt
+++ b/npc/events/nguild/nguild_flags.txt
@@ -16,7 +16,7 @@
 /// Flag Function
 //============================================================
 function	script	F_Flags	{
-	set .@GID, GetCastleData(getarg(1),1);
+	set .@GID, getcastledata(getarg(1),1);
 	if (getarg(5) == 0) return;
 	if (.@GID == 0) {
 		mes " [ Edict of the Divine Rune Midgard Kingdom ]";
@@ -38,7 +38,7 @@ function	script	F_Flags	{
 			mes "Do you wish to return to your honorable place?";
 			next;
 			if (select("Return to the guild castle.:Quit.") == 1) {
-				if (getcharid(2) == GetCastleData(getarg(1),1))
+				if (getcharid(2) == getcastledata(getarg(1),1))
 					warp getarg(1),getarg(2),getarg(3);
 			}
 			return;
@@ -48,10 +48,10 @@ function	script	F_Flags	{
 		mes "1. Following the ordinance of the";
 		mes "Divine Rune Midgard Kingdom,";
 		mes "we approve that this place is in";
-		mes "the private possession of ^ff0000" + GetGuildName(.@GID) + "^000000 Guild.";
+		mes "the private possession of ^ff0000" + getguildname(.@GID) + "^000000 Guild.";
 		mes " ";
-		mes "2. The guild Master of ^ff0000"+ GetGuildName(.@GID) + "^000000 Guild is";
-		mes "^FF0000" + GetGuildMaster(.@GID) + "^000000";
+		mes "2. The guild Master of ^ff0000"+ getguildname(.@GID) + "^000000 Guild is";
+		mes "^FF0000" + getguildmaster(.@GID) + "^000000";
 		mes "If there is anyone who objects to this,";
 		mes " prove your strength and honor with a steel blade in your hand.";
 		return;
@@ -66,7 +66,7 @@ n_castle,110,96,1	script	NGuild Aldebaran#a1-1	GUILD_FLAG,{
 	close;
 
 OnRecvCastleN01:
-	FlagEmblem GetCastleData("nguild_alde",1);
+	flagemblem getcastledata("nguild_alde",1);
 	end;
 }
 
@@ -75,7 +75,7 @@ nguild_alde,30,248,4	script	NGuild Aldebaran#a1-6::NGuildAlde	GUILD_FLAG,{
 	close;
 
 OnRecvCastleN01:
-	FlagEmblem GetCastleData("nguild_alde",1);
+	flagemblem getcastledata("nguild_alde",1);
 	end;
 }
 // In Castle ============================================
@@ -105,7 +105,7 @@ n_castle,110,109,3	script	NGuild Geffen#g1-1	GUILD_FLAG,{
 	close;
 
 OnRecvCastleN02:
-	FlagEmblem GetCastleData("nguild_gef",1);
+	flagemblem getcastledata("nguild_gef",1);
 	end;
 }
 
@@ -114,7 +114,7 @@ nguild_gef,28,157,4	script	NGuild Geffen#g1-6::NGuildGef	GUILD_FLAG,{
 	close;
 
 OnRecvCastleN02:
-	FlagEmblem GetCastleData("nguild_gef",1);
+	flagemblem getcastledata("nguild_gef",1);
 	end;
 }
 // In Castle =============================================
@@ -135,7 +135,7 @@ n_castle,94,109,5	script	NGuild Payon#f1-1	GUILD_FLAG,{
 	close;
 
 OnRecvCastleN03:
-	FlagEmblem GetCastleData("nguild_pay",1);
+	flagemblem getcastledata("nguild_pay",1);
 	end;
 }
 
@@ -144,7 +144,7 @@ nguild_pay,238,67,4	script	NGuild Payon#f1-6::NGuildPay	GUILD_FLAG,{
 	close;
 
 OnRecvCastleN03:
-	FlagEmblem GetCastleData("nguild_pay",1);
+	flagemblem getcastledata("nguild_pay",1);
 	end;
 }
 // In Castle ===============================================
@@ -166,7 +166,7 @@ n_castle,94,96,7	script	NGuild Prontera#p1-1	GUILD_FLAG,{
 	close;
 
 OnRecvCastleN04:
-	FlagEmblem GetCastleData("nguild_prt",1);
+	flagemblem getcastledata("nguild_prt",1);
 	end;
 }
 
@@ -175,7 +175,7 @@ nguild_prt,58,56,4	script	NGuild Prontera#p1-7::NGuildPrt	GUILD_FLAG,{
 	close;
 
 OnRecvCastleN04:
-	FlagEmblem GetCastleData("nguild_prt",1);
+	flagemblem getcastledata("nguild_prt",1);
 	end;
 }
 // In Castle =============================================
diff --git a/npc/events/nguild/nguild_guardians.txt b/npc/events/nguild/nguild_guardians.txt
index 7b0e5bab4..3a34259c2 100644
--- a/npc/events/nguild/nguild_guardians.txt
+++ b/npc/events/nguild/nguild_guardians.txt
@@ -15,73 +15,73 @@
 //------------------------------------------------------------------------------
 nguild_alde,216,24,0	script	Guardian_N01	-1,{
 OnAgitInit:
-	if (GetCastleData("nguild_alde",10) == 1) guardian "nguild_alde",18,219,"Soldier Guardian",1287,"Guardian_N01::OnGuardianDied",0;
-	if (GetCastleData("nguild_alde",11) == 1) guardian "nguild_alde",117,42,"Soldier Guardian",1287,"Guardian_N01::OnGuardianDied",1;
-	if (GetCastleData("nguild_alde",12) == 1) guardian "nguild_alde",207,153,"Soldier Guardian",1287,"Guardian_N01::OnGuardianDied",2;
-	if (GetCastleData("nguild_alde",13) == 1) guardian "nguild_alde",68,70,"Archer Guardian",1285,"Guardian_N01::OnGuardianDied",3;
-	if (GetCastleData("nguild_alde",14) == 1) guardian "nguild_alde",187,140,"Archer Guardian",1285,"Guardian_N01::OnGuardianDied",4;
-	if (GetCastleData("nguild_alde",15) == 1) guardian "nguild_alde",62,204,"Knight Guardian",1286,"Guardian_N01::OnGuardianDied",5;
-	if (GetCastleData("nguild_alde",16) == 1) guardian "nguild_alde",113,100,"Knight Guardian",1286,"Guardian_N01::OnGuardianDied",6;
-	if (GetCastleData("nguild_alde",17) == 1) guardian "nguild_alde",211,174,"Knight Guardian",1286,"Guardian_N01::OnGuardianDied",7;
+	if (getcastledata("nguild_alde",10) == 1) guardian "nguild_alde",18,219,"Soldier Guardian",1287,"Guardian_N01::OnGuardianDied",0;
+	if (getcastledata("nguild_alde",11) == 1) guardian "nguild_alde",117,42,"Soldier Guardian",1287,"Guardian_N01::OnGuardianDied",1;
+	if (getcastledata("nguild_alde",12) == 1) guardian "nguild_alde",207,153,"Soldier Guardian",1287,"Guardian_N01::OnGuardianDied",2;
+	if (getcastledata("nguild_alde",13) == 1) guardian "nguild_alde",68,70,"Archer Guardian",1285,"Guardian_N01::OnGuardianDied",3;
+	if (getcastledata("nguild_alde",14) == 1) guardian "nguild_alde",187,140,"Archer Guardian",1285,"Guardian_N01::OnGuardianDied",4;
+	if (getcastledata("nguild_alde",15) == 1) guardian "nguild_alde",62,204,"Knight Guardian",1286,"Guardian_N01::OnGuardianDied",5;
+	if (getcastledata("nguild_alde",16) == 1) guardian "nguild_alde",113,100,"Knight Guardian",1286,"Guardian_N01::OnGuardianDied",6;
+	if (getcastledata("nguild_alde",17) == 1) guardian "nguild_alde",211,174,"Knight Guardian",1286,"Guardian_N01::OnGuardianDied",7;
 	end;
 
 OnGuardianDied:
 	// Event when Guardian dies
-	MapAnnounce "nguild_alde","A Guardian Has Fallen",17;
+	mapannounce "nguild_alde","A Guardian Has Fallen",17;
 	end;
 }
 
 //------------------------------------------------------------------------------
 nguild_gef,198,182,0	script	Guardian_N02	-1,{
 OnAgitInit:
-	if (GetCastleData("nguild_gef",10) == 1) guardian "nguild_gef",30,178,"Soldier Guardian",1287,"Guardian_N02::OnGuardianDied",0;
-	if (GetCastleData("nguild_gef",11) == 1) guardian "nguild_gef",64,180,"Soldier Guardian",1287,"Guardian_N02::OnGuardianDied",1;
-	if (GetCastleData("nguild_gef",12) == 1) guardian "nguild_gef",61,25,"Soldier Guardian",1287,"Guardian_N02::OnGuardianDied",2;
-	if (GetCastleData("nguild_gef",13) == 1) guardian "nguild_gef",61,44,"Archer Guardian",1285,"Guardian_N02::OnGuardianDied",3;
-	if (GetCastleData("nguild_gef",14) == 1) guardian "nguild_gef",189,43,"Archer Guardian",1285,"Guardian_N02::OnGuardianDied",4;
-	if (GetCastleData("nguild_gef",15) == 1) guardian "nguild_gef",51,192,"Knight Guardian",1286,"Guardian_N02::OnGuardianDied",5;
-	if (GetCastleData("nguild_gef",16) == 1) guardian "nguild_gef",49,67,"Knight Guardian",1286,"Guardian_N02::OnGuardianDied",6;
-	if (GetCastleData("nguild_gef",17) == 1) guardian "nguild_gef",181,14,"Knight Guardian",1286,"Guardian_N02::OnGuardianDied",7;
+	if (getcastledata("nguild_gef",10) == 1) guardian "nguild_gef",30,178,"Soldier Guardian",1287,"Guardian_N02::OnGuardianDied",0;
+	if (getcastledata("nguild_gef",11) == 1) guardian "nguild_gef",64,180,"Soldier Guardian",1287,"Guardian_N02::OnGuardianDied",1;
+	if (getcastledata("nguild_gef",12) == 1) guardian "nguild_gef",61,25,"Soldier Guardian",1287,"Guardian_N02::OnGuardianDied",2;
+	if (getcastledata("nguild_gef",13) == 1) guardian "nguild_gef",61,44,"Archer Guardian",1285,"Guardian_N02::OnGuardianDied",3;
+	if (getcastledata("nguild_gef",14) == 1) guardian "nguild_gef",189,43,"Archer Guardian",1285,"Guardian_N02::OnGuardianDied",4;
+	if (getcastledata("nguild_gef",15) == 1) guardian "nguild_gef",51,192,"Knight Guardian",1286,"Guardian_N02::OnGuardianDied",5;
+	if (getcastledata("nguild_gef",16) == 1) guardian "nguild_gef",49,67,"Knight Guardian",1286,"Guardian_N02::OnGuardianDied",6;
+	if (getcastledata("nguild_gef",17) == 1) guardian "nguild_gef",181,14,"Knight Guardian",1286,"Guardian_N02::OnGuardianDied",7;
 	end;
 
 OnGuardianDied:
 	// Event when Guardian dies
-	MapAnnounce "nguild_gef","A Guardian Has Fallen",17;
+	mapannounce "nguild_gef","A Guardian Has Fallen",17;
 	end;
 }
 //------------------------------------------------------------------------------
 nguild_pay,139,139,0	script	Guardian_N03	-1,{
 OnAgitInit:
-	if (GetCastleData("nguild_pay",10) == 1) guardian "nguild_pay",210,120,"Soldier Guardian",1287,"Guardian_N03::OnGuardianDied",0;
-	if (GetCastleData("nguild_pay",11) == 1) guardian "nguild_pay",69,26,"Soldier Guardian",1287,"Guardian_N03::OnGuardianDied",1; 
-	if (GetCastleData("nguild_pay",12) == 1) guardian "nguild_pay",23,141,"Soldier Guardian",1287,"Guardian_N03::OnGuardianDied",2;
-	if (GetCastleData("nguild_pay",13) == 1) guardian "nguild_pay",224,87,"Archer Guardian",1285,"Guardian_N03::OnGuardianDied",3;
-	if (GetCastleData("nguild_pay",14) == 1) guardian "nguild_pay",81,45,"Archer Guardian",1285,"Guardian_N03::OnGuardianDied",4;
-	if (GetCastleData("nguild_pay",15) == 1) guardian "nguild_pay",214,53,"Knight Guardian",1286,"Guardian_N03::OnGuardianDied",5;
-	if (GetCastleData("nguild_pay",16) == 1) guardian "nguild_pay",69,26,"Knight Guardian",1286,"Guardian_N03::OnGuardianDied",6;
-	if (GetCastleData("nguild_pay",17) == 1) guardian "nguild_pay",23,141,"Knight Guardian",1286,"Guardian_N03::OnGuardianDied",7;
+	if (getcastledata("nguild_pay",10) == 1) guardian "nguild_pay",210,120,"Soldier Guardian",1287,"Guardian_N03::OnGuardianDied",0;
+	if (getcastledata("nguild_pay",11) == 1) guardian "nguild_pay",69,26,"Soldier Guardian",1287,"Guardian_N03::OnGuardianDied",1; 
+	if (getcastledata("nguild_pay",12) == 1) guardian "nguild_pay",23,141,"Soldier Guardian",1287,"Guardian_N03::OnGuardianDied",2;
+	if (getcastledata("nguild_pay",13) == 1) guardian "nguild_pay",224,87,"Archer Guardian",1285,"Guardian_N03::OnGuardianDied",3;
+	if (getcastledata("nguild_pay",14) == 1) guardian "nguild_pay",81,45,"Archer Guardian",1285,"Guardian_N03::OnGuardianDied",4;
+	if (getcastledata("nguild_pay",15) == 1) guardian "nguild_pay",214,53,"Knight Guardian",1286,"Guardian_N03::OnGuardianDied",5;
+	if (getcastledata("nguild_pay",16) == 1) guardian "nguild_pay",69,26,"Knight Guardian",1286,"Guardian_N03::OnGuardianDied",6;
+	if (getcastledata("nguild_pay",17) == 1) guardian "nguild_pay",23,141,"Knight Guardian",1286,"Guardian_N03::OnGuardianDied",7;
 	end;
 
 OnGuardianDied:
 	// Event when Guardian dies
-	MapAnnounce "nguild_pay","A Guardian Has Fallen",17;
+	mapannounce "nguild_pay","A Guardian Has Fallen",17;
 	end;
 }
 //------------------------------------------------------------------------------
 nguild_prt,197,197,0	script	Guardian_N04	-1,{
 OnAgitInit:
-	if (GetCastleData("nguild_prt",10) == 1) guardian "nguild_prt",196,92,"Soldier Guardian",1287,"Guardian_N04::OnGuardianDied",0;
-	if (GetCastleData("nguild_prt",11) == 1) guardian "nguild_prt",113,200,"Soldier Guardian",1287,"Guardian_N04::OnGuardianDied",1;
-	if (GetCastleData("nguild_prt",12) == 1) guardian "nguild_prt",111,186,"Soldier Guardian",1287,"Guardian_N04::OnGuardianDied",2;
-	if (GetCastleData("nguild_prt",13) == 1) guardian "nguild_prt",76,202,"Archer Guardian",1285,"Guardian_N04::OnGuardianDied",3;
-	if (GetCastleData("nguild_prt",14) == 1) guardian "nguild_prt",90,26,"Archer Guardian",1285,"Guardian_N04::OnGuardianDied",4;
-	if (GetCastleData("nguild_prt",15) == 1) guardian "nguild_prt",58,59,"Knight Guardian",1286,"Guardian_N04::OnGuardianDied",5;
-	if (GetCastleData("nguild_prt",16) == 1) guardian "nguild_prt",112,200,"Knight Guardian",1286,"Guardian_N04::OnGuardianDied",6;
-	if (GetCastleData("nguild_prt",17) == 1) guardian "nguild_prt",101,194,"Knight Guardian",1286,"Guardian_N04::OnGuardianDied",7;
+	if (getcastledata("nguild_prt",10) == 1) guardian "nguild_prt",196,92,"Soldier Guardian",1287,"Guardian_N04::OnGuardianDied",0;
+	if (getcastledata("nguild_prt",11) == 1) guardian "nguild_prt",113,200,"Soldier Guardian",1287,"Guardian_N04::OnGuardianDied",1;
+	if (getcastledata("nguild_prt",12) == 1) guardian "nguild_prt",111,186,"Soldier Guardian",1287,"Guardian_N04::OnGuardianDied",2;
+	if (getcastledata("nguild_prt",13) == 1) guardian "nguild_prt",76,202,"Archer Guardian",1285,"Guardian_N04::OnGuardianDied",3;
+	if (getcastledata("nguild_prt",14) == 1) guardian "nguild_prt",90,26,"Archer Guardian",1285,"Guardian_N04::OnGuardianDied",4;
+	if (getcastledata("nguild_prt",15) == 1) guardian "nguild_prt",58,59,"Knight Guardian",1286,"Guardian_N04::OnGuardianDied",5;
+	if (getcastledata("nguild_prt",16) == 1) guardian "nguild_prt",112,200,"Knight Guardian",1286,"Guardian_N04::OnGuardianDied",6;
+	if (getcastledata("nguild_prt",17) == 1) guardian "nguild_prt",101,194,"Knight Guardian",1286,"Guardian_N04::OnGuardianDied",7;
 	end;
 
 OnGuardianDied:
 	// Event when Guardian dies
-	MapAnnounce "nguild_prt","A Guardian Has Fallen",17;
+	mapannounce "nguild_prt","A Guardian Has Fallen",17;
 	end;
 }
diff --git a/npc/events/nguild/nguild_kafras.txt b/npc/events/nguild/nguild_kafras.txt
index 155c33792..100751f7a 100644
--- a/npc/events/nguild/nguild_kafras.txt
+++ b/npc/events/nguild/nguild_kafras.txt
@@ -16,11 +16,11 @@
 
 function	script	F_GKafra	{
 	cutin "kafra_01",2;
-	set @GID, GetCastleData(getarg(0),1);
+	set @GID, getcastledata(getarg(0),1);
 	if (getcharid(2) == @GID && getgdskilllv(@GID,10001)) goto L_StartG;
 
 	mes "[Kafra Service]";
-	mes "I am contracted to provide service only for the ^ff0000" + GetGuildName(@GID) + "^000000 Guild. Please use another Kafra Corporation staff member around here. I am Sorry for your inconvenience.";
+	mes "I am contracted to provide service only for the ^ff0000" + getguildname(@GID) + "^000000 Guild. Please use another Kafra Corporation staff member around here. I am Sorry for your inconvenience.";
 	cutin "",255;
 	close;
 L_StartG:
@@ -36,7 +36,7 @@ nguild_alde,218,170,0	script	Kafra Service#N01	4_F_KAFRA1,{
 	callfunc "F_GKafra", "nguild_alde", "Prontera";
 	end;
 OnRecvCastleN01:
-	if (GetCastleData("nguild_alde",9) < 1) disablenpc "Kafra Service#N01";
+	if (getcastledata("nguild_alde",9) < 1) disablenpc "Kafra Service#N01";
 	end;
 }
 
@@ -46,7 +46,7 @@ nguild_gef,35,37,0	script	Kafra Service#N02	4_F_KAFRA1,{
 	callfunc "F_GKafra", "nguild_gef", "Prontera";
 	end;
 OnRecvCastleN02:
-	if (GetCastleData("nguild_gef",9) < 1) disablenpc "Kafra Service#N02";
+	if (getcastledata("nguild_gef",9) < 1) disablenpc "Kafra Service#N02";
 	end;
 }
 
@@ -55,7 +55,7 @@ nguild_pay,128,58,3	script	Kafra Service#N03	4_F_KAFRA1,{
 	callfunc "F_GKafra", "nguild_pay", "Prontera";
 	end;
 OnRecvCastleN03:
-	if (GetCastleData("nguild_pay",9) < 1) disablenpc "Kafra Service#N03";
+	if (getcastledata("nguild_pay",9) < 1) disablenpc "Kafra Service#N03";
 	end;
 }
 
@@ -64,6 +64,6 @@ nguild_prt,96,173,0	script	Kafra Service#N04	4_F_KAFRA1,{
 	callfunc "F_GKafra", "nguild_prt", "Prontera";
 	end;
 OnRecvCastleN04:
-	if (GetCastleData("nguild_prt",9) < 1) disablenpc "Kafra Service#N04";
+	if (getcastledata("nguild_prt",9) < 1) disablenpc "Kafra Service#N04";
 	end;
 }
diff --git a/npc/events/nguild/nguild_managers.txt b/npc/events/nguild/nguild_managers.txt
index fd5fc6053..de185213e 100644
--- a/npc/events/nguild/nguild_managers.txt
+++ b/npc/events/nguild/nguild_managers.txt
@@ -23,7 +23,7 @@
 //==============================================
 function	script	F_GldManager	{
 
-	set @GID, GetCastleData(getarg(1),1);
+	set @GID, getcastledata(getarg(1),1);
 	mes "[ "+getarg(0)+" ]";
 	if (@GID == 0){
 		mes "I am waiting for my master.  Brave adventurer, follow your destiny!";
@@ -48,7 +48,7 @@ function	script	F_GldManager	{
 	M_Kaf:
 	//======
 		mes "[ "+getarg(0)+" ]";
-		if (GetCastleData(getarg(1),9) == 1) goto L_Dismiss;
+		if (getcastledata(getarg(1),9) == 1) goto L_Dismiss;
 		if (getgdskilllv(@GID,10001) == 0){
 			mes "Master, you don't have a contract with the Kafra Staff Company.";
 			mes "In order to hire a Kafra, you must first learn the Guild skill ^5533FFContract With Kafra^000000.";
@@ -67,7 +67,7 @@ function	script	F_GldManager	{
 				}
 				set Zeny,Zeny-10000;
 				enablenpc "Kafra Staff#"+getarg(4);
-				SetCastleData getarg(1),9,1;
+				setcastledata getarg(1),9,1;
 				mes "You have created a contract with the Kafra Staff Company.";
 				next;
 				cutin "kafra_01",2;
@@ -100,7 +100,7 @@ function	script	F_GldManager	{
 					mes "It's unfortunate that I won't be able to serve your guild anymore....";
 					next;
 					disablenpc "Kafra Staff#"+getarg(4);
-					SetCastleData getarg(1),9,0;
+					setcastledata getarg(1),9,0;
 					cutin "kafra_01",255;
 					mes "[ "+getarg(0)+" ]";
 					mes "The Kafra has been dismissed.  But... we should really get a Kafra as soon as possible!";
diff --git a/npc/events/nguild/nguild_treas.txt b/npc/events/nguild/nguild_treas.txt
index cc3d7db1e..fe5512835 100644
--- a/npc/events/nguild/nguild_treas.txt
+++ b/npc/events/nguild/nguild_treas.txt
@@ -26,13 +26,13 @@ function	script	F_GldTreas	{
 		//killmonster getarg(0),"Treasure_"+getarg(1)+"::OnDied";
 
 		// Don't spawn treasures if Castle is empty, or Eco is greater than 100
-		if(GetCastleData(getarg(0),2) > 100 || GetCastleData(getarg(0),1) == 0) return;
+		if(getcastledata(getarg(0),2) > 100 || getcastledata(getarg(0),1) == 0) return;
 
 		// Only spawn one treasure chest for novice castles.
 		if (compare(getarg(0),"nguild"))
 			set getarg(2),1;
 		else
-			set getarg(2),GetCastleData(getarg(0),2)/5+4;
+			set getarg(2),getcastledata(getarg(0),2)/5+4;
 
 		if (getarg(2) <= 0) return;