Merge pull request #1 from HerculesWS/master

Update from original

23 files changed, 680 insertions, 678 deletions

diff --git a/npc/guild/agit_controller.txt b/npc/guild/agit_controller.txt
index 283807a46..de55029fc 100644
--- a/npc/guild/agit_controller.txt
+++ b/npc/guild/agit_controller.txt
@@ -48,7 +48,7 @@ OnAgitInit:
 	   (gettime(4)==4) && (gettime(3)>=21 && gettime(3)<23) ||
 	   (gettime(4)==6) && (gettime(3)>=16 && gettime(3)<18)) {
 		if (!agitcheck()) {
-			AgitStart;
+			agitstart;
 			callsub S_DisplayOwners;
 		}
 		end;
@@ -57,9 +57,9 @@ OnAgitInit:
 	// end time checks
 	if ((gettime(4)==2) && (gettime(3)==23) ||
 	    (gettime(4)==4) && (gettime(3)==23) ||
-	    (gettime(4)==6) && (gettime(3)==18)) { 
+	    (gettime(4)==6) && (gettime(3)==18)) {
 		if (agitcheck()) {
-			AgitEnd;
+			agitend;
 			callsub S_DisplayOwners;
 		}
 		end;
@@ -72,10 +72,10 @@ S_DisplayOwners:
 	setarray .@maps$[10],"payg_cas01","payg_cas02","payg_cas03","payg_cas04","payg_cas05";
 	setarray .@maps$[15],"prtg_cas01","prtg_cas02","prtg_cas03","prtg_cas04","prtg_cas05";
 	for( set .@i, 0; .@i <= 19; set .@i, .@i+1 ) {
-		if (GetCastleData(.@maps$[.@i],1))
-			Announce "The [" + GetCastleName(.@maps$[.@i]) + "] castle has been conquered by the [" + GetGuildName(GetCastleData(.@maps$[.@i],1)) + "] guild.",bc_all|bc_woe;
+		if (getcastledata(.@maps$[.@i],1))
+			announce "The [" + getcastlename(.@maps$[.@i]) + "] castle has been conquered by the [" + getguildname(getcastledata(.@maps$[.@i],1)) + "] guild.",bc_all|bc_woe;
 		else
-			Announce "The [" + GetCastleName(.@maps$[.@i]) + "] castle is currently unoccupied.",bc_all|bc_woe;
+			announce "The [" + getcastlename(.@maps$[.@i]) + "] castle is currently unoccupied.",bc_all|bc_woe;
 	}
 	end;
 }
diff --git a/npc/guild/agit_main.txt b/npc/guild/agit_main.txt
index 5253fbe16..dc799a21f 100644
--- a/npc/guild/agit_main.txt
+++ b/npc/guild/agit_main.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
-//= 1.9a
+//= 2.0
 //===== Description: =========================================
 //= [ Aegis Conversion]
 //= ----------------------------------------------------------
@@ -31,7 +31,7 @@
 //=   treasure chest spawned.
 //===== Additional Comments: =================================
 //= 1.0 First Version. No longer uses functions. [L0ne_W0lf]
-//= 1.1 Daily investement will now be reset. [L0ne_W0lf]
+//= 1.1 Daily investment will now be reset. [L0ne_W0lf]
 //=     Template will no longer try to spawn chests.
 //= 1.2 Fixed Eco Invest option charging twice. [L0ne_W0lf]
 //= 1.3 Fixed a loading flag emblem for Payon 1. [L0ne_W0lf]
@@ -46,10 +46,11 @@
 //= 1.6a Corrected conditions in the new investing blocks. [L0ne_W0lf]
 //= 1.6b Moved where investments are added to eco/def. [L0ne_W0lf]
 //= 1.7 Updated Agitbreak announcements, added bc_woe [L0ne_W0lf]
-//=     and added extended anouncement format for mapannounce.
+//=     and added extended announcement format for mapannounce.
 //= 1.8 Fixed a possible exploit in guild castle investment. [Brian]
 //= 1.9 Partially rewrote Script. [Masao]
 //= 1.9a Fixed incorrect setcastledata parameter. [Euphy]
+//= 2.0 Fixed an issue where Castle Manager couldn't be fired. [Joseph]
 //============================================================
 
 // WoE : Main Functions
@@ -60,8 +61,8 @@
 // War of Emperium has started.
 OnAgitStart:
 	if (strnpcinfo(0) == "Gld_Agit_Manager") end;
-	MapRespawnGuildID strnpcinfo(2),GetCastleData(strnpcinfo(2),1),6;
-	GvgOn strnpcinfo(2);
+	maprespawnguildid strnpcinfo(2),getcastledata(strnpcinfo(2),1),6;
+	gvgon strnpcinfo(2);
 
 // Spawn (fall through), or respawn the Emperium once it has been broken.
 OnStartArena:
@@ -106,31 +107,31 @@ OnAgitBreak:
 		end;
 	}
 	// Adjust Economy Invest Level for Castle
-	set .@Economy,GetCastleData(strnpcinfo(2),2) - 5;
+	set .@Economy,getcastledata(strnpcinfo(2),2) - 5;
 	if (.@Economy < 0) set .@Economy, 0;
-	SetCastleData strnpcinfo(2), 2, .@Economy;
+	setcastledata strnpcinfo(2), 2, .@Economy;
 	// Adjust Defense Invest Level for Castle
-	set .@Defence,GetCastleData(strnpcinfo(2),3) - 5;
-	if (.@Defence < 0) set .@Defence, 0;
-	SetCastleData strnpcinfo(2), 3, .@Defence;
+	set .@defence,getcastledata(strnpcinfo(2),3) - 5;
+	if (.@defence < 0) set .@defence, 0;
+	setcastledata strnpcinfo(2), 3, .@defence;
 
 	// Set new Castle Occupant
-	SetCastleData strnpcinfo(2),1, .@GID;
+	setcastledata strnpcinfo(2),1, .@GID;
 
 	// Announce that the Emperium is destroyed, and respawn all but new castle-occupants.
 	mapannounce strnpcinfo(2),"The emperium has been destroyed.",bc_map|bc_woe,"0x00CCFF",FW_NORMAL,12;
-	MapRespawnGuildID strnpcinfo(2),.@GID,6;
+	maprespawnguildid strnpcinfo(2),.@GID,6;
 
 	// Refresh castle data, disable Kafra and reset Invest information.
 	donpcevent strnpcinfo(0)+"::OnRecvCastle";
 	disablenpc "Kafra Staff#"+strnpcinfo(2);
 	for( set .@i, 4; .@i <= 9; set .@i, .@i+1 ) {
-		SetCastleData strnpcinfo(2), .@i, 0;
+		setcastledata strnpcinfo(2), .@i, 0;
 	}
 	// Erase Guardian Database information if the new owners do not have Guardian Research.
 	if( getgdskilllv(.@GID,10002) == 0 ) {
 		for( set .@i, 10; .@i <= 17; set .@i, .@i+1 ) {
-			SetCastleData strnpcinfo(2), .@i, 0;
+			setcastledata strnpcinfo(2), .@i, 0;
 		}
 	}
 	// Respawn the Emperium, and display new owners.
@@ -138,16 +139,16 @@ OnAgitBreak:
 	if( agitcheck() )
 		donpcevent "Agit#"+strnpcinfo(2)+"::OnStartArena";
 	sleep 7000;
-	announce "The [" + getcastlename(strnpcinfo(2)) + "] castle has been conquered by the [" + getguildName(.@GID) + "] guild.",bc_all|bc_woe;
+	announce "The [" + getcastlename(strnpcinfo(2)) + "] castle has been conquered by the [" + getguildname(.@GID) + "] guild.",bc_all|bc_woe;
 	end;
 
 // War of Emperium has ended.
 OnAgitEnd:
 	if (strnpcinfo(0) == "Gld_Agit_Manager") end;
-	GvgOff strnpcinfo(2);
+	gvgoff strnpcinfo(2);
 	// If the castle has no owner at the end of WoE, do not kill Emperium.
-	if (GetCastleData(strnpcinfo(2),1)) {
-		KillMonster strnpcinfo(2),"Agit#"+strnpcinfo(2)+"::OnAgitBreak";
+	if (getcastledata(strnpcinfo(2),1)) {
+		killmonster strnpcinfo(2),"Agit#"+strnpcinfo(2)+"::OnAgitBreak";
 	}
 	end;
 
@@ -157,10 +158,10 @@ OnGuildBreak:
 	// Kill guardians, disable the Kafra, and set owner to 0.
 	killmonster strnpcinfo(2),"Guardian#"+strnpcinfo(2)+"::OnGuardianDied";
 	disablenpc "Kafra Staff#"+strnpcinfo(2);
-	SetCastleData strnpcinfo(2),1,0;
+	setcastledata strnpcinfo(2),1,0;
 	// Wait before refreshing guild information.
 	sleep 7000;
-	Announce "Guild Base [" + GetCastleName(strnpcinfo(2)) + "] has been abandoned.",0;
+	announce "Guild Base [" + getcastlename(strnpcinfo(2)) + "] has been abandoned.",0;
 	donpcevent strnpcinfo(0)+"::OnRecvCastle";
 	end;
 
@@ -168,7 +169,7 @@ OnAgitInit:
 OnRecvCastle:
 	if (strnpcinfo(0) == "Gld_Agit_Manager") end;
 	// Spawn Monsters if the castle is empty.
-	set .@GID, GetCastleData(strnpcinfo(2),1);
+	set .@GID, getcastledata(strnpcinfo(2),1);
 	if (.@GID == 0) {
 		killmonsterall strnpcinfo(2);
 		if (compare(strnpcinfo(2),"aldeg")) {
@@ -306,7 +307,7 @@ OnRecvCastle:
 		// And load purchased Guardian in castles.
 		donpcevent "Guardian#"+strnpcinfo(2)+"::OnSpawnGuardians";
 		// And display Kafra if purchased.
-		if (GetCastleData(strnpcinfo(2),9) < 1) disablenpc "Kafra Staff#"+strnpcinfo(2);
+		if (getcastledata(strnpcinfo(2),9) < 1) disablenpc "Kafra Staff#"+strnpcinfo(2);
 	}
 	end;
 }
@@ -315,7 +316,7 @@ OnRecvCastle:
 //============================================================
 -	script	Kafra Staff#woe::guildkafra	-1,{
 
-	set .@GID,GetCastleData(strnpcinfo(2),1);
+	set .@GID,getcastledata(strnpcinfo(2),1);
 
 	if (compare(strnpcinfo(2),"aldeg")) {
 		setarray .@destination$[0],"Al De Baran","aldebaran";
@@ -341,7 +342,7 @@ OnRecvCastle:
 	cutin "kafra_01",2;
 	if (getcharid(2) == .@GID) {
 		mes "[Kafra Employee]";
-		mes "Welcome. ^ff0000" + GetGuildName(.@GID) + "^000000 Member.";
+		mes "Welcome. ^ff0000" + getguildname(.@GID) + "^000000 Member.";
 		mes "The Kafra Corporation will stay with you wherever you go.";
 		next;
 		switch (select("Use Storage:Use Teleport Service:Rent a Pushcart:Cancel")) {
@@ -382,7 +383,7 @@ OnRecvCastle:
 					cutin "",255;
 					end;
 				}
-				set Zeny, Zeny - 200;
+				Zeny -= 200;
 				set RESRVPTS,RESRVPTS+2;
 				close2;
 				warp .@destination$[1],.@coordinates[0],.@coordinates[1];
@@ -434,7 +435,7 @@ OnRecvCastle:
 					end;
 				}
 				set RESRVPTS,RESRVPTS+8;
-				set Zeny, Zeny - 800;
+				Zeny -= 800;
 				setcart;
 				close2;
 				cutin "",255;
@@ -454,7 +455,7 @@ OnRecvCastle:
 		}
 	}
 	mes "[Kafra Employee]";
-	mes "I am instructed to only offer my services to the ^ff0000"+GetGuildName(.@GID)+"^000000 Guild. Please try another Kafra Employee around here. Sorry for the inconvenience.";
+	mes "I am instructed to only offer my services to the ^ff0000"+getguildname(.@GID)+"^000000 Guild. Please try another Kafra Employee around here. Sorry for the inconvenience.";
 	close2;
 	cutin "",255;
 	end;
@@ -464,7 +465,7 @@ OnRecvCastle:
 //============================================================
 -	script	Castle Manager#cm::cm	-1,{
 
-	set .@GID,GetCastleData(strnpcinfo(2),1);
+	set .@GID,getcastledata(strnpcinfo(2),1);
 
 	// .@guardiantype = Defines the types of guardians per castle basis.
 	// 1 - Soldier Guardian, 2 - Archer Guardian, 3 - Knight Guardian
@@ -473,7 +474,7 @@ OnRecvCastle:
 	// .@guardianposy = Define the y spawn point for each guardian.
 	// [0] = 1st guardian's y spawn point.
 	// .@masterroom = Defines the coordinates of the Treasure Room.
-	if (strnpcinfo(2) == "aldeg_cas01") { 
+	if (strnpcinfo(2) == "aldeg_cas01") {
 		setarray .@guardiantype[0],1,2,2,2,2,3,3,3;
 		setarray .@guardianposx[0],17,39,38,45,21,218,213,73;
 		setarray .@guardianposy[0],218,208,196,228,194,24,24,70;
@@ -607,9 +608,9 @@ OnRecvCastle:
 		mes "Brave soul... fate will guide you towards your future...";
 		close;
 	}
-	if (GetGuildMaster(.@GID) != strcharinfo(0)) {
+	if (getguildmaster(.@GID) != strcharinfo(0)) {
 		mes "["+strnpcinfo(1)+"]";
-		mes "No matter how much you pester me, I'll still follow my master ^ff0000"+GetGuildMaster(.@GID)+"^000000. Where are the Guardians?! Send these ruffians away right now!";
+		mes "No matter how much you pester me, I'll still follow my master ^ff0000"+getguildmaster(.@GID)+"^000000. Where are the Guardians?! Send these ruffians away right now!";
 		close;
 	}
 	mes "["+strnpcinfo(1)+"]";
@@ -621,19 +622,19 @@ OnRecvCastle:
 		mes "["+strnpcinfo(1)+"]";
 		mes "I will report the Castle briefing, Master.";
 		mes " ";
-		mes "^0000ffNow, the commercial growth level is "+GetCastleData(strnpcinfo(2),2)+".";
-		if (GetCastleData(strnpcinfo(2),4)) {
-			mes " You invested "+GetCastleData(strnpcinfo(2),4)+" times in past 1 day.";
+		mes "^0000ffNow, the commercial growth level is "+getcastledata(strnpcinfo(2),2)+".";
+		if (getcastledata(strnpcinfo(2),4)) {
+			mes " You invested "+getcastledata(strnpcinfo(2),4)+" times in past 1 day.";
 		}
-		mes " Now, the Castle Defense level is "+GetCastleData(strnpcinfo(2),3)+".^000000";
-		if (GetCastleData(strnpcinfo(2),5)) {
-			mes " ^0000ff- You invested "+GetCastleData(strnpcinfo(2),5)+" times in past 1 day.^000000";
+		mes " Now, the Castle Defense level is "+getcastledata(strnpcinfo(2),3)+".^000000";
+		if (getcastledata(strnpcinfo(2),5)) {
+			mes " ^0000ff- You invested "+getcastledata(strnpcinfo(2),5)+" times in past 1 day.^000000";
 		}
 		mes " ";
 		mes "That's all I have to report, Master.";
 		close;
 	case 2:
-		set .@Economy,GetCastleData(strnpcinfo(2),2);
+		set .@Economy,getcastledata(strnpcinfo(2),2);
 		if (.@Economy < 6) { set .@eco_invest,5000; }
 		else if ((.@Economy >= 6) && (.@Economy <= 10)) { set .@eco_invest,10000; }
 		else if ((.@Economy >= 11) && (.@Economy <= 15)) { set .@eco_invest,20000; }
@@ -655,7 +656,7 @@ OnRecvCastle:
 		else if ((.@Economy >= 91) && (.@Economy <= 95)) { set .@eco_invest,860000; }
 		else if ((.@Economy >= 96) && (.@Economy <= 100)) { set .@eco_invest,955000; }
 		//Quadruple the cost of investing if you've already invested once.
-		if (GetCastleData(strnpcinfo(2),4)) {
+		if (getcastledata(strnpcinfo(2),4)) {
 			set .@eco_invest,.@eco_invest*4;
 		}
 		mes "["+strnpcinfo(1)+"]";
@@ -667,12 +668,12 @@ OnRecvCastle:
 			mes "^ff0000The commercial growth level of our Castle is at it's highest, 100%. No more investments are needed. Just as I have expected from a great economist like you, Master.^000000";
 			close;
 		}
-		if (GetCastleData(strnpcinfo(2),4) >= 2) {
+		if (getcastledata(strnpcinfo(2),4) >= 2) {
 			mes " ";
 			mes "^ff0000You have already invested twice today. You cannot invest any more.^000000 I expect riches of the guild to grow at a high rate.";
 			close;
 		}
-		if (GetCastleData(strnpcinfo(2),4) == 0) {
+		if (getcastledata(strnpcinfo(2),4) == 0) {
 			mes " ";
 			mes "The current investment amount required is ^ff0000"+.@eco_invest+"^000000 zeny. Will you invest?";
 		}
@@ -688,8 +689,8 @@ OnRecvCastle:
 				mes "I'm sorry but there is not enough zeny to invest. You will have to try again when you have the funds, Master.";
 				close;
 			}
-			set Zeny, Zeny - .@eco_invest;
-			SetCastleData strnpcinfo(2),4,GetCastleData(strnpcinfo(2),4)+1;
+			Zeny -= .@eco_invest;
+			setcastledata strnpcinfo(2),4,getcastledata(strnpcinfo(2),4)+1;
 			mes "[ "+strnpcinfo(1)+"]";
 			mes "We finished the investment safely. I expect that our growth level will be increased by tomorrow.";
 			close;
@@ -699,46 +700,46 @@ OnRecvCastle:
 			close;
 		}
 	case 3:
-		set .@Defence,GetCastleData(strnpcinfo(2),3);
-		if (.@Defence < 6) { set .@def_invest,10000; }
-		else if ((.@Defence >= 6) && (.@Defence <= 10)) { set .@def_invest,20000; }
-		else if ((.@Defence >= 11) && (.@Defence <= 15)) { set .@def_invest,40000; }
-		else if ((.@Defence >= 16) && (.@Defence <= 20)) { set .@def_invest,70000; }
-		else if ((.@Defence >= 21) && (.@Defence <= 25)) { set .@def_invest,110000; }
-		else if ((.@Defence >= 26) && (.@Defence <= 30)) { set .@def_invest,160000; }
-		else if ((.@Defence >= 31) && (.@Defence <= 35)) { set .@def_invest,220000; }
-		else if ((.@Defence >= 36) && (.@Defence <= 40)) { set .@def_invest,290000; }
-		else if ((.@Defence >= 41) && (.@Defence <= 45)) { set .@def_invest,370000; }
-		else if ((.@Defence >= 46) && (.@Defence <= 50)) { set .@def_invest,460000; }
-		else if ((.@Defence >= 51) && (.@Defence <= 55)) { set .@def_invest,560000; }
-		else if ((.@Defence >= 56) && (.@Defence <= 60)) { set .@def_invest,670000; }
-		else if ((.@Defence >= 61) && (.@Defence <= 65)) { set .@def_invest,790000; }
-		else if ((.@Defence >= 66) && (.@Defence <= 70)) { set .@def_invest,920000; }
-		else if ((.@Defence >= 71) && (.@Defence <= 75)) { set .@def_invest,1060000; }
-		else if ((.@Defence >= 76) && (.@Defence <= 80)) { set .@def_invest,1210000; }
-		else if ((.@Defence >= 81) && (.@Defence <= 85)) { set .@def_invest,1370000; }
-		else if ((.@Defence >= 86) && (.@Defence <= 90)) { set .@def_invest,1540000; }
-		else if ((.@Defence >= 91) && (.@Defence <= 95)) { set .@def_invest,1720000; }
-		else if ((.@Defence >= 96) && (.@Defence <= 100)) { set .@def_invest,1910000; }
+		set .@defence,getcastledata(strnpcinfo(2),3);
+		if (.@defence < 6) { set .@def_invest,10000; }
+		else if ((.@defence >= 6) && (.@defence <= 10)) { set .@def_invest,20000; }
+		else if ((.@defence >= 11) && (.@defence <= 15)) { set .@def_invest,40000; }
+		else if ((.@defence >= 16) && (.@defence <= 20)) { set .@def_invest,70000; }
+		else if ((.@defence >= 21) && (.@defence <= 25)) { set .@def_invest,110000; }
+		else if ((.@defence >= 26) && (.@defence <= 30)) { set .@def_invest,160000; }
+		else if ((.@defence >= 31) && (.@defence <= 35)) { set .@def_invest,220000; }
+		else if ((.@defence >= 36) && (.@defence <= 40)) { set .@def_invest,290000; }
+		else if ((.@defence >= 41) && (.@defence <= 45)) { set .@def_invest,370000; }
+		else if ((.@defence >= 46) && (.@defence <= 50)) { set .@def_invest,460000; }
+		else if ((.@defence >= 51) && (.@defence <= 55)) { set .@def_invest,560000; }
+		else if ((.@defence >= 56) && (.@defence <= 60)) { set .@def_invest,670000; }
+		else if ((.@defence >= 61) && (.@defence <= 65)) { set .@def_invest,790000; }
+		else if ((.@defence >= 66) && (.@defence <= 70)) { set .@def_invest,920000; }
+		else if ((.@defence >= 71) && (.@defence <= 75)) { set .@def_invest,1060000; }
+		else if ((.@defence >= 76) && (.@defence <= 80)) { set .@def_invest,1210000; }
+		else if ((.@defence >= 81) && (.@defence <= 85)) { set .@def_invest,1370000; }
+		else if ((.@defence >= 86) && (.@defence <= 90)) { set .@def_invest,1540000; }
+		else if ((.@defence >= 91) && (.@defence <= 95)) { set .@def_invest,1720000; }
+		else if ((.@defence >= 96) && (.@defence <= 100)) { set .@def_invest,1910000; }
 		//Quadruple the cost of investing if you've already invested once.
-		if (GetCastleData(strnpcinfo(2),5)) {
+		if (getcastledata(strnpcinfo(2),5)) {
 			set .@def_invest,.@def_invest*4;
 		}
 		mes "["+strnpcinfo(1)+"]";
 		mes "If you raise Castle Defenses, the durability of Guardians and the Emperium will increase. Therefore, if you consider our coming battles, some investment in this area will be required.";
 		mes " ";
 		mes "Originally you can invest just once but if you pay more money, you can invest twice.";
-		if (.@Defence >= 100) {
+		if (.@defence >= 100) {
 			mes " ";
 			mes "^ff0000But the Castle Defense level of our Castle is at it's highest, 100%. No more investments are needed. Just as I have expected from a great strategist like you, Master.^000000";
 			close;
 		}
-		if (GetCastleData(strnpcinfo(2),5) >= 2) {
+		if (getcastledata(strnpcinfo(2),5) >= 2) {
 			mes " ";
 			mes "^ff0000You have already invested twice today. You cannot invest any more.^000000 I expect the Defenses of the guild to grow at a high rate.";
 			close;
 		}
-		if (GetCastleData(strnpcinfo(2),5) == 0) {
+		if (getcastledata(strnpcinfo(2),5) == 0) {
 			mes " ";
 			mes "The current investment amount required is ^ff0000"+.@def_invest+"^000000 zeny. Will you invest?";
 		}
@@ -754,8 +755,8 @@ OnRecvCastle:
 				mes "I'm sorry but there is not enough zeny to invest. You will have to try again when you have the funds, Master.";
 				close;
 			}
-			set Zeny, Zeny - .@def_invest;
-			SetCastleData strnpcinfo(2),5,GetCastleData(strnpcinfo(2),5)+1;
+			Zeny -= .@def_invest;
+			setcastledata strnpcinfo(2),5,getcastledata(strnpcinfo(2),5)+1;
 			mes "[ "+strnpcinfo(1)+"]";
 			mes "We finished the investment safely. I expect that our Castle Defense level will be increased by tomorrow.";
 			close;
@@ -792,7 +793,7 @@ OnRecvCastle:
 				mes "Master, we have not the resources to Summon the Guardian. If you want to accumulate them, you have to learn the Guild skill. We failed to summon the Guardian.";
 				close;
 			}
-			if (GetCastleData(strnpcinfo(2),.@GDnum) == 1) {
+			if (getcastledata(strnpcinfo(2),.@GDnum) == 1) {
 				mes "["+strnpcinfo(1)+"]";
 				mes "Master, you already have summoned that Guardian. We cannot summon another.";
 				close;
@@ -802,8 +803,8 @@ OnRecvCastle:
 				mes "Well... I'm sorry but we don't have funds to summon the Guardian. We failed to summon the Guardian.";
 				close;
 			}
-			set Zeny, Zeny - 10000;
-			SetCastleData strnpcinfo(2),.@GDnum,1; // mark as 'installed'
+			Zeny -= 10000;
+			setcastledata strnpcinfo(2),.@GDnum,1; // mark as 'installed'
 			set .@UseGID,.@GDnum - 10;
 			if (.@guardiantype[.@UseGID] == 1) { set .@type,1287; }
 			else if (.@guardiantype[.@UseGID] == 2) { set .@type,1285; }
@@ -818,7 +819,7 @@ OnRecvCastle:
 			close;
 		}
 	case 5:
-		if (GetCastleData(strnpcinfo(2),9) == 1) {
+		if (getcastledata(strnpcinfo(2),9) == 1) {
 			mes "["+strnpcinfo(1)+"]";
 			mes "We are currently hiring a Kafra Employee... Do you want to fire the Kafra Employee?";
 			next;
@@ -834,19 +835,20 @@ OnRecvCastle:
 					mes "Oh, my goodness! This is nonsense!";
 					next;
 					cutin "",255;
-					close;
+					break;
 				case 2:
 					mes "[ Hired Kafra Employee ]";
 					mes "I'll work hard for you... Thank you!";
 					close;
 				}
+				break;
 			case 2:
 				mes "["+strnpcinfo(1)+"]";
 				mes "She worked hard in my opinion. It was a good decision to keep her.";
 				close;
 			}
 			disablenpc "Kafra Staff#"+strnpcinfo(2);
-			SetCastleData strnpcinfo(2),9,0;
+			setcastledata strnpcinfo(2),9,0;
 			mes "["+strnpcinfo(1)+"]";
 			mes "....";
 			mes "I have discharged the Kafra Employee... But... are you unsatisfied with something?";
@@ -868,9 +870,9 @@ OnRecvCastle:
 				mes "Well... I'm sorry but we don't have enough funds to hire a Kafra Employee.";
 				close;
 			}
-			set Zeny, Zeny - 10000;
+			Zeny -= 10000;
 			enablenpc "Kafra Staff#"+strnpcinfo(2);
-			SetCastleData strnpcinfo(2),9,1;
+			setcastledata strnpcinfo(2),9,1;
 			mes "["+strnpcinfo(1)+"]";
 			mes "We obtained a contract with the kafra Main Office, and hired a Kafra Employee.";
 			next;
@@ -915,7 +917,7 @@ OnRecvCastle:
 //============================================================
 -	script	Lever#gd::gdlever	-1,{
 
-	set .@GID,GetCastleData(strnpcinfo(2),1);
+	set .@GID,getcastledata(strnpcinfo(2),1);
 
 	if (.@GID == 0) {
 		mes "[Ringing Voice]";
@@ -993,7 +995,7 @@ OnSpawnGuardians:
 	// Define the y spawn point for each uardian.
 	// [0] = 1st guardian's y spawn point.
 	// Aldebaran (Luina) Castles
-	if (strnpcinfo(2) == "aldeg_cas01") { 
+	if (strnpcinfo(2) == "aldeg_cas01") {
 		setarray .@guardiantype[0],1,2,2,2,2,3,3,3;
 		setarray .@guardianposx[0],17,39,38,45,21,218,213,73;
 		setarray .@guardianposy[0],218,208,196,228,194,24,24,70;
@@ -1110,7 +1112,7 @@ OnSpawnGuardians:
 		if (.@guardiantype[.@i] == 1) { set .@type,1287; }
 		else if (.@guardiantype[.@i] == 2) { set .@type,1285; }
 		else { set .@type,1286; }
-		if (GetCastleData(strnpcinfo(2),.@UseGID)) {
+		if (getcastledata(strnpcinfo(2),.@UseGID)) {
 			guardian strnpcinfo(2),.@guardianposx[.@i],.@guardianposy[.@i],strmobinfo(2,.@type),.@type,"Guardian#"+strnpcinfo(2)+"::OnGuardianDied",.@i;
 		}
 	}
@@ -1129,111 +1131,111 @@ OnClock0001:
 	// Do nothing if this script is the template.
 	if (strnpcinfo(1) == "Gld_Trea_Spawn") end;
 	
-	set .@GID, GetCastleData(strnpcinfo(2),1);
+	set .@GID, getcastledata(strnpcinfo(2),1);
 	
 	// If there is no owner, do nothing.
 	if (!.@GID) end;
 
 	// Is there Economy in this castle?
-	set .@Treasure,GetCastleData(strnpcinfo(2),2)/5+4;
+	set .@Treasure,getcastledata(strnpcinfo(2),2)/5+4;
 
 	// Set information
-	if (strnpcinfo(2) == "aldeg_cas01") { 
+	if (strnpcinfo(2) == "aldeg_cas01") {
 		set .@treasurebox,1324;
 		setarray .@treasurex[0],115,122,115,122,116,117,118,119,120,121,121,121,121,121,121,120,119,118,117,116,116,116,116,116;
 		setarray .@treasurey[0],226,226,219,219,225,225,225,225,225,225,224,223,222,221,220,220,220,220,220,220,221,222,223,224;
 	}
-	else if (strnpcinfo(2) == "aldeg_cas02") { 
+	else if (strnpcinfo(2) == "aldeg_cas02") {
 		set .@treasurebox,1326;
 		setarray .@treasurex[0],134,135,135,134,132,133,134,135,136,137,137,137,137,137,137,136,135,134,133,132,132,132,132,132;
 		setarray .@treasurey[0],231,231,230,230,233,233,233,233,233,233,232,231,230,229,228,228,228,228,228,228,229,230,231,232;
 	}
-	else if (strnpcinfo(2) == "aldeg_cas03") { 
+	else if (strnpcinfo(2) == "aldeg_cas03") {
 		set .@treasurebox,1328;
 		setarray .@treasurex[0],224,225,225,224,222,223,224,225,226,227,227,227,227,227,227,226,225,224,223,222,222,222,222,222;
 		setarray .@treasurey[0],269,269,268,268,271,271,271,271,271,271,270,269,268,267,266,266,266,266,266,266,267,268,269,270;
 	}
-	else if (strnpcinfo(2) == "aldeg_cas04") { 
+	else if (strnpcinfo(2) == "aldeg_cas04") {
 		set .@treasurebox,1330;
 		setarray .@treasurex[0],84,85,85,84,82,83,84,85,86,87,87,87,87,87,87,86,85,84,83,82,82,82,82,82;
 		setarray .@treasurey[0],13,13,12,12,15,15,15,15,15,15,14,13,12,11,10,10,10,10,10,10,11,12,13,14;
 	}
-	else if (strnpcinfo(2) == "aldeg_cas05") { 
+	else if (strnpcinfo(2) == "aldeg_cas05") {
 		set .@treasurebox,1332;
 		setarray .@treasurex[0],61,62,62,61,59,60,61,62,63,64,64,64,64,64,64,63,62,61,60,59,59,59,59,59;
 		setarray .@treasurey[0],12,12,11,11,14,14,14,14,14,14,13,12,11,10,9,9,9,9,9,9,10,11,12,13;
 	}
-	else if (strnpcinfo(2) == "gefg_cas01") { 
+	else if (strnpcinfo(2) == "gefg_cas01") {
 		set .@treasurebox,1334;
 		setarray .@treasurex[0],153,154,154,153,151,152,153,154,155,156,156,156,156,156,156,155,154,153,152,151,151,151,151,151;
 		setarray .@treasurey[0],113,113,112,112,115,115,115,115,115,115,114,113,112,111,110,110,110,110,110,110,111,112,113,114;
 	}
-	else if (strnpcinfo(2) == "gefg_cas02") { 
+	else if (strnpcinfo(2) == "gefg_cas02") {
 		set .@treasurebox,1336;
 		setarray .@treasurex[0],139,140,140,139,137,138,139,140,141,142,142,142,142,142,142,141,140,139,138,137,137,137,137,137;
 		setarray .@treasurey[0],115,115,114,114,117,117,117,117,117,117,116,115,114,113,112,112,112,112,112,112,113,114,115,116;
 	}
-	else if (strnpcinfo(2) == "gefg_cas03") { 
+	else if (strnpcinfo(2) == "gefg_cas03") {
 		set .@treasurebox,1338;
 		setarray .@treasurex[0],269,270,270,269,267,268,269,270,271,272,272,272,272,272,272,271,270,269,268,267,267,267,267,267;
 		setarray .@treasurey[0],291,291,290,290,293,293,293,293,293,293,292,291,290,289,288,288,288,288,288,288,289,290,291,292;
 	}
-	else if (strnpcinfo(2) == "gefg_cas04") { 
+	else if (strnpcinfo(2) == "gefg_cas04") {
 		set .@treasurebox,1340;
 		setarray .@treasurex[0],115,116,116,115,113,114,115,116,117,118,118,118,118,118,118,117,116,115,114,113,113,113,113,113;
 		setarray .@treasurey[0],119,119,118,118,121,121,121,121,121,121,120,119,118,117,116,116,116,116,116,116,117,118,119,120;
 	}
-	else if (strnpcinfo(2) == "gefg_cas05") { 
+	else if (strnpcinfo(2) == "gefg_cas05") {
 		set .@treasurebox,1342;
 		setarray .@treasurex[0],143,144,144,143,141,142,143,144,145,146,146,146,146,146,146,145,144,143,142,141,141,141,141,141;
 		setarray .@treasurey[0],110,110,109,109,112,112,112,112,112,112,111,110,109,108,107,107,107,107,107,107,108,109,110,111;
 	}
-	else if (strnpcinfo(2) == "payg_cas01") { 
+	else if (strnpcinfo(2) == "payg_cas01") {
 		set .@treasurebox,1344;
 		setarray .@treasurex[0],289,292,292,289,288,289,290,291,292,293,293,293,293,293,293,292,291,290,289,288,288,288,288,288;
 		setarray .@treasurey[0],10,10,7,7,11,11,11,11,11,11,10,9,8,7,6,6,6,6,6,6,7,8,9,10;
 	}
-	else if (strnpcinfo(2) == "payg_cas02") { 
+	else if (strnpcinfo(2) == "payg_cas02") {
 		set .@treasurebox,1346;
 		setarray .@treasurex[0],143,146,146,143,142,143,144,145,146,147,147,147,147,147,147,146,145,144,143,142,142,142,142,142;
 		setarray .@treasurey[0],146,146,143,143,147,147,147,147,147,147,146,145,144,143,142,142,142,142,142,142,143,144,145,146;
 	}
-	else if (strnpcinfo(2) == "payg_cas03") { 
+	else if (strnpcinfo(2) == "payg_cas03") {
 		set .@treasurebox,1348;
 		setarray .@treasurex[0],158,159,159,158,156,157,158,159,160,161,161,161,161,161,161,160,159,158,157,156,156,156,156,156;
 		setarray .@treasurey[0],169,169,168,168,171,171,171,171,171,171,170,169,168,167,166,166,166,166,166,166,167,168,169,170;
 	}
-	else if (strnpcinfo(2) == "payg_cas04") { 
+	else if (strnpcinfo(2) == "payg_cas04") {
 		set .@treasurebox,1350;
 		setarray .@treasurex[0],146,147,147,146,144,145,146,147,148,149,149,149,149,149,149,148,147,146,145,144,144,144,144,144;
 		setarray .@treasurey[0],48,48,47,47,50,50,50,50,50,50,49,48,47,46,45,45,45,45,45,45,46,47,48,49;
 	}
-	else if (strnpcinfo(2) == "payg_cas05") { 
+	else if (strnpcinfo(2) == "payg_cas05") {
 		set .@treasurebox,1352;
 		setarray .@treasurex[0],155,158,158,155,154,155,156,157,158,159,159,159,159,159,159,158,157,156,155,154,154,154,154,154;
 		setarray .@treasurey[0],134,134,131,131,135,135,135,135,135,135,134,133,132,131,130,130,130,130,130,130,131,132,133,134;
 	}
-	else if (strnpcinfo(2) == "prtg_cas01") { 
+	else if (strnpcinfo(2) == "prtg_cas01") {
 		set .@treasurebox,1354;
 		setarray .@treasurex[0],10,11,11,10,8,9,10,11,12,13,13,13,13,13,13,12,11,10,9,8,8,8,8,8;
 		setarray .@treasurey[0],209,209,208,208,211,211,211,211,211,211,210,209,208,207,206,206,206,206,206,206,207,208,209,210;
 	}
-	else if (strnpcinfo(2) == "prtg_cas02") { 
+	else if (strnpcinfo(2) == "prtg_cas02") {
 		set .@treasurebox,1356;
 		setarray .@treasurex[0],201,202,202,201,199,200,201,202,203,204,204,204,204,204,204,203,202,201,200,199,199,199,199,199;
 		setarray .@treasurey[0],228,228,227,227,230,230,230,230,230,230,229,228,227,226,225,225,225,225,225,225,226,227,228,229;
 	}
-	else if (strnpcinfo(2) == "prtg_cas03") { 
+	else if (strnpcinfo(2) == "prtg_cas03") {
 		set .@treasurebox,1358;
 		setarray .@treasurex[0],187,188,188,187,185,186,187,188,189,190,190,190,190,190,190,189,188,187,186,185,185,185,185,185;
 		setarray .@treasurey[0],132,132,131,131,134,134,134,134,134,134,133,132,131,130,129,129,129,129,129,129,130,131,132,133;
 	}
-	else if (strnpcinfo(2) == "prtg_cas04") { 
+	else if (strnpcinfo(2) == "prtg_cas04") {
 		set .@treasurebox,1360;
 		setarray .@treasurex[0],269,270,270,269,267,268,269,270,271,272,272,272,272,272,272,271,270,269,268,267,267,267,267,267;
 		setarray .@treasurey[0],162,162,161,161,164,164,164,164,164,164,163,162,161,160,159,159,159,159,159,159,160,161,162,163;
 	}
-	else if (strnpcinfo(2) == "prtg_cas05") { 
+	else if (strnpcinfo(2) == "prtg_cas05") {
 		set .@treasurebox,1362;
 		setarray .@treasurex[0],275,276,276,275,273,274,275,276,277,278,278,278,278,278,278,277,276,275,274,273,273,273,273,273;
 		setarray .@treasurey[0],178,178,177,177,180,180,180,180,180,180,179,178,177,176,175,175,175,175,175,175,176,177,178,179;
@@ -1245,15 +1247,15 @@ OnClock0001:
 
 	// Apply investment to Eco. and Def. Only happens if there were investments made.
 	// Permanent Development can only happen once per day.
-	if (GetCastleData(strnpcinfo(2),4)) {
-		set .@Economy,GetCastleData(strnpcinfo(2),2);
-		SetCastleData strnpcinfo(2),2,.@Economy + GetCastleData(strnpcinfo(2),4) + (rand(2) && getgdskilllv(.@GID,10014));
-		if (GetCastleData(strnpcinfo(2),2) > 100) SetCastleData strnpcinfo(2),2,100;
-	}
-	if (GetCastleData(strnpcinfo(2),5)) {
-		set .@Defence,GetCastleData(strnpcinfo(2),3);
-		SetCastleData strnpcinfo(2),3,.@Defence + GetCastleData(strnpcinfo(2),5);
-		if (GetCastleData(strnpcinfo(2),3) > 100) SetCastleData strnpcinfo(2),3,100;
+	if (getcastledata(strnpcinfo(2),4)) {
+		set .@Economy,getcastledata(strnpcinfo(2),2);
+		setcastledata strnpcinfo(2),2,.@Economy + getcastledata(strnpcinfo(2),4) + (rand(2) && getgdskilllv(.@GID,10014));
+		if (getcastledata(strnpcinfo(2),2) > 100) setcastledata strnpcinfo(2),2,100;
+	}
+	if (getcastledata(strnpcinfo(2),5)) {
+		set .@defence,getcastledata(strnpcinfo(2),3);
+		setcastledata strnpcinfo(2),3,.@defence + getcastledata(strnpcinfo(2),5);
+		if (getcastledata(strnpcinfo(2),3) > 100) setcastledata strnpcinfo(2),3,100;
 	}
 	// Reset daily investment limits.
 	setcastledata strnpcinfo(2),4,0;
diff --git a/npc/guild/aldeg_cas01.txt b/npc/guild/aldeg_cas01.txt
index 0707d4725..82b09d608 100644
--- a/npc/guild/aldeg_cas01.txt
+++ b/npc/guild/aldeg_cas01.txt
@@ -14,9 +14,9 @@
 
 // Guild Flags (Outside Castle)
 //============================================================
--	script	Neuschwanstein#1::OutsideFlagsA1	722,{
+-	script	Neuschwanstein#1::OutsideFlagsA1	GUILD_FLAG,{
 
-	set .@GID, GetCastleData("aldeg_cas01",1);
+	set .@GID, getcastledata("aldeg_cas01",1);
 
 	if (.@GID == 0) {
 		mes "[ Edict of the Divine Rune-Midgarts Kingdom ]";
@@ -39,7 +39,7 @@
 		next;
 		if(select("Return to the guild castle.:Quit.") == 1) {
 			close2;
-			if (getcharid(2) == GetCastleData("aldeg_cas01",1)) {
+			if (getcharid(2) == getcastledata("aldeg_cas01",1)) {
 				warp "aldeg_cas01",218,170;
 				end;
 			}
@@ -51,68 +51,68 @@
 	mes " ";
 	mes "1. Follow the ordinance of The Divine Rune-Midgarts Kingdom, ";
 	mes "we approve that this place is in";
-	mes "the private prossession of ^ff0000"+GetGuildName(.@GID)+"^000000 Guild.";
+	mes "the private prossession 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.";
 	close;
 
 OnRecvCastleA01:
-	FlagEmblem GetCastleData("aldeg_cas01",1);
+	flagemblem getcastledata("aldeg_cas01",1);
 	end;
 }
 
-alde_gld,61,87,6	duplicate(OutsideFlagsA1)	Neuschwanstein#1-2	722
-alde_gld,61,79,6	duplicate(OutsideFlagsA1)	Neuschwanstein#2	722
-alde_gld,45,87,8	duplicate(OutsideFlagsA1)	Neuschwanstein#3	722
-alde_gld,51,87,8	duplicate(OutsideFlagsA1)	Neuschwanstein#4	722
+alde_gld,61,87,6	duplicate(OutsideFlagsA1)	Neuschwanstein#1-2	GUILD_FLAG
+alde_gld,61,79,6	duplicate(OutsideFlagsA1)	Neuschwanstein#2	GUILD_FLAG
+alde_gld,45,87,8	duplicate(OutsideFlagsA1)	Neuschwanstein#3	GUILD_FLAG
+alde_gld,51,87,8	duplicate(OutsideFlagsA1)	Neuschwanstein#4	GUILD_FLAG
 
 // Guild Flags (Inside Castle)
 //============================================================
--	script	Neuschwanstein#5::InsideFlagsA1	722,{
+-	script	Neuschwanstein#5::InsideFlagsA1	GUILD_FLAG,{
 	end;
 
 OnRecvCastleA01:
-	FlagEmblem GetCastleData("aldeg_cas01",1);
+	flagemblem getcastledata("aldeg_cas01",1);
 	end;
 }
 
-aldeg_cas01,30,248,4	duplicate(InsideFlagsA1)	Neuschwanstein#5-2	722
-aldeg_cas01,30,248,4	duplicate(InsideFlagsA1)	Neuschwanstein#6	722
-aldeg_cas01,37,248,4	duplicate(InsideFlagsA1)	Neuschwanstein#7	722
-aldeg_cas01,37,246,4	duplicate(InsideFlagsA1)	Neuschwanstein#8	722
-aldeg_cas01,30,246,4	duplicate(InsideFlagsA1)	Neuschwanstein#9	722
-aldeg_cas01,95,80,2	duplicate(InsideFlagsA1)	Neuschwanstein#10	722
-aldeg_cas01,95,59,2	duplicate(InsideFlagsA1)	Neuschwanstein#11	722
-aldeg_cas01,62,75,2	duplicate(InsideFlagsA1)	Neuschwanstein#12	722
-aldeg_cas01,66,75,2	duplicate(InsideFlagsA1)	Neuschwanstein#13	722
-aldeg_cas01,70,75,2	duplicate(InsideFlagsA1)	Neuschwanstein#14	722
-aldeg_cas01,74,75,2	duplicate(InsideFlagsA1)	Neuschwanstein#15	722
-aldeg_cas01,62,64,2	duplicate(InsideFlagsA1)	Neuschwanstein#16	722
-aldeg_cas01,66,64,2	duplicate(InsideFlagsA1)	Neuschwanstein#17	722
-aldeg_cas01,70,64,2	duplicate(InsideFlagsA1)	Neuschwanstein#18	722
-aldeg_cas01,74,64,2	duplicate(InsideFlagsA1)	Neuschwanstein#19	722
-aldeg_cas01,74,64,2	duplicate(InsideFlagsA1)	Neuschwanstein#20	722
-aldeg_cas01,203,150,4	duplicate(InsideFlagsA1)	Neuschwanstein#21	722
-aldeg_cas01,210,150,4	duplicate(InsideFlagsA1)	Neuschwanstein#22	722
+aldeg_cas01,30,248,4	duplicate(InsideFlagsA1)	Neuschwanstein#5-2	GUILD_FLAG
+aldeg_cas01,30,248,4	duplicate(InsideFlagsA1)	Neuschwanstein#6	GUILD_FLAG
+aldeg_cas01,37,248,4	duplicate(InsideFlagsA1)	Neuschwanstein#7	GUILD_FLAG
+aldeg_cas01,37,246,4	duplicate(InsideFlagsA1)	Neuschwanstein#8	GUILD_FLAG
+aldeg_cas01,30,246,4	duplicate(InsideFlagsA1)	Neuschwanstein#9	GUILD_FLAG
+aldeg_cas01,95,80,2	duplicate(InsideFlagsA1)	Neuschwanstein#10	GUILD_FLAG
+aldeg_cas01,95,59,2	duplicate(InsideFlagsA1)	Neuschwanstein#11	GUILD_FLAG
+aldeg_cas01,62,75,2	duplicate(InsideFlagsA1)	Neuschwanstein#12	GUILD_FLAG
+aldeg_cas01,66,75,2	duplicate(InsideFlagsA1)	Neuschwanstein#13	GUILD_FLAG
+aldeg_cas01,70,75,2	duplicate(InsideFlagsA1)	Neuschwanstein#14	GUILD_FLAG
+aldeg_cas01,74,75,2	duplicate(InsideFlagsA1)	Neuschwanstein#15	GUILD_FLAG
+aldeg_cas01,62,64,2	duplicate(InsideFlagsA1)	Neuschwanstein#16	GUILD_FLAG
+aldeg_cas01,66,64,2	duplicate(InsideFlagsA1)	Neuschwanstein#17	GUILD_FLAG
+aldeg_cas01,70,64,2	duplicate(InsideFlagsA1)	Neuschwanstein#18	GUILD_FLAG
+aldeg_cas01,74,64,2	duplicate(InsideFlagsA1)	Neuschwanstein#19	GUILD_FLAG
+aldeg_cas01,74,64,2	duplicate(InsideFlagsA1)	Neuschwanstein#20	GUILD_FLAG
+aldeg_cas01,203,150,4	duplicate(InsideFlagsA1)	Neuschwanstein#21	GUILD_FLAG
+aldeg_cas01,210,150,4	duplicate(InsideFlagsA1)	Neuschwanstein#22	GUILD_FLAG
 
 // Guild Flag (Town)
 //============================================================
-aldebaran,152,97,4	duplicate(InsideFlagsA1)	Neuschwanstein#23	722
+aldebaran,152,97,4	duplicate(InsideFlagsA1)	Neuschwanstein#23	GUILD_FLAG
 
 // Kafra Employee
 //============================================================
-aldeg_cas01,218,170,0	duplicate(guildkafra)	Kafra Staff#aldeg_cas01	117
+aldeg_cas01,218,170,0	duplicate(guildkafra)	Kafra Staff#aldeg_cas01	4_F_KAFRA1
 
 // Steward
 //============================================================
-aldeg_cas01,218,175,0	duplicate(cm)	Alfredo#aldeg_cas01	55
+aldeg_cas01,218,175,0	duplicate(cm)	Alfredo#aldeg_cas01	1_M_JOBTESTER
 
 // Treasure Room Exit
 //============================================================
-aldeg_cas01,123,223,0	script	#lever_A01	111,{
+aldeg_cas01,123,223,0	script	#lever_A01	HIDDEN_NPC,{
 
 	mes " ";
 	mes "There's a small lever. Will you pull it?";
@@ -127,7 +127,7 @@ aldeg_cas01,123,223,0	script	#lever_A01	111,{
 
 // Guild Dungeon Switch
 //============================================================
-aldeg_cas01,211,181,0	duplicate(gdlever)	#aldeg_cas01	111
+aldeg_cas01,211,181,0	duplicate(gdlever)	#aldeg_cas01	HIDDEN_NPC
 
 // Guild Treasure Spawns
 //============================================================
diff --git a/npc/guild/aldeg_cas02.txt b/npc/guild/aldeg_cas02.txt
index 06371f14d..fe98f22a8 100644
--- a/npc/guild/aldeg_cas02.txt
+++ b/npc/guild/aldeg_cas02.txt
@@ -14,9 +14,9 @@
 
 // Guild Flags (Outside Castle)
 //============================================================
--	script	Hohenschwangau#1::OutsideFlagsA2	722,{
+-	script	Hohenschwangau#1::OutsideFlagsA2	GUILD_FLAG,{
 
-	set .@GID, GetCastleData("aldeg_cas02",1);
+	set .@GID, getcastledata("aldeg_cas02",1);
 
 	if (.@GID == 0) {
 		mes "[ Edict of the Divine Rune-Midgarts Kingdom ]";
@@ -39,7 +39,7 @@
 		next;
 		if(select("Return to the guild castle.:Quit.") == 1) {
 			close2;
-			if (getcharid(2) == GetCastleData("aldeg_cas02",1)) {
+			if (getcharid(2) == getcastledata("aldeg_cas02",1)) {
 				warp "aldeg_cas02",220,190;
 				end;
 			}
@@ -51,62 +51,62 @@
 	mes " ";
 	mes "1. Follow the ordinance of The Divine Rune-Midgarts Kingdom, ";
 	mes "we approve that this place is in";
-	mes "the private prossession of ^ff0000"+GetGuildName(.@GID)+"^000000 Guild.";
+	mes "the private prossession 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.";
 	close;
 
 OnRecvCastleA02:
-	FlagEmblem GetCastleData("aldeg_cas02",1);
+	flagemblem getcastledata("aldeg_cas02",1);
 	end;
 }
 
-alde_gld,99,251,4	duplicate(OutsideFlagsA2)	Hohenschwangau#1-2	722
-alde_gld,99,244,4	duplicate(OutsideFlagsA2)	Hohenschwangau#2	722
+alde_gld,99,251,4	duplicate(OutsideFlagsA2)	Hohenschwangau#1-2	GUILD_FLAG
+alde_gld,99,244,4	duplicate(OutsideFlagsA2)	Hohenschwangau#2	GUILD_FLAG
 
 // Guild Flags (Inside Castle)
 //============================================================
--	script	Hohenschwangau#3::InsideFlagsA2	722,{
+-	script	Hohenschwangau#3::InsideFlagsA2	GUILD_FLAG,{
 	end;
 
 OnRecvCastleA02:
-	FlagEmblem GetCastleData("aldeg_cas02",1);
+	flagemblem getcastledata("aldeg_cas02",1);
 	end;
 }
 
-aldeg_cas02,82,71,2	duplicate(InsideFlagsA2)	Hohenschwangau#3-2	722
-aldeg_cas02,67,30,2	duplicate(InsideFlagsA2)	Hohenschwangau#4	722
-aldeg_cas02,183,140,2	duplicate(InsideFlagsA2)	Hohenschwangau#5	722
-aldeg_cas02,212,152,2	duplicate(InsideFlagsA2)	Hohenschwangau#6	722
-aldeg_cas02,108,39,2	duplicate(InsideFlagsA2)	Hohenschwangau#7	722
-aldeg_cas02,57,213,2	duplicate(InsideFlagsA2)	Hohenschwangau#8	722
-aldeg_cas02,103,53,2	duplicate(InsideFlagsA2)	Hohenschwangau#9	722
-aldeg_cas02,73,53,2	duplicate(InsideFlagsA2)	Hohenschwangau#10	722
-aldeg_cas02,63,41,2	duplicate(InsideFlagsA2)	Hohenschwangau#11	722
-aldeg_cas02,229,6,2	duplicate(InsideFlagsA2)	Hohenschwangau#12	722
-aldeg_cas02,230,40,2	duplicate(InsideFlagsA2)	Hohenschwangau#13	722
-aldeg_cas02,197,40,2	duplicate(InsideFlagsA2)	Hohenschwangau#14	722
-aldeg_cas02,32,213,2	duplicate(InsideFlagsA2)	Hohenschwangau#15	722
-aldeg_cas02,121,29,2	duplicate(InsideFlagsA2)	Hohenschwangau#16	722
+aldeg_cas02,82,71,2	duplicate(InsideFlagsA2)	Hohenschwangau#3-2	GUILD_FLAG
+aldeg_cas02,67,30,2	duplicate(InsideFlagsA2)	Hohenschwangau#4	GUILD_FLAG
+aldeg_cas02,183,140,2	duplicate(InsideFlagsA2)	Hohenschwangau#5	GUILD_FLAG
+aldeg_cas02,212,152,2	duplicate(InsideFlagsA2)	Hohenschwangau#6	GUILD_FLAG
+aldeg_cas02,108,39,2	duplicate(InsideFlagsA2)	Hohenschwangau#7	GUILD_FLAG
+aldeg_cas02,57,213,2	duplicate(InsideFlagsA2)	Hohenschwangau#8	GUILD_FLAG
+aldeg_cas02,103,53,2	duplicate(InsideFlagsA2)	Hohenschwangau#9	GUILD_FLAG
+aldeg_cas02,73,53,2	duplicate(InsideFlagsA2)	Hohenschwangau#10	GUILD_FLAG
+aldeg_cas02,63,41,2	duplicate(InsideFlagsA2)	Hohenschwangau#11	GUILD_FLAG
+aldeg_cas02,229,6,2	duplicate(InsideFlagsA2)	Hohenschwangau#12	GUILD_FLAG
+aldeg_cas02,230,40,2	duplicate(InsideFlagsA2)	Hohenschwangau#13	GUILD_FLAG
+aldeg_cas02,197,40,2	duplicate(InsideFlagsA2)	Hohenschwangau#14	GUILD_FLAG
+aldeg_cas02,32,213,2	duplicate(InsideFlagsA2)	Hohenschwangau#15	GUILD_FLAG
+aldeg_cas02,121,29,2	duplicate(InsideFlagsA2)	Hohenschwangau#16	GUILD_FLAG
 
 // Guild Flag (Town)
 //============================================================
-aldebaran,149,97,4	duplicate(InsideFlagsA2)	Hohenschwangau#17	722
+aldebaran,149,97,4	duplicate(InsideFlagsA2)	Hohenschwangau#17	GUILD_FLAG
 
 // Kafra Employee
 //============================================================
-aldeg_cas02,84,74,0	duplicate(guildkafra)	Kafra Staff#aldeg_cas02	117
+aldeg_cas02,84,74,0	duplicate(guildkafra)	Kafra Staff#aldeg_cas02	4_F_KAFRA1
 
 // Steward
 //============================================================
-aldeg_cas02,78,74,0	duplicate(cm)	Chenchenlie#aldeg_cas02	55
+aldeg_cas02,78,74,0	duplicate(cm)	Chenchenlie#aldeg_cas02	1_M_JOBTESTER
 
 // Treasure Room Lever
 //============================================================
-aldeg_cas02,139,234,0	script	#lever_A02	111,{
+aldeg_cas02,139,234,0	script	#lever_A02	HIDDEN_NPC,{
 
 	mes " ";
 	mes "There's a small lever. Will you pull it?";
@@ -121,7 +121,7 @@ aldeg_cas02,139,234,0	script	#lever_A02	111,{
 
 // Guild Dungeon Lever
 //============================================================
-aldeg_cas02,194,136,0	duplicate(gdlever)	#aldeg_cas02	111
+aldeg_cas02,194,136,0	duplicate(gdlever)	#aldeg_cas02	HIDDEN_NPC
 
 // Guild Treasure Spawns
 //============================================================
diff --git a/npc/guild/aldeg_cas03.txt b/npc/guild/aldeg_cas03.txt
index 299ffdadc..d5aa3535c 100644
--- a/npc/guild/aldeg_cas03.txt
+++ b/npc/guild/aldeg_cas03.txt
@@ -14,9 +14,9 @@
 
 // Guild Flag (Outside Castle)
 //============================================================
--	script	Nuernberg#1::OutsideFlagsA3	722,{
+-	script	Nuernberg#1::OutsideFlagsA3	GUILD_FLAG,{
 
-	set .@GID, GetCastleData("aldeg_cas03",1);
+	set .@GID, getcastledata("aldeg_cas03",1);
 
 	if (.@GID == 0) {
 		mes "[ Edict of the Divine Rune-Midgarts Kingdom ]";
@@ -39,7 +39,7 @@
 		next;
 		if(select("Return to the guild castle.:Quit.") == 1) {
 			close2;
-			if (getcharid(2) == GetCastleData("aldeg_cas03",1)) {
+			if (getcharid(2) == getcastledata("aldeg_cas03",1)) {
 				warp "aldeg_cas03",205,186;
 				end;
 			}
@@ -51,65 +51,65 @@
 	mes " ";
 	mes "1. Follow the ordinance of The Divine Rune-Midgarts Kingdom, ";
 	mes "we approve that this place is in";
-	mes "the private prossession of ^ff0000"+GetGuildName(.@GID)+"^000000 Guild.";
+	mes "the private prossession 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.";
 	close;
 
 OnRecvCastleA03:
-	FlagEmblem GetCastleData("aldeg_cas03",1);
+	flagemblem getcastledata("aldeg_cas03",1);
 	end;
 }
 
-alde_gld,146,82,8	duplicate(OutsideFlagsA3)	Nuernberg#1-2	722
-alde_gld,138,82,8	duplicate(OutsideFlagsA3)	Nuernberg#2	722
+alde_gld,146,82,8	duplicate(OutsideFlagsA3)	Nuernberg#1-2	GUILD_FLAG
+alde_gld,138,82,8	duplicate(OutsideFlagsA3)	Nuernberg#2	GUILD_FLAG
 
 // Guild Flag (Inside Castle)
 //============================================================
--	script	Nuernberg#3::InsideFlagsA3	722,{
+-	script	Nuernberg#3::InsideFlagsA3	GUILD_FLAG,{
 	end;
 
 OnRecvCastleA03:
-	FlagEmblem GetCastleData("aldeg_cas03",1);
+	flagemblem getcastledata("aldeg_cas03",1);
 	end;
 }
 
-aldeg_cas03,176,175,2	duplicate(InsideFlagsA3)	Nuernberg#3-2	722
-aldeg_cas03,77,115,2	duplicate(InsideFlagsA3)	Nuernberg#4	722
-aldeg_cas03,77,215,2	duplicate(InsideFlagsA3)	Nuernberg#5	722
-aldeg_cas03,112,107,2	duplicate(InsideFlagsA3)	Nuernberg#6	722
-aldeg_cas03,112,117,2	duplicate(InsideFlagsA3)	Nuernberg#7	722
-aldeg_cas03,69,71,2	duplicate(InsideFlagsA3)	Nuernberg#8	722
-aldeg_cas03,91,69,2	duplicate(InsideFlagsA3)	Nuernberg#9	722
-aldeg_cas03,108,60,2	duplicate(InsideFlagsA3)	Nuernberg#10	722
-aldeg_cas03,121,73,2	duplicate(InsideFlagsA3)	Nuernberg#11	722
-aldeg_cas03,121,73,2	duplicate(InsideFlagsA3)	Nuernberg#12	722
-aldeg_cas03,75,102,2	duplicate(InsideFlagsA3)	Nuernberg#13	722
-aldeg_cas03,199,169,2	duplicate(InsideFlagsA3)	Nuernberg#14	722
-aldeg_cas03,181,179,2	duplicate(InsideFlagsA3)	Nuernberg#15	722
-aldeg_cas03,192,44,2	duplicate(InsideFlagsA3)	Nuernberg#16	722
-aldeg_cas03,208,145,2	duplicate(InsideFlagsA3)	Nuernberg#17	722
-aldeg_cas03,207,75,2	duplicate(InsideFlagsA3)	Nuernberg#18	722
-aldeg_cas03,96,62,2	duplicate(InsideFlagsA3)	Nuernberg#19	722
+aldeg_cas03,176,175,2	duplicate(InsideFlagsA3)	Nuernberg#3-2	GUILD_FLAG
+aldeg_cas03,77,115,2	duplicate(InsideFlagsA3)	Nuernberg#4	GUILD_FLAG
+aldeg_cas03,77,215,2	duplicate(InsideFlagsA3)	Nuernberg#5	GUILD_FLAG
+aldeg_cas03,112,107,2	duplicate(InsideFlagsA3)	Nuernberg#6	GUILD_FLAG
+aldeg_cas03,112,117,2	duplicate(InsideFlagsA3)	Nuernberg#7	GUILD_FLAG
+aldeg_cas03,69,71,2	duplicate(InsideFlagsA3)	Nuernberg#8	GUILD_FLAG
+aldeg_cas03,91,69,2	duplicate(InsideFlagsA3)	Nuernberg#9	GUILD_FLAG
+aldeg_cas03,108,60,2	duplicate(InsideFlagsA3)	Nuernberg#10	GUILD_FLAG
+aldeg_cas03,121,73,2	duplicate(InsideFlagsA3)	Nuernberg#11	GUILD_FLAG
+aldeg_cas03,121,73,2	duplicate(InsideFlagsA3)	Nuernberg#12	GUILD_FLAG
+aldeg_cas03,75,102,2	duplicate(InsideFlagsA3)	Nuernberg#13	GUILD_FLAG
+aldeg_cas03,199,169,2	duplicate(InsideFlagsA3)	Nuernberg#14	GUILD_FLAG
+aldeg_cas03,181,179,2	duplicate(InsideFlagsA3)	Nuernberg#15	GUILD_FLAG
+aldeg_cas03,192,44,2	duplicate(InsideFlagsA3)	Nuernberg#16	GUILD_FLAG
+aldeg_cas03,208,145,2	duplicate(InsideFlagsA3)	Nuernberg#17	GUILD_FLAG
+aldeg_cas03,207,75,2	duplicate(InsideFlagsA3)	Nuernberg#18	GUILD_FLAG
+aldeg_cas03,96,62,2	duplicate(InsideFlagsA3)	Nuernberg#19	GUILD_FLAG
 
 // Guild Flag (Town)
 //============================================================
-aldebaran,134,97,4	duplicate(InsideFlagsA3)	Nuernberg#20	722
+aldebaran,134,97,4	duplicate(InsideFlagsA3)	Nuernberg#20	GUILD_FLAG
 
 // Kafra Employee
 //============================================================
-aldeg_cas03,118,76,0	duplicate(guildkafra)	Kafra Staff#aldeg_cas03	117
+aldeg_cas03,118,76,0	duplicate(guildkafra)	Kafra Staff#aldeg_cas03	4_F_KAFRA1
 
 // Steward
 //============================================================
-aldeg_cas03,110,118,0	duplicate(cm)	Nahzarf#aldeg_cas03	55
+aldeg_cas03,110,118,0	duplicate(cm)	Nahzarf#aldeg_cas03	1_M_JOBTESTER
 
 // Treasure Room Exit
 //============================================================
-aldeg_cas03,229,267,0	script	#lever_A03	111,{
+aldeg_cas03,229,267,0	script	#lever_A03	HIDDEN_NPC,{
 
 	mes " ";
 	mes "There's a small lever. Will you pull it?";
@@ -124,7 +124,7 @@ aldeg_cas03,229,267,0	script	#lever_A03	111,{
 
 // Guild Dungeon Switch
 //============================================================
-aldeg_cas03,200,177,0	duplicate(gdlever)	#aldeg_cas03	111
+aldeg_cas03,200,177,0	duplicate(gdlever)	#aldeg_cas03	HIDDEN_NPC
 
 // Guild Treasure Spawns
 //============================================================
diff --git a/npc/guild/aldeg_cas04.txt b/npc/guild/aldeg_cas04.txt
index 91e38c96d..4f6bb1265 100644
--- a/npc/guild/aldeg_cas04.txt
+++ b/npc/guild/aldeg_cas04.txt
@@ -14,9 +14,9 @@
 
 // Guild Flag (Outside Castle)
 //============================================================
--	script	Wuerzburg#1::OutsideFlagsA4	722,{
+-	script	Wuerzburg#1::OutsideFlagsA4	GUILD_FLAG,{
 
-	set .@GID, GetCastleData("aldeg_cas04",1);
+	set .@GID, getcastledata("aldeg_cas04",1);
 
 	if (.@GID == 0) {
 		mes "[ Edict of the Divine Rune-Midgarts Kingdom ]";
@@ -39,7 +39,7 @@
 		next;
 		if(select("Return to the guild castle.:Quit.") == 1) {
 			close2;
-			if (getcharid(2) == GetCastleData("aldeg_cas04",1)) {
+			if (getcharid(2) == getcastledata("aldeg_cas04",1)) {
 				warp "aldeg_cas04",116,217;
 				end;
 			}
@@ -51,65 +51,65 @@
 	mes " ";
 	mes "1. Follow the ordinance of The Divine Rune-Midgarts Kingdom, ";
 	mes "we approve that this place is in";
-	mes "the private prossession of ^ff0000"+GetGuildName(.@GID)+"^000000 Guild.";
+	mes "the private prossession 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.";
 	close;
 
 OnRecvCastleA04:
-	FlagEmblem GetCastleData("aldeg_cas04",1);
+	flagemblem getcastledata("aldeg_cas04",1);
 	end;
 }
 
-alde_gld,239,246,2	duplicate(OutsideFlagsA4)	Wuerzburg#1-2	722
-alde_gld,239,239,2	duplicate(OutsideFlagsA4)	Wuerzburg#2	722
+alde_gld,239,246,2	duplicate(OutsideFlagsA4)	Wuerzburg#1-2	GUILD_FLAG
+alde_gld,239,239,2	duplicate(OutsideFlagsA4)	Wuerzburg#2	GUILD_FLAG
 
 // Guild Flag (Inside Castle)
 //============================================================
--	script	Wuerzburg#3::InsideFlagsA4	722,{
+-	script	Wuerzburg#3::InsideFlagsA4	GUILD_FLAG,{
 	end;
 
 OnRecvCastleA04:
-	FlagEmblem GetCastleData("aldeg_cas04",1);
+	flagemblem getcastledata("aldeg_cas04",1);
 	end;
 }
 
-aldeg_cas04,167,61,2	duplicate(InsideFlagsA4)	Wuerzburg#3-2	722
-aldeg_cas04,164,90,2	duplicate(InsideFlagsA4)	Wuerzburg#4	722
-aldeg_cas04,129,193,2	duplicate(InsideFlagsA4)	Wuerzburg#5	722
-aldeg_cas04,112,206,2	duplicate(InsideFlagsA4)	Wuerzburg#6	722
-aldeg_cas04,113,212,2	duplicate(InsideFlagsA4)	Wuerzburg#7	722
-aldeg_cas04,77,117,2	duplicate(InsideFlagsA4)	Wuerzburg#8	722
-aldeg_cas04,186,42,2	duplicate(InsideFlagsA4)	Wuerzburg#9	722
-aldeg_cas04,30,69,2	duplicate(InsideFlagsA4)	Wuerzburg#10	722
-aldeg_cas04,55,97,2	duplicate(InsideFlagsA4)	Wuerzburg#11	722
-aldeg_cas04,45,98,2	duplicate(InsideFlagsA4)	Wuerzburg#12	722
-aldeg_cas04,33,116,2	duplicate(InsideFlagsA4)	Wuerzburg#13	722
-aldeg_cas04,130,180,2	duplicate(InsideFlagsA4)	Wuerzburg#14	722
-aldeg_cas04,129,193,2	duplicate(InsideFlagsA4)	Wuerzburg#15	722
-aldeg_cas04,33,107,2	duplicate(InsideFlagsA4)	Wuerzburg#16	722
-aldeg_cas04,133,220,2	duplicate(InsideFlagsA4)	Wuerzburg#17	722
-aldeg_cas04,169,22,2	duplicate(InsideFlagsA4)	Wuerzburg#18	722
-aldeg_cas04,169,15,2	duplicate(InsideFlagsA4)	Wuerzburg#19	722
+aldeg_cas04,167,61,2	duplicate(InsideFlagsA4)	Wuerzburg#3-2	GUILD_FLAG
+aldeg_cas04,164,90,2	duplicate(InsideFlagsA4)	Wuerzburg#4	GUILD_FLAG
+aldeg_cas04,129,193,2	duplicate(InsideFlagsA4)	Wuerzburg#5	GUILD_FLAG
+aldeg_cas04,112,206,2	duplicate(InsideFlagsA4)	Wuerzburg#6	GUILD_FLAG
+aldeg_cas04,113,212,2	duplicate(InsideFlagsA4)	Wuerzburg#7	GUILD_FLAG
+aldeg_cas04,77,117,2	duplicate(InsideFlagsA4)	Wuerzburg#8	GUILD_FLAG
+aldeg_cas04,186,42,2	duplicate(InsideFlagsA4)	Wuerzburg#9	GUILD_FLAG
+aldeg_cas04,30,69,2	duplicate(InsideFlagsA4)	Wuerzburg#10	GUILD_FLAG
+aldeg_cas04,55,97,2	duplicate(InsideFlagsA4)	Wuerzburg#11	GUILD_FLAG
+aldeg_cas04,45,98,2	duplicate(InsideFlagsA4)	Wuerzburg#12	GUILD_FLAG
+aldeg_cas04,33,116,2	duplicate(InsideFlagsA4)	Wuerzburg#13	GUILD_FLAG
+aldeg_cas04,130,180,2	duplicate(InsideFlagsA4)	Wuerzburg#14	GUILD_FLAG
+aldeg_cas04,129,193,2	duplicate(InsideFlagsA4)	Wuerzburg#15	GUILD_FLAG
+aldeg_cas04,33,107,2	duplicate(InsideFlagsA4)	Wuerzburg#16	GUILD_FLAG
+aldeg_cas04,133,220,2	duplicate(InsideFlagsA4)	Wuerzburg#17	GUILD_FLAG
+aldeg_cas04,169,22,2	duplicate(InsideFlagsA4)	Wuerzburg#18	GUILD_FLAG
+aldeg_cas04,169,15,2	duplicate(InsideFlagsA4)	Wuerzburg#19	GUILD_FLAG
 
 // Guild Flag (Town)
 //============================================================
-aldebaran,131,97,4	duplicate(InsideFlagsA4)	Wuerzburg#20	722
+aldebaran,131,97,4	duplicate(InsideFlagsA4)	Wuerzburg#20	GUILD_FLAG
 
 // Kafra Employee
 //============================================================
-aldeg_cas04,45,88,0	duplicate(guildkafra)	Kafra Staff#aldeg_cas04	117
+aldeg_cas04,45,88,0	duplicate(guildkafra)	Kafra Staff#aldeg_cas04	4_F_KAFRA1
 
 // Steward
 //============================================================
-aldeg_cas04,67,116,0	duplicate(cm)	Brymhensen#aldeg_cas04	55
+aldeg_cas04,67,116,0	duplicate(cm)	Brymhensen#aldeg_cas04	1_M_JOBTESTER
 
 // Treasure Room Exit
 //============================================================
-aldeg_cas04,83,17,0	script	#lever_A04	111,{
+aldeg_cas04,83,17,0	script	#lever_A04	HIDDEN_NPC,{
 
 	mes " ";
 	mes "There's a small lever. Will you pull it?";
@@ -124,7 +124,7 @@ aldeg_cas04,83,17,0	script	#lever_A04	111,{
 
 // Guild Dungeon Switch
 //============================================================
-aldeg_cas04,76,64,0	duplicate(gdlever)	#aldeg_cas04	111
+aldeg_cas04,76,64,0	duplicate(gdlever)	#aldeg_cas04	HIDDEN_NPC
 
 // Guild Treasure Spawns
 //============================================================
diff --git a/npc/guild/aldeg_cas05.txt b/npc/guild/aldeg_cas05.txt
index 85bb272f1..8712d314a 100644
--- a/npc/guild/aldeg_cas05.txt
+++ b/npc/guild/aldeg_cas05.txt
@@ -14,9 +14,9 @@
 
 // Guild Flag (Outside Castle)
 //============================================================
--	script	Rothenburg#1::OutsideFlagsA5	722,{
+-	script	Rothenburg#1::OutsideFlagsA5	GUILD_FLAG,{
 
-	set .@GID, GetCastleData("aldeg_cas05",1);
+	set .@GID, getcastledata("aldeg_cas05",1);
 
 	if (.@GID == 0) {
 		mes "[ Edict of the Divine Rune-Midgarts Kingdom ]";
@@ -39,7 +39,7 @@
 		next;
 		if(select("Return to the guild castle.:Quit.") == 1) {
 			close2;
-			if (getcharid(2) == GetCastleData("aldeg_cas05",1)) {
+			if (getcharid(2) == getcastledata("aldeg_cas05",1)) {
 				warp "aldeg_cas05",167,225;
 				end;
 			}
@@ -51,64 +51,64 @@
 	mes " ";
 	mes "1. Follow the ordinance of The Divine Rune-Midgarts Kingdom, ";
 	mes "we approve that this place is in";
-	mes "the private prossession of ^ff0000"+GetGuildName(.@GID)+"^000000 Guild.";
+	mes "the private prossession 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.";
 	close;
 
 OnRecvCastleA05:
-	FlagEmblem GetCastleData("aldeg_cas05",1);
+	flagemblem getcastledata("aldeg_cas05",1);
 	end;
 }
 
-alde_gld,265,93,6	duplicate(OutsideFlagsA5)	Rothenburg#1-2	722
-alde_gld,265,87,6	duplicate(OutsideFlagsA5)	Rothenburg#2	722
+alde_gld,265,93,6	duplicate(OutsideFlagsA5)	Rothenburg#1-2	GUILD_FLAG
+alde_gld,265,87,6	duplicate(OutsideFlagsA5)	Rothenburg#2	GUILD_FLAG
 
 // Guild Flag (Inside Castle)
 //============================================================
--	script	Rothenburg#3::InsideFlagsA5	722,{
+-	script	Rothenburg#3::InsideFlagsA5	GUILD_FLAG,{
 	end;
 
 OnRecvCastleA05:
-	FlagEmblem GetCastleData("aldeg_cas05",1);
+	flagemblem getcastledata("aldeg_cas05",1);
 	end;
 }
 
-aldeg_cas05,170,85,2	duplicate(InsideFlagsA5)	Rothenburg#3-2	722
-aldeg_cas05,142,212,2	duplicate(InsideFlagsA5)	Rothenburg#4	722
-aldeg_cas05,149,196,2	duplicate(InsideFlagsA5)	Rothenburg#5	722
-aldeg_cas05,41,180,2	duplicate(InsideFlagsA5)	Rothenburg#6	722
-aldeg_cas05,38,201,2	duplicate(InsideFlagsA5)	Rothenburg#7	722
-aldeg_cas05,65,182,2	duplicate(InsideFlagsA5)	Rothenburg#8	722
-aldeg_cas05,65,205,2	duplicate(InsideFlagsA5)	Rothenburg#9	722
-aldeg_cas05,10,218,2	duplicate(InsideFlagsA5)	Rothenburg#10	722
-aldeg_cas05,10,218,2	duplicate(InsideFlagsA5)	Rothenburg#11	722
-aldeg_cas05,164,201,2	duplicate(InsideFlagsA5)	Rothenburg#12	722
-aldeg_cas05,14,117,2	duplicate(InsideFlagsA5)	Rothenburg#13	722
-aldeg_cas05,10,225,2	duplicate(InsideFlagsA5)	Rothenburg#14	722
-aldeg_cas05,187,59,2	duplicate(InsideFlagsA5)	Rothenburg#15	722
-aldeg_cas05,154,51,2	duplicate(InsideFlagsA5)	Rothenburg#16	722
-aldeg_cas05,22,211,2	duplicate(InsideFlagsA5)	Rothenburg#17	722
-aldeg_cas05,150,202,2	duplicate(InsideFlagsA5)	Rothenburg#18	722
+aldeg_cas05,170,85,2	duplicate(InsideFlagsA5)	Rothenburg#3-2	GUILD_FLAG
+aldeg_cas05,142,212,2	duplicate(InsideFlagsA5)	Rothenburg#4	GUILD_FLAG
+aldeg_cas05,149,196,2	duplicate(InsideFlagsA5)	Rothenburg#5	GUILD_FLAG
+aldeg_cas05,41,180,2	duplicate(InsideFlagsA5)	Rothenburg#6	GUILD_FLAG
+aldeg_cas05,38,201,2	duplicate(InsideFlagsA5)	Rothenburg#7	GUILD_FLAG
+aldeg_cas05,65,182,2	duplicate(InsideFlagsA5)	Rothenburg#8	GUILD_FLAG
+aldeg_cas05,65,205,2	duplicate(InsideFlagsA5)	Rothenburg#9	GUILD_FLAG
+aldeg_cas05,10,218,2	duplicate(InsideFlagsA5)	Rothenburg#10	GUILD_FLAG
+aldeg_cas05,10,218,2	duplicate(InsideFlagsA5)	Rothenburg#11	GUILD_FLAG
+aldeg_cas05,164,201,2	duplicate(InsideFlagsA5)	Rothenburg#12	GUILD_FLAG
+aldeg_cas05,14,117,2	duplicate(InsideFlagsA5)	Rothenburg#13	GUILD_FLAG
+aldeg_cas05,10,225,2	duplicate(InsideFlagsA5)	Rothenburg#14	GUILD_FLAG
+aldeg_cas05,187,59,2	duplicate(InsideFlagsA5)	Rothenburg#15	GUILD_FLAG
+aldeg_cas05,154,51,2	duplicate(InsideFlagsA5)	Rothenburg#16	GUILD_FLAG
+aldeg_cas05,22,211,2	duplicate(InsideFlagsA5)	Rothenburg#17	GUILD_FLAG
+aldeg_cas05,150,202,2	duplicate(InsideFlagsA5)	Rothenburg#18	GUILD_FLAG
 
 // Guild Flag (Town)
 //============================================================
-aldebaran,128,97,4	duplicate(InsideFlagsA5)	Rothenburg#19	722
+aldebaran,128,97,4	duplicate(InsideFlagsA5)	Rothenburg#19	GUILD_FLAG
 
 // Kafra Employee
 //============================================================
-aldeg_cas05,31,190,0	duplicate(guildkafra)	Kafra Staff#aldeg_cas05	117
+aldeg_cas05,31,190,0	duplicate(guildkafra)	Kafra Staff#aldeg_cas05	4_F_KAFRA1
 
 // Steward
 //============================================================
-aldeg_cas05,51,179,0	duplicate(cm)	Esmarehk#aldeg_cas05	55
+aldeg_cas05,51,179,0	duplicate(cm)	Esmarehk#aldeg_cas05	1_M_JOBTESTER
 
 // Treasure Room Exit
 //============================================================
-aldeg_cas05,64,8,0	script	#lever_A05	111,{
+aldeg_cas05,64,8,0	script	#lever_A05	HIDDEN_NPC,{
 
 	mes " ";
 	mes "There's a small lever. Will you pull it?";
@@ -123,7 +123,7 @@ aldeg_cas05,64,8,0	script	#lever_A05	111,{
 
 // Guild Dungeon Switch
 //============================================================
-aldeg_cas05,22,205,0	duplicate(gdlever)	#aldeg_cas05	111
+aldeg_cas05,22,205,0	duplicate(gdlever)	#aldeg_cas05	HIDDEN_NPC
 
 // Guild Treasure Spawns
 //============================================================
diff --git a/npc/guild/gefg_cas01.txt b/npc/guild/gefg_cas01.txt
index 527a1a9a6..71a227173 100644
--- a/npc/guild/gefg_cas01.txt
+++ b/npc/guild/gefg_cas01.txt
@@ -14,9 +14,9 @@
 
 // Guild Flag (Outside Castle)
 //============================================================
--	script	Repherion#1::OutsideFlagsG1	722,{
+-	script	Repherion#1::OutsideFlagsG1	GUILD_FLAG,{
 
-	set .@GID, GetCastleData("gefg_cas01",1);
+	set .@GID, getcastledata("gefg_cas01",1);
 
 	if (.@GID == 0) {
 		mes "[ Edict of the Divine Rune-Midgarts Kingdom ]";
@@ -39,7 +39,7 @@
 		next;
 		if(select("Return to the guild castle.:Quit.") == 1) {
 			close2;
-			if (getcharid(2) == GetCastleData("gefg_cas01",1)) {
+			if (getcharid(2) == getcastledata("gefg_cas01",1)) {
 				warp "gefg_cas01",197,36;
 				end;
 			}
@@ -51,56 +51,56 @@
 	mes " ";
 	mes "1. Follow the ordinance of The Divine Rune-Midgarts Kingdom, ";
 	mes "we approve that this place is in";
-	mes "the private prossession of ^ff0000"+GetGuildName(.@GID)+"^000000 Guild.";
+	mes "the private prossession 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.";
 	close;
 
 OnRecvCastleG01:
-	FlagEmblem GetCastleData("gefg_cas01",1);
+	flagemblem getcastledata("gefg_cas01",1);
 	end;
 }
 
-gef_fild13,148,51,5	duplicate(OutsideFlagsG1)	Repherion#1-2	722
-gef_fild13,155,54,5	duplicate(OutsideFlagsG1)	Repherion#2	722
-gef_fild13,212,79,6	duplicate(OutsideFlagsG1)	Repherion#3	722
-gef_fild13,211,71,6	duplicate(OutsideFlagsG1)	Repherion#4	722
+gef_fild13,148,51,5	duplicate(OutsideFlagsG1)	Repherion#1-2	GUILD_FLAG
+gef_fild13,155,54,5	duplicate(OutsideFlagsG1)	Repherion#2	GUILD_FLAG
+gef_fild13,212,79,6	duplicate(OutsideFlagsG1)	Repherion#3	GUILD_FLAG
+gef_fild13,211,71,6	duplicate(OutsideFlagsG1)	Repherion#4	GUILD_FLAG
 
 // Guild Flag (Inside Castle)
 //============================================================
--	script	Repherion#5::InsideFlagsG1	722,{
+-	script	Repherion#5::InsideFlagsG1	GUILD_FLAG,{
 	end;
 
 OnRecvCastleG01:
-	FlagEmblem GetCastleData("gefg_cas01",1);
+	flagemblem getcastledata("gefg_cas01",1);
 	end;
 }
 
-gefg_cas01,28,157,4	duplicate(InsideFlagsG1)	Repherion#5-2	722
-gefg_cas01,22,156,5	duplicate(InsideFlagsG1)	Repherion#6	722
-gefg_cas01,68,185,3	duplicate(InsideFlagsG1)	Repherion#7	722
-gefg_cas01,17,171,5	duplicate(InsideFlagsG1)	Repherion#8	722
-gefg_cas01,59,16,4	duplicate(InsideFlagsG1)	Repherion#9	722
-gefg_cas01,64,16,4	duplicate(InsideFlagsG1)	Repherion#10	722
+gefg_cas01,28,157,4	duplicate(InsideFlagsG1)	Repherion#5-2	GUILD_FLAG
+gefg_cas01,22,156,5	duplicate(InsideFlagsG1)	Repherion#6	GUILD_FLAG
+gefg_cas01,68,185,3	duplicate(InsideFlagsG1)	Repherion#7	GUILD_FLAG
+gefg_cas01,17,171,5	duplicate(InsideFlagsG1)	Repherion#8	GUILD_FLAG
+gefg_cas01,59,16,4	duplicate(InsideFlagsG1)	Repherion#9	GUILD_FLAG
+gefg_cas01,64,16,4	duplicate(InsideFlagsG1)	Repherion#10	GUILD_FLAG
 
 // Guild Flag (Town)
 //============================================================
-geffen,109,123,2	duplicate(InsideFlagsG1)	Repherion#11	722
+geffen,109,123,2	duplicate(InsideFlagsG1)	Repherion#11	GUILD_FLAG
 
 // Kafra Employee
 //============================================================
-gefg_cas01,83,47,3	duplicate(guildkafra)	Kafra Staff#gefg_cas01	117
+gefg_cas01,83,47,3	duplicate(guildkafra)	Kafra Staff#gefg_cas01	4_F_KAFRA1
 
 // Steward
 //============================================================
-gefg_cas01,40,48,5	duplicate(cm)	Gnahcher#gefg_cas01	55
+gefg_cas01,40,48,5	duplicate(cm)	Gnahcher#gefg_cas01	1_M_JOBTESTER
 
 // Treasure Room Exit
 //============================================================
-gefg_cas01,152,117,0	script	#lever_G01	111,{
+gefg_cas01,152,117,0	script	#lever_G01	HIDDEN_NPC,{
 
 	mes " ";
 	mes "There's a small lever. Will you pull it?";
@@ -115,7 +115,7 @@ gefg_cas01,152,117,0	script	#lever_G01	111,{
 
 // Guild Dungeon Switch
 //============================================================
-gefg_cas01,78,84,0	duplicate(gdlever)	#gefg_cas01	111
+gefg_cas01,78,84,0	duplicate(gdlever)	#gefg_cas01	HIDDEN_NPC
 
 // Guild Treasure Spawns
 //============================================================
diff --git a/npc/guild/gefg_cas02.txt b/npc/guild/gefg_cas02.txt
index dfb20f93b..8aa183045 100644
--- a/npc/guild/gefg_cas02.txt
+++ b/npc/guild/gefg_cas02.txt
@@ -14,9 +14,9 @@
 
 // Guild Flag (Outside Castle)
 //============================================================
--	script	Eeyorbriggar#1::OutsideFlagsG2	722,{
+-	script	Eeyorbriggar#1::OutsideFlagsG2	GUILD_FLAG,{
 
-	set .@GID, GetCastleData("gefg_cas02",1);
+	set .@GID, getcastledata("gefg_cas02",1);
 
 	if (.@GID == 0) {
 		mes "[ Edict of the Divine Rune-Midgarts Kingdom ]";
@@ -39,7 +39,7 @@
 		next;
 		if(select("Return to the guild castle.:Quit.") == 1) {
 			close2;
-			if (getcharid(2) == GetCastleData("gefg_cas02",1)) {
+			if (getcharid(2) == getcastledata("gefg_cas02",1)) {
 				warp "gefg_cas02",178,43;
 				end;
 			}
@@ -51,57 +51,57 @@
 	mes " ";
 	mes "1. Follow the ordinance of The Divine Rune-Midgarts Kingdom, ";
 	mes "we approve that this place is in";
-	mes "the private prossession of ^ff0000"+GetGuildName(.@GID)+"^000000 Guild.";
+	mes "the private prossession 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.";
 	close;
 
 OnRecvCastleG02:
-	FlagEmblem GetCastleData("gefg_cas02",1);
+	flagemblem getcastledata("gefg_cas02",1);
 	end;
 }
 
-gef_fild13,303,243,4	duplicate(OutsideFlagsG2)	Eeyorbriggar#1-2	722
-gef_fild13,312,243,4	duplicate(OutsideFlagsG2)	Eeyorbriggar#2	722
-gef_fild13,290,243,4	duplicate(OutsideFlagsG2)	Eeyorbriggar#3	722
-gef_fild13,324,243,4	duplicate(OutsideFlagsG2)	Eeyorbriggar#4	722
+gef_fild13,303,243,4	duplicate(OutsideFlagsG2)	Eeyorbriggar#1-2	GUILD_FLAG
+gef_fild13,312,243,4	duplicate(OutsideFlagsG2)	Eeyorbriggar#2	GUILD_FLAG
+gef_fild13,290,243,4	duplicate(OutsideFlagsG2)	Eeyorbriggar#3	GUILD_FLAG
+gef_fild13,324,243,4	duplicate(OutsideFlagsG2)	Eeyorbriggar#4	GUILD_FLAG
 
 // Guild Flag (Inside Castle)
 //============================================================
--	script	Eeyorbriggar#5::InsideFlagsG2	722,{
+-	script	Eeyorbriggar#5::InsideFlagsG2	GUILD_FLAG,{
 	end;
 
 OnRecvCastleG02:
-	FlagEmblem GetCastleData("gefg_cas02",1);
+	flagemblem getcastledata("gefg_cas02",1);
 	end;
 }
 
-gefg_cas02,65,130,5	duplicate(InsideFlagsG2)	Eeyorbriggar#5-2	722
-gefg_cas02,30,123,5	duplicate(InsideFlagsG2)	Eeyorbriggar#6	722
-gefg_cas02,65,139,6	duplicate(InsideFlagsG2)	Eeyorbriggar#7	722
-gefg_cas02,37,177,6	duplicate(InsideFlagsG2)	Eeyorbriggar#8	722
-gefg_cas02,37,168,6	duplicate(InsideFlagsG2)	Eeyorbriggar#9	722
-gefg_cas02,68,47,2	duplicate(InsideFlagsG2)	Eeyorbriggar#10	722
-gefg_cas02,68,36,2	duplicate(InsideFlagsG2)	Eeyorbriggar#11	722
+gefg_cas02,65,130,5	duplicate(InsideFlagsG2)	Eeyorbriggar#5-2	GUILD_FLAG
+gefg_cas02,30,123,5	duplicate(InsideFlagsG2)	Eeyorbriggar#6	GUILD_FLAG
+gefg_cas02,65,139,6	duplicate(InsideFlagsG2)	Eeyorbriggar#7	GUILD_FLAG
+gefg_cas02,37,177,6	duplicate(InsideFlagsG2)	Eeyorbriggar#8	GUILD_FLAG
+gefg_cas02,37,168,6	duplicate(InsideFlagsG2)	Eeyorbriggar#9	GUILD_FLAG
+gefg_cas02,68,47,2	duplicate(InsideFlagsG2)	Eeyorbriggar#10	GUILD_FLAG
+gefg_cas02,68,36,2	duplicate(InsideFlagsG2)	Eeyorbriggar#11	GUILD_FLAG
 
 // Guild Flag (Town)
 //============================================================
-geffen,112,129,1	duplicate(InsideFlagsG2)	Eeyorbriggar#12	722
+geffen,112,129,1	duplicate(InsideFlagsG2)	Eeyorbriggar#12	GUILD_FLAG
 
 // Kafra Employee
 //============================================================
-gefg_cas02,23,66,3	duplicate(guildkafra)	Kafra Staff#gefg_cas02	117
+gefg_cas02,23,66,3	duplicate(guildkafra)	Kafra Staff#gefg_cas02	4_F_KAFRA1
 
 // Steward
 //============================================================
-gefg_cas02,12,66,5	duplicate(cm)	Esmarehk#gefg_cas02	55
+gefg_cas02,12,66,5	duplicate(cm)	Esmarehk#gefg_cas02	1_M_JOBTESTER
 
 // Treasure Room Exit
 //============================================================
-gefg_cas02,145,114,0	script	#lever_G02	111,{
+gefg_cas02,145,114,0	script	#lever_G02	HIDDEN_NPC,{
 
 	mes " ";
 	mes "There's a small lever. Will you pull it?";
@@ -116,7 +116,7 @@ gefg_cas02,145,114,0	script	#lever_G02	111,{
 
 // Guild Dungeon Switch
 //============================================================
-gefg_cas02,167,40,0	duplicate(gdlever)	#gefg_cas02	111
+gefg_cas02,167,40,0	duplicate(gdlever)	#gefg_cas02	HIDDEN_NPC
 
 // Guild Treasure Spawns
 //============================================================
diff --git a/npc/guild/gefg_cas03.txt b/npc/guild/gefg_cas03.txt
index b46ed18c7..50ba0005b 100644
--- a/npc/guild/gefg_cas03.txt
+++ b/npc/guild/gefg_cas03.txt
@@ -14,9 +14,9 @@
 
 // Guild Flag (Outside Castle)
 //============================================================
--	script	Yesnelph#1::OutsideFlagsG3	722,{
+-	script	Yesnelph#1::OutsideFlagsG3	GUILD_FLAG,{
 
-	set .@GID, GetCastleData("gefg_cas03",1);
+	set .@GID, getcastledata("gefg_cas03",1);
 
 	if (.@GID == 0) {
 		mes "[ Edict of the Divine Rune-Midgarts Kingdom ]";
@@ -39,7 +39,7 @@
 		next;
 		if(select("Return to the guild castle.:Quit.") == 1) {
 			close2;
-			if (getcharid(2) == GetCastleData("gefg_cas03",1)) {
+			if (getcharid(2) == getcastledata("gefg_cas03",1)) {
 				warp "gefg_cas03",221,30;
 				end;
 			}
@@ -51,60 +51,60 @@
 	mes " ";
 	mes "1. Follow the ordinance of The Divine Rune-Midgarts Kingdom, ";
 	mes "we approve that this place is in";
-	mes "the private prossession of ^ff0000"+GetGuildName(.@GID)+"^000000 Guild.";
+	mes "the private prossession 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.";
 	close;
 
 OnRecvCastleG03:
-	FlagEmblem GetCastleData("gefg_cas03",1);
+	flagemblem getcastledata("gefg_cas03",1);
 	end;
 }
 
-gef_fild13,78,182,4	duplicate(OutsideFlagsG3)	Yesnelph#1-2	722
-gef_fild13,87,182,4	duplicate(OutsideFlagsG3)	Yesnelph#2	722
-gef_fild13,73,295,7	duplicate(OutsideFlagsG3)	Yesnelph#3	722
-gef_fild13,113,274,7	duplicate(OutsideFlagsG3)	Yesnelph#4	722
-gef_fild13,144,235,6	duplicate(OutsideFlagsG3)	Yesnelph#5	722
-gef_fild13,144,244,6	duplicate(OutsideFlagsG3)	Yesnelph#6	722
+gef_fild13,78,182,4	duplicate(OutsideFlagsG3)	Yesnelph#1-2	GUILD_FLAG
+gef_fild13,87,182,4	duplicate(OutsideFlagsG3)	Yesnelph#2	GUILD_FLAG
+gef_fild13,73,295,7	duplicate(OutsideFlagsG3)	Yesnelph#3	GUILD_FLAG
+gef_fild13,113,274,7	duplicate(OutsideFlagsG3)	Yesnelph#4	GUILD_FLAG
+gef_fild13,144,235,6	duplicate(OutsideFlagsG3)	Yesnelph#5	GUILD_FLAG
+gef_fild13,144,244,6	duplicate(OutsideFlagsG3)	Yesnelph#6	GUILD_FLAG
 
 // Guild Flag (Inside Castle)
 //============================================================
--	script	Yesnelph#7::InsideFlagsG3	722,{
+-	script	Yesnelph#7::InsideFlagsG3	GUILD_FLAG,{
 	end;
 
 OnRecvCastleG03:
-	FlagEmblem GetCastleData("gefg_cas03",1);
+	flagemblem getcastledata("gefg_cas03",1);
 	end;
 }
 
-gefg_cas03,122,220,6	duplicate(InsideFlagsG3)	Yesnelph#7-2	722
-gefg_cas03,122,229,6	duplicate(InsideFlagsG3)	Yesnelph#8	722
-gefg_cas03,91,257,7	duplicate(InsideFlagsG3)	Yesnelph#9	722
-gefg_cas03,52,276,7	duplicate(InsideFlagsG3)	Yesnelph#10	722
-gefg_cas03,56,164,4	duplicate(InsideFlagsG3)	Yesnelph#11	722
-gefg_cas03,65,164,4	duplicate(InsideFlagsG3)	Yesnelph#12	722
-gefg_cas03,37,214,1	duplicate(InsideFlagsG3)	Yesnelph#13	722
-gefg_cas03,34,208,1	duplicate(InsideFlagsG3)	Yesnelph#14	722
+gefg_cas03,122,220,6	duplicate(InsideFlagsG3)	Yesnelph#7-2	GUILD_FLAG
+gefg_cas03,122,229,6	duplicate(InsideFlagsG3)	Yesnelph#8	GUILD_FLAG
+gefg_cas03,91,257,7	duplicate(InsideFlagsG3)	Yesnelph#9	GUILD_FLAG
+gefg_cas03,52,276,7	duplicate(InsideFlagsG3)	Yesnelph#10	GUILD_FLAG
+gefg_cas03,56,164,4	duplicate(InsideFlagsG3)	Yesnelph#11	GUILD_FLAG
+gefg_cas03,65,164,4	duplicate(InsideFlagsG3)	Yesnelph#12	GUILD_FLAG
+gefg_cas03,37,214,1	duplicate(InsideFlagsG3)	Yesnelph#13	GUILD_FLAG
+gefg_cas03,34,208,1	duplicate(InsideFlagsG3)	Yesnelph#14	GUILD_FLAG
 
 // Guild Flag (Town)
 //============================================================
-geffen,120,132,8	duplicate(InsideFlagsG3)	Yesnelph#15	722
+geffen,120,132,8	duplicate(InsideFlagsG3)	Yesnelph#15	GUILD_FLAG
 
 // Kafra Employee
 //============================================================
-gefg_cas03,116,89,5	duplicate(guildkafra)	Kafra Staff#gefg_cas03	117
+gefg_cas03,116,89,5	duplicate(guildkafra)	Kafra Staff#gefg_cas03	4_F_KAFRA1
 
 // Steward
 //============================================================
-gefg_cas03,106,23,5	duplicate(cm)	Jyang#gefg_cas03	55
+gefg_cas03,106,23,5	duplicate(cm)	Jyang#gefg_cas03	1_M_JOBTESTER
 
 // Treasure Room Exit
 //============================================================
-gefg_cas03,275,289,0	script	#lever_G03	111,{
+gefg_cas03,275,289,0	script	#lever_G03	HIDDEN_NPC,{
 
 	mes " ";
 	mes "There's a small lever. Will you pull it?";
@@ -119,7 +119,7 @@ gefg_cas03,275,289,0	script	#lever_G03	111,{
 
 // Guild Dungeon Switch
 //============================================================
-gefg_cas03,221,43,0	duplicate(gdlever)	#gefg_cas03	111
+gefg_cas03,221,43,0	duplicate(gdlever)	#gefg_cas03	HIDDEN_NPC
 
 // Guild Treasure Spawns
 //============================================================
diff --git a/npc/guild/gefg_cas04.txt b/npc/guild/gefg_cas04.txt
index b42055293..67c490baf 100644
--- a/npc/guild/gefg_cas04.txt
+++ b/npc/guild/gefg_cas04.txt
@@ -14,9 +14,9 @@
 
 // Guild Flag (Outside Castle)
 //============================================================
--	script	Bergel#1::OutsideFlagsG4	722,{
+-	script	Bergel#1::OutsideFlagsG4	GUILD_FLAG,{
 
-	set .@GID, GetCastleData("gefg_cas04",1);
+	set .@GID, getcastledata("gefg_cas04",1);
 
 	if (.@GID == 0) {
 		mes "[ Edict of the Divine Rune-Midgarts Kingdom ]";
@@ -39,7 +39,7 @@
 		next;
 		if(select("Return to the guild castle.:Quit.") == 1) {
 			close2;
-			if (getcharid(2) == GetCastleData("gefg_cas04",1)) {
+			if (getcharid(2) == getcastledata("gefg_cas04",1)) {
 				warp "gefg_cas04",168,43;
 				end;
 			}
@@ -51,56 +51,56 @@
 	mes " ";
 	mes "1. Follow the ordinance of The Divine Rune-Midgarts Kingdom, ";
 	mes "we approve that this place is in";
-	mes "the private prossession of ^ff0000"+GetGuildName(.@GID)+"^000000 Guild.";
+	mes "the private prossession 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.";
 	close;
 
 OnRecvCastleG04:
-	FlagEmblem GetCastleData("gefg_cas04",1);
+	flagemblem getcastledata("gefg_cas04",1);
 	end;
 }
 
-gef_fild13,190,283,3	duplicate(OutsideFlagsG4)	Bergel#1-2	722
-gef_fild13,199,274,3	duplicate(OutsideFlagsG4)	Bergel#2	722
+gef_fild13,190,283,3	duplicate(OutsideFlagsG4)	Bergel#1-2	GUILD_FLAG
+gef_fild13,199,274,3	duplicate(OutsideFlagsG4)	Bergel#2	GUILD_FLAG
 
 // Guild Flag (Inside Castle)
 //============================================================
--	script	Bergel#3::InsideFlagsG4	722,{
+-	script	Bergel#3::InsideFlagsG4	GUILD_FLAG,{
 	end;
 
 OnRecvCastleG04:
-	FlagEmblem GetCastleData("gefg_cas04",1);
+	flagemblem getcastledata("gefg_cas04",1);
 	end;
 }
 
-gefg_cas04,24,157,4	duplicate(InsideFlagsG4)	Bergel#3-2	722
-gefg_cas04,35,158,4	duplicate(InsideFlagsG4)	Bergel#4	722
-gefg_cas04,44,184,4	duplicate(InsideFlagsG4)	Bergel#5	722
-gefg_cas04,51,184,4	duplicate(InsideFlagsG4)	Bergel#6	722
-gefg_cas04,39,212,7	duplicate(InsideFlagsG4)	Bergel#7	722
-gefg_cas04,29,212,1	duplicate(InsideFlagsG4)	Bergel#8	722
-gefg_cas04,24,73,1	duplicate(InsideFlagsG4)	Bergel#9	722
-gefg_cas04,35,73,4	duplicate(InsideFlagsG4)	Bergel#10	722
+gefg_cas04,24,157,4	duplicate(InsideFlagsG4)	Bergel#3-2	GUILD_FLAG
+gefg_cas04,35,158,4	duplicate(InsideFlagsG4)	Bergel#4	GUILD_FLAG
+gefg_cas04,44,184,4	duplicate(InsideFlagsG4)	Bergel#5	GUILD_FLAG
+gefg_cas04,51,184,4	duplicate(InsideFlagsG4)	Bergel#6	GUILD_FLAG
+gefg_cas04,39,212,7	duplicate(InsideFlagsG4)	Bergel#7	GUILD_FLAG
+gefg_cas04,29,212,1	duplicate(InsideFlagsG4)	Bergel#8	GUILD_FLAG
+gefg_cas04,24,73,1	duplicate(InsideFlagsG4)	Bergel#9	GUILD_FLAG
+gefg_cas04,35,73,4	duplicate(InsideFlagsG4)	Bergel#10	GUILD_FLAG
 
 // Guild Flag (Town)
 //============================================================
-geffen,127,130,7	duplicate(InsideFlagsG4)	Bergel#11	722
+geffen,127,130,7	duplicate(InsideFlagsG4)	Bergel#11	GUILD_FLAG
 
 // Kafra Employee
 //============================================================
-gefg_cas04,59,70,3	duplicate(guildkafra)	Kafra Staff#gefg_cas04	117
+gefg_cas04,59,70,3	duplicate(guildkafra)	Kafra Staff#gefg_cas04	4_F_KAFRA1
 
 // Steward
 //============================================================
-gefg_cas04,73,46,3	duplicate(cm)	Kellvahni#gefg_cas04	55
+gefg_cas04,73,46,3	duplicate(cm)	Kellvahni#gefg_cas04	1_M_JOBTESTER
 
 // Treasure Room Exit
 //============================================================
-gefg_cas04,116,123,0	script	#lever_G04	111,{
+gefg_cas04,116,123,0	script	#lever_G04	HIDDEN_NPC,{
 
 	mes " ";
 	mes "There's a small lever. Will you pull it?";
@@ -115,7 +115,7 @@ gefg_cas04,116,123,0	script	#lever_G04	111,{
 
 // Guild Dungeon Switch
 //============================================================
-gefg_cas04,58,75,0	duplicate(gdlever)	#gefg_cas04	111
+gefg_cas04,58,75,0	duplicate(gdlever)	#gefg_cas04	HIDDEN_NPC
 
 // Guild Treasure Spawns
 //============================================================
diff --git a/npc/guild/gefg_cas05.txt b/npc/guild/gefg_cas05.txt
index ce53a3d04..aa802ea15 100644
--- a/npc/guild/gefg_cas05.txt
+++ b/npc/guild/gefg_cas05.txt
@@ -14,9 +14,9 @@
 
 // Guild Flag (Outside Castle)
 //============================================================
--	script	Mersetzdeitz#1::OutsideFlagsG5	722,{
+-	script	Mersetzdeitz#1::OutsideFlagsG5	GUILD_FLAG,{
 
-	set .@GID, GetCastleData("gefg_cas05",1);
+	set .@GID, getcastledata("gefg_cas05",1);
 
 	if (.@GID == 0) {
 		mes "[ Edict of the Divine Rune-Midgarts Kingdom ]";
@@ -39,7 +39,7 @@
 		next;
 		if(select("Return to the guild castle.:Quit.") == 1) {
 			close2;
-			if (getcharid(2) == GetCastleData("gefg_cas05",1)) {
+			if (getcharid(2) == getcastledata("gefg_cas05",1)) {
 				warp "gefg_cas05",168,31;
 				end;
 			}
@@ -51,56 +51,56 @@
 	mes " ";
 	mes "1. Follow the ordinance of The Divine Rune-Midgarts Kingdom, ";
 	mes "we approve that this place is in";
-	mes "the private prossession of ^ff0000"+GetGuildName(.@GID)+"^000000 Guild.";
+	mes "the private prossession 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.";
 	close;
 
 OnRecvCastleG05:
-	FlagEmblem GetCastleData("gefg_cas05",1);
+	flagemblem getcastledata("gefg_cas05",1);
 	end;
 }
 
-gef_fild13,302,87,7	duplicate(OutsideFlagsG5)	Mersetzdeitz#1-2	722
-gef_fild13,313,83,0	duplicate(OutsideFlagsG5)	Mersetzdeitz#2	722
-gef_fild13,252,51,2	duplicate(OutsideFlagsG5)	Mersetzdeitz#3	722
-gef_fild13,26,147,2	duplicate(OutsideFlagsG5)	Mersetzdeitz#4	722
+gef_fild13,302,87,7	duplicate(OutsideFlagsG5)	Mersetzdeitz#1-2	GUILD_FLAG
+gef_fild13,313,83,0	duplicate(OutsideFlagsG5)	Mersetzdeitz#2	GUILD_FLAG
+gef_fild13,252,51,2	duplicate(OutsideFlagsG5)	Mersetzdeitz#3	GUILD_FLAG
+gef_fild13,26,147,2	duplicate(OutsideFlagsG5)	Mersetzdeitz#4	GUILD_FLAG
 
 // Guild Flag (Inside Castle)
 //============================================================
--	script	Mersetzdeitz#5::InsideFlagsG5	722,{
+-	script	Mersetzdeitz#5::InsideFlagsG5	GUILD_FLAG,{
 	end;
 
 OnRecvCastleG05:
-	FlagEmblem GetCastleData("gefg_cas05",1);
+	flagemblem getcastledata("gefg_cas05",1);
 	end;
 }
 
-gefg_cas05,77,185,7	duplicate(InsideFlagsG5)	Mersetzdeitz#5-2	722
-gefg_cas05,92,181,0	duplicate(InsideFlagsG5)	Mersetzdeitz#6	722
-gefg_cas05,83,158,1	duplicate(InsideFlagsG5)	Mersetzdeitz#7	722
-gefg_cas05,62,144,7	duplicate(InsideFlagsG5)	Mersetzdeitz#8	722
-gefg_cas05,62,66,4	duplicate(InsideFlagsG5)	Mersetzdeitz#9	722
-gefg_cas05,69,66,4	duplicate(InsideFlagsG5)	Mersetzdeitz#10	722
+gefg_cas05,77,185,7	duplicate(InsideFlagsG5)	Mersetzdeitz#5-2	GUILD_FLAG
+gefg_cas05,92,181,0	duplicate(InsideFlagsG5)	Mersetzdeitz#6	GUILD_FLAG
+gefg_cas05,83,158,1	duplicate(InsideFlagsG5)	Mersetzdeitz#7	GUILD_FLAG
+gefg_cas05,62,144,7	duplicate(InsideFlagsG5)	Mersetzdeitz#8	GUILD_FLAG
+gefg_cas05,62,66,4	duplicate(InsideFlagsG5)	Mersetzdeitz#9	GUILD_FLAG
+gefg_cas05,69,66,4	duplicate(InsideFlagsG5)	Mersetzdeitz#10	GUILD_FLAG
 
 // Guild Flag (Town)
 //============================================================
-geffen,131,123,6	duplicate(InsideFlagsG5)	Mersetzdeitz#11	722
+geffen,131,123,6	duplicate(InsideFlagsG5)	Mersetzdeitz#11	GUILD_FLAG
 
 // Kafra Employee
 //============================================================
-gefg_cas05,61,52,5	duplicate(guildkafra)	Kafra Staff#gefg_cas05	117
+gefg_cas05,61,52,5	duplicate(guildkafra)	Kafra Staff#gefg_cas05	4_F_KAFRA1
 
 // Steward
 //============================================================
-gefg_cas05,70,52,3	duplicate(cm)	Byohre#gefg_cas05	55
+gefg_cas05,70,52,3	duplicate(cm)	Byohre#gefg_cas05	1_M_JOBTESTER
 
 // Treasure Room Exit
 //============================================================
-gefg_cas05,149,107,0	script	#lever_G05	111,{
+gefg_cas05,149,107,0	script	#lever_G05	HIDDEN_NPC,{
 
 	mes " ";
 	mes "There's a small lever. Will you pull it?";
@@ -115,7 +115,7 @@ gefg_cas05,149,107,0	script	#lever_G05	111,{
 
 // Guild Dungeon Switch
 //============================================================
-gefg_cas05,65,22,0	duplicate(gdlever)	#gefg_cas05	111
+gefg_cas05,65,22,0	duplicate(gdlever)	#gefg_cas05	HIDDEN_NPC
 
 // Guild Treasure Spawns
 //============================================================
diff --git a/npc/guild/payg_cas01.txt b/npc/guild/payg_cas01.txt
index bd33111cd..2b172929b 100644
--- a/npc/guild/payg_cas01.txt
+++ b/npc/guild/payg_cas01.txt
@@ -16,9 +16,9 @@
 
 // Guild Flags (Outside Castle)
 //============================================================
--	script	Bright Arbor#1::OutsideFlagsPA1	722,{
+-	script	Bright Arbor#1::OutsideFlagsPA1	GUILD_FLAG,{
 
-	set .@GID, GetCastleData("payg_cas01",1);
+	set .@GID, getcastledata("payg_cas01",1);
 
 	if (.@GID == 0) {
 		mes "[ Edict of the Divine Rune-Midgarts Kingdom ]";
@@ -41,7 +41,7 @@
 		next;
 		if(select("Return to the guild castle.:Quit.") == 1) {
 			close2;
-			if (getcharid(2) == GetCastleData("payg_cas01",1)) {
+			if (getcharid(2) == getcastledata("payg_cas01",1)) {
 					warp "payg_cas01",54,144;
 				end;
 			}
@@ -53,57 +53,57 @@
 	mes " ";
 	mes "1. Follow the ordinance of The Divine Rune-Midgarts Kingdom, ";
 	mes "we approve that this place is in";
-	mes "the private prossession of ^ff0000"+GetGuildName(.@GID)+"^000000 Guild.";
+	mes "the private prossession 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.";
 	close;
 
 OnRecvCastlePy01:
-	FlagEmblem GetCastleData("payg_cas01",1);
+	flagemblem getcastledata("payg_cas01",1);
 	end;
 }
 
-pay_gld,125,236,4	duplicate(OutsideFlagsPA1)	Bright Arbor#1-2	722
-pay_gld,110,233,4	duplicate(OutsideFlagsPA1)	Bright Arbor#2	722
-pay_gld,116,233,4	duplicate(OutsideFlagsPA1)	Bright Arbor#3	722
-pay_gld,91,239,2	duplicate(OutsideFlagsPA1)	Bright Arbor#4	722
+pay_gld,125,236,4	duplicate(OutsideFlagsPA1)	Bright Arbor#1-2	GUILD_FLAG
+pay_gld,110,233,4	duplicate(OutsideFlagsPA1)	Bright Arbor#2	GUILD_FLAG
+pay_gld,116,233,4	duplicate(OutsideFlagsPA1)	Bright Arbor#3	GUILD_FLAG
+pay_gld,91,239,2	duplicate(OutsideFlagsPA1)	Bright Arbor#4	GUILD_FLAG
 
 // Guild Flags (Inside Castle)
 //============================================================
--	script	Bright Arbor#5::InsideFlagsPA1	722,{
+-	script	Bright Arbor#5::InsideFlagsPA1	GUILD_FLAG,{
 	end;
 
 OnRecvCastlePy01:
-	FlagEmblem GetCastleData("payg_cas01",1);
+	flagemblem getcastledata("payg_cas01",1);
 	end;
 }
 
-payg_cas01,238,67,4	duplicate(InsideFlagsPA1)	Bright Arbor#5-2	722
-payg_cas01,233,67,4	duplicate(InsideFlagsPA1)	Bright Arbor#6	722
-payg_cas01,221,123,4	duplicate(InsideFlagsPA1)	Bright Arbor#7	722
-payg_cas01,221,116,4	duplicate(InsideFlagsPA1)	Bright Arbor#8	722
-payg_cas01,206,108,4	duplicate(InsideFlagsPA1)	Bright Arbor#9	722
-payg_cas01,212,108,4	duplicate(InsideFlagsPA1)	Bright Arbor#10	722
+payg_cas01,238,67,4	duplicate(InsideFlagsPA1)	Bright Arbor#5-2	GUILD_FLAG
+payg_cas01,233,67,4	duplicate(InsideFlagsPA1)	Bright Arbor#6	GUILD_FLAG
+payg_cas01,221,123,4	duplicate(InsideFlagsPA1)	Bright Arbor#7	GUILD_FLAG
+payg_cas01,221,116,4	duplicate(InsideFlagsPA1)	Bright Arbor#8	GUILD_FLAG
+payg_cas01,206,108,4	duplicate(InsideFlagsPA1)	Bright Arbor#9	GUILD_FLAG
+payg_cas01,212,108,4	duplicate(InsideFlagsPA1)	Bright Arbor#10	GUILD_FLAG
 
 // Guild Flag (Town)
 //============================================================
-payon,90,322,4	duplicate(InsideFlagsPA1)	Bright Arbor#11	722
-payon,166,177,3	duplicate(InsideFlagsPA1)	Bright Arbor#12	722
+payon,90,322,4	duplicate(InsideFlagsPA1)	Bright Arbor#11	GUILD_FLAG
+payon,166,177,3	duplicate(InsideFlagsPA1)	Bright Arbor#12	GUILD_FLAG
 
 // Kafra Employee
 //============================================================
-payg_cas01,128,58,3	duplicate(guildkafra)	Kafra Staff#payg_cas01	117
+payg_cas01,128,58,3	duplicate(guildkafra)	Kafra Staff#payg_cas01	4_F_KAFRA1
 
 // Steward
 //============================================================
-payg_cas01,120,58,4	duplicate(cm)	Kurunnadi#payg_cas01	55
+payg_cas01,120,58,4	duplicate(cm)	Kurunnadi#payg_cas01	1_M_JOBTESTER
 
 // Treasure Room Exit
 //============================================================
-payg_cas01,295,8,0	script	#lever_PA01	111,{
+payg_cas01,295,8,0	script	#lever_PA01	HIDDEN_NPC,{
 
 	mes " ";
 	mes "There's a small lever. Will you pull it?";
@@ -118,7 +118,7 @@ payg_cas01,295,8,0	script	#lever_PA01	111,{
 
 // Guild Dungeon Switch
 //============================================================
-payg_cas01,101,25,0	duplicate(gdlever)	#payg_cas01	111
+payg_cas01,101,25,0	duplicate(gdlever)	#payg_cas01	HIDDEN_NPC
 
 // Guild Treasure Spawns
 //============================================================
diff --git a/npc/guild/payg_cas02.txt b/npc/guild/payg_cas02.txt
index 27e5fc4f0..cb7403c6a 100644
--- a/npc/guild/payg_cas02.txt
+++ b/npc/guild/payg_cas02.txt
@@ -17,9 +17,9 @@
 
 // Guild Flags (Outside Castle)
 //============================================================
--	script	Scarlet Palace#1::OutsideFlagsPA2	722,{
+-	script	Scarlet Palace#1::OutsideFlagsPA2	GUILD_FLAG,{
 
-	set .@GID, GetCastleData("payg_cas02",1);
+	set .@GID, getcastledata("payg_cas02",1);
 
 	if (.@GID == 0) {
 		mes "[ Edict of the Divine Rune-Midgarts Kingdom ]";
@@ -42,7 +42,7 @@
 		next;
 		if(select("Return to the guild castle.:Quit.") == 1) {
 			close2;
-			if (getcharid(2) == GetCastleData("payg_cas02",1)) {
+			if (getcharid(2) == getcastledata("payg_cas02",1)) {
 					warp "payg_cas02",278,251;
 				end;
 			}
@@ -54,57 +54,57 @@
 	mes " ";
 	mes "1. Follow the ordinance of The Divine Rune-Midgarts Kingdom, ";
 	mes "we approve that this place is in";
-	mes "the private prossession of ^ff0000"+GetGuildName(.@GID)+"^000000 Guild.";
+	mes "the private prossession 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.";
 	close;
 
 OnRecvCastlePy02:
-	FlagEmblem GetCastleData("payg_cas02",1);
+	flagemblem getcastledata("payg_cas02",1);
 	end;
 }
 
-pay_gld,292,112,6	duplicate(OutsideFlagsPA2)	Scarlet Palace#1-2	722
-pay_gld,292,120,6	duplicate(OutsideFlagsPA2)	Scarlet Palace#2	722
-pay_gld,291,135,6	duplicate(OutsideFlagsPA2)	Scarlet Palace#3	722
-pay_gld,271,163,0	duplicate(OutsideFlagsPA2)	Scarlet Palace#4	722
+pay_gld,292,112,6	duplicate(OutsideFlagsPA2)	Scarlet Palace#1-2	GUILD_FLAG
+pay_gld,292,120,6	duplicate(OutsideFlagsPA2)	Scarlet Palace#2	GUILD_FLAG
+pay_gld,291,135,6	duplicate(OutsideFlagsPA2)	Scarlet Palace#3	GUILD_FLAG
+pay_gld,271,163,0	duplicate(OutsideFlagsPA2)	Scarlet Palace#4	GUILD_FLAG
 
 // Guild Flags (Inside Castle)
 //============================================================
--	script	Scarlet Palace#5::InsideFlagsPA2	722,{
+-	script	Scarlet Palace#5::InsideFlagsPA2	GUILD_FLAG,{
 	end;
 
 OnRecvCastlePy02:
-	FlagEmblem GetCastleData("payg_cas02",1);
+	flagemblem getcastledata("payg_cas02",1);
 	end;
 }
 
-payg_cas02,254,40,6	duplicate(InsideFlagsPA2)	Scarlet Palace#5-2	722
-payg_cas02,254,48,6	duplicate(InsideFlagsPA2)	Scarlet Palace#6	722
-payg_cas02,202,49,0	duplicate(InsideFlagsPA2)	Scarlet Palace#7	722
-payg_cas02,209,49,0	duplicate(InsideFlagsPA2)	Scarlet Palace#8	722
-payg_cas02,59,282,4	duplicate(InsideFlagsPA2)	Scarlet Palace#9	722
-payg_cas02,70,282,4	duplicate(InsideFlagsPA2)	Scarlet Palace#10	722
+payg_cas02,254,40,6	duplicate(InsideFlagsPA2)	Scarlet Palace#5-2	GUILD_FLAG
+payg_cas02,254,48,6	duplicate(InsideFlagsPA2)	Scarlet Palace#6	GUILD_FLAG
+payg_cas02,202,49,0	duplicate(InsideFlagsPA2)	Scarlet Palace#7	GUILD_FLAG
+payg_cas02,209,49,0	duplicate(InsideFlagsPA2)	Scarlet Palace#8	GUILD_FLAG
+payg_cas02,59,282,4	duplicate(InsideFlagsPA2)	Scarlet Palace#9	GUILD_FLAG
+payg_cas02,70,282,4	duplicate(InsideFlagsPA2)	Scarlet Palace#10	GUILD_FLAG
 
 // Guild Flag (Town)
 //============================================================
-payon,97,322,4	duplicate(InsideFlagsPA2)	Scarlet Palace#11	722
-payon,166,173,3	duplicate(InsideFlagsPA2)	Scarlet Palace#12	722
+payon,97,322,4	duplicate(InsideFlagsPA2)	Scarlet Palace#11	GUILD_FLAG
+payon,166,173,3	duplicate(InsideFlagsPA2)	Scarlet Palace#12	GUILD_FLAG
 
 // Kafra Employee
 //============================================================
-payg_cas02,22,275,5	duplicate(guildkafra)	Kafra Staff#payg_cas02	117
+payg_cas02,22,275,5	duplicate(guildkafra)	Kafra Staff#payg_cas02	4_F_KAFRA1
 
 // Steward
 //============================================================
-payg_cas02,22,260,7	duplicate(cm)	Cherieos#payg_cas02	55
+payg_cas02,22,260,7	duplicate(cm)	Cherieos#payg_cas02	1_M_JOBTESTER
 
 // Treasure Room Exit
 //============================================================
-payg_cas02,149,149,0	script	#lever_PA02	111,{
+payg_cas02,149,149,0	script	#lever_PA02	HIDDEN_NPC,{
 
 	mes " ";
 	mes "There's a small lever. Will you pull it?";
@@ -119,7 +119,7 @@ payg_cas02,149,149,0	script	#lever_PA02	111,{
 
 // Guild Dungeon Switch
 //============================================================
-payg_cas02,278,247,0	duplicate(gdlever)	#payg_cas02	111
+payg_cas02,278,247,0	duplicate(gdlever)	#payg_cas02	HIDDEN_NPC
 
 // Guild Treasure Spawns
 //============================================================
diff --git a/npc/guild/payg_cas03.txt b/npc/guild/payg_cas03.txt
index e67b9798f..54c69087e 100644
--- a/npc/guild/payg_cas03.txt
+++ b/npc/guild/payg_cas03.txt
@@ -16,9 +16,9 @@
 
 // Guild Flags (Outside Castle)
 //============================================================
--	script	Holy Shadow#1::OutsideFlagsPA3	722,{
+-	script	Holy Shadow#1::OutsideFlagsPA3	GUILD_FLAG,{
 
-	set .@GID, GetCastleData("payg_cas03",1);
+	set .@GID, getcastledata("payg_cas03",1);
 
 	if (.@GID == 0) {
 		mes "[ Edict of the Divine Rune-Midgarts Kingdom ]";
@@ -41,7 +41,7 @@
 		next;
 		if(select("Return to the guild castle.:Quit.") == 1) {
 			close2;
-			if (getcharid(2) == GetCastleData("payg_cas03",1)) {
+			if (getcharid(2) == getcastledata("payg_cas03",1)) {
 					warp "payg_cas03",9,263;
 				end;
 			}
@@ -53,57 +53,57 @@
 	mes " ";
 	mes "1. Follow the ordinance of The Divine Rune-Midgarts Kingdom, ";
 	mes "we approve that this place is in";
-	mes "the private prossession of ^ff0000"+GetGuildName(.@GID)+"^000000 Guild.";
+	mes "the private prossession 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.";
 	close;
 
 OnRecvCastlePy03:
-	FlagEmblem GetCastleData("payg_cas03",1);
+	flagemblem getcastledata("payg_cas03",1);
 	end;
 }
 
-pay_gld,321,298,2	duplicate(OutsideFlagsPA3)	Holy Shadow#1-2	722
-pay_gld,321,289,2	duplicate(OutsideFlagsPA3)	Holy Shadow#2	722
-pay_gld,327,304,1	duplicate(OutsideFlagsPA3)	Holy Shadow#3	722
-pay_gld,333,254,4	duplicate(OutsideFlagsPA3)	Holy Shadow#4	722
+pay_gld,321,298,2	duplicate(OutsideFlagsPA3)	Holy Shadow#1-2	GUILD_FLAG
+pay_gld,321,289,2	duplicate(OutsideFlagsPA3)	Holy Shadow#2	GUILD_FLAG
+pay_gld,327,304,1	duplicate(OutsideFlagsPA3)	Holy Shadow#3	GUILD_FLAG
+pay_gld,333,254,4	duplicate(OutsideFlagsPA3)	Holy Shadow#4	GUILD_FLAG
 
 // Guild Flags (Inside Castle)
 //============================================================
--	script	Holy Shadow#5::InsideFlagsPA3	722,{
+-	script	Holy Shadow#5::InsideFlagsPA3	GUILD_FLAG,{
 	end;
 
 OnRecvCastlePy03:
-	FlagEmblem GetCastleData("payg_cas03",1);
+	flagemblem getcastledata("payg_cas03",1);
 	end;
 }
 
-payg_cas03,236,54,2	duplicate(InsideFlagsPA3)	Holy Shadow#5-2	722
-payg_cas03,236,45,2	duplicate(InsideFlagsPA3)	Holy Shadow#6	722
-payg_cas03,259,66,4	duplicate(InsideFlagsPA3)	Holy Shadow#7	722
-payg_cas03,266,66,4	duplicate(InsideFlagsPA3)	Holy Shadow#8	722
-payg_cas03,34,31,4	duplicate(InsideFlagsPA3)	Holy Shadow#9	722
-payg_cas03,43,31,4	duplicate(InsideFlagsPA3)	Holy Shadow#10	722
+payg_cas03,236,54,2	duplicate(InsideFlagsPA3)	Holy Shadow#5-2	GUILD_FLAG
+payg_cas03,236,45,2	duplicate(InsideFlagsPA3)	Holy Shadow#6	GUILD_FLAG
+payg_cas03,259,66,4	duplicate(InsideFlagsPA3)	Holy Shadow#7	GUILD_FLAG
+payg_cas03,266,66,4	duplicate(InsideFlagsPA3)	Holy Shadow#8	GUILD_FLAG
+payg_cas03,34,31,4	duplicate(InsideFlagsPA3)	Holy Shadow#9	GUILD_FLAG
+payg_cas03,43,31,4	duplicate(InsideFlagsPA3)	Holy Shadow#10	GUILD_FLAG
 
 // Guild Flag (Town)
 //============================================================
-payon,113,322,4	duplicate(InsideFlagsPA3)	Holy Shadow#11	722
-payon,166,169,3	duplicate(InsideFlagsPA3)	Holy Shadow#12	722
+payon,113,322,4	duplicate(InsideFlagsPA3)	Holy Shadow#11	GUILD_FLAG
+payon,166,169,3	duplicate(InsideFlagsPA3)	Holy Shadow#12	GUILD_FLAG
 
 // Kafra Employee
 //============================================================
-payg_cas03,9,263,5	duplicate(guildkafra)	Kafra Staff#payg_cas03	117
+payg_cas03,9,263,5	duplicate(guildkafra)	Kafra Staff#payg_cas03	4_F_KAFRA1
 
 // Steward
 //============================================================
-payg_cas03,50,261,3	duplicate(cm)	Gheriot#payg_cas03	55
+payg_cas03,50,261,3	duplicate(cm)	Gheriot#payg_cas03	1_M_JOBTESTER
 
 // Treasure Room Exit
 //============================================================
-payg_cas03,163,167,0	script	#lever_PA03	111,{
+payg_cas03,163,167,0	script	#lever_PA03	HIDDEN_NPC,{
 
 	mes " ";
 	mes "There's a small lever. Will you pull it?";
@@ -118,7 +118,7 @@ payg_cas03,163,167,0	script	#lever_PA03	111,{
 
 // Guild Dungeon Switch
 //============================================================
-payg_cas03,38,42,0	duplicate(gdlever)	#payg_cas03	111
+payg_cas03,38,42,0	duplicate(gdlever)	#payg_cas03	HIDDEN_NPC
 
 // Guild Treasure Spawns
 //============================================================
diff --git a/npc/guild/payg_cas04.txt b/npc/guild/payg_cas04.txt
index 4f584e368..265ace62f 100644
--- a/npc/guild/payg_cas04.txt
+++ b/npc/guild/payg_cas04.txt
@@ -17,9 +17,9 @@
 
 // Guild Flags (Outside Castle)
 //============================================================
--	script	Sacred Altar#1::OutsideFlagsPA4	722,{
+-	script	Sacred Altar#1::OutsideFlagsPA4	GUILD_FLAG,{
 
-	set .@GID, GetCastleData("payg_cas04",1);
+	set .@GID, getcastledata("payg_cas04",1);
 
 	if (.@GID == 0) {
 		mes "[ Edict of the Divine Rune-Midgarts Kingdom ]";
@@ -42,7 +42,7 @@
 		next;
 		if(select("Return to the guild castle.:Quit.") == 1) {
 			close2;
-			if (getcharid(2) == GetCastleData("payg_cas04",1)) {
+			if (getcharid(2) == getcastledata("payg_cas04",1)) {
 					warp "payg_cas04",40,235;
 				end;
 			}
@@ -54,57 +54,57 @@
 	mes " ";
 	mes "1. Follow the ordinance of The Divine Rune-Midgarts Kingdom, ";
 	mes "we approve that this place is in";
-	mes "the private prossession of ^ff0000"+GetGuildName(.@GID)+"^000000 Guild.";
+	mes "the private prossession 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.";
 	close;
 
 OnRecvCastlePy04:
-	FlagEmblem GetCastleData("payg_cas04",1);
+	flagemblem getcastledata("payg_cas04",1);
 	end;
 }
 
-pay_gld,137,160,0	duplicate(OutsideFlagsPA4)	Sacred Altar#1-2	722
-pay_gld,143,160,0	duplicate(OutsideFlagsPA4)	Sacred Altar#2	722
-pay_gld,133,151,2	duplicate(OutsideFlagsPA4)	Sacred Altar#3	722
-pay_gld,153,166,1	duplicate(OutsideFlagsPA4)	Sacred Altar#4	722
+pay_gld,137,160,0	duplicate(OutsideFlagsPA4)	Sacred Altar#1-2	GUILD_FLAG
+pay_gld,143,160,0	duplicate(OutsideFlagsPA4)	Sacred Altar#2	GUILD_FLAG
+pay_gld,133,151,2	duplicate(OutsideFlagsPA4)	Sacred Altar#3	GUILD_FLAG
+pay_gld,153,166,1	duplicate(OutsideFlagsPA4)	Sacred Altar#4	GUILD_FLAG
 
 // Guild Flags (Inside Castle)
 //============================================================
--	script	Sacred Altar#5::InsideFlagsPA4	722,{
+-	script	Sacred Altar#5::InsideFlagsPA4	GUILD_FLAG,{
 	end;
 
 OnRecvCastlePy04:
-	FlagEmblem GetCastleData("payg_cas04",1);
+	flagemblem getcastledata("payg_cas04",1);
 	end;
 }
 
-payg_cas04,255,259,0	duplicate(InsideFlagsPA4)	Sacred Altar#5-2	722
-payg_cas04,248,259,0	duplicate(InsideFlagsPA4)	Sacred Altar#6	722
-payg_cas04,248,168,6	duplicate(InsideFlagsPA4)	Sacred Altar#7	722
-payg_cas04,248,160,6	duplicate(InsideFlagsPA4)	Sacred Altar#8	722
-payg_cas04,232,181,4	duplicate(InsideFlagsPA4)	Sacred Altar#9	722
-payg_cas04,239,181,4	duplicate(InsideFlagsPA4)	Sacred Altar#10	722
+payg_cas04,255,259,0	duplicate(InsideFlagsPA4)	Sacred Altar#5-2	GUILD_FLAG
+payg_cas04,248,259,0	duplicate(InsideFlagsPA4)	Sacred Altar#6	GUILD_FLAG
+payg_cas04,248,168,6	duplicate(InsideFlagsPA4)	Sacred Altar#7	GUILD_FLAG
+payg_cas04,248,160,6	duplicate(InsideFlagsPA4)	Sacred Altar#8	GUILD_FLAG
+payg_cas04,232,181,4	duplicate(InsideFlagsPA4)	Sacred Altar#9	GUILD_FLAG
+payg_cas04,239,181,4	duplicate(InsideFlagsPA4)	Sacred Altar#10	GUILD_FLAG
 
 // Guild Flag (Town)
 //============================================================
-payon,118,322,4	duplicate(InsideFlagsPA4)	Sacred Altar#11	722
-payon,166,165,3	duplicate(InsideFlagsPA4)	Sacred Altar#12	722
+payon,118,322,4	duplicate(InsideFlagsPA4)	Sacred Altar#11	GUILD_FLAG
+payon,166,165,3	duplicate(InsideFlagsPA4)	Sacred Altar#12	GUILD_FLAG
 
 // Kafra Employee
 //============================================================
-payg_cas04,40,235,1	duplicate(guildkafra)	Kafra Staff#payg_cas04	117
+payg_cas04,40,235,1	duplicate(guildkafra)	Kafra Staff#payg_cas04	4_F_KAFRA1
 
 // Steward
 //============================================================
-payg_cas04,38,284,3	duplicate(cm)	DJ#payg_cas04	55
+payg_cas04,38,284,3	duplicate(cm)	DJ#payg_cas04	1_M_JOBTESTER
 
 // Treasure Room Exit
 //============================================================
-payg_cas04,151,47,0	script	#lever_PA04	111,{
+payg_cas04,151,47,0	script	#lever_PA04	HIDDEN_NPC,{
 
 	mes " ";
 	mes "There's a small lever. Will you pull it?";
@@ -119,7 +119,7 @@ payg_cas04,151,47,0	script	#lever_PA04	111,{
 
 // Guild Dungeon Switch
 //============================================================
-payg_cas04,52,48,0	duplicate(gdlever)	#payg_cas04	111
+payg_cas04,52,48,0	duplicate(gdlever)	#payg_cas04	HIDDEN_NPC
 
 // Guild Treasure Spawns
 //============================================================
diff --git a/npc/guild/payg_cas05.txt b/npc/guild/payg_cas05.txt
index ce5ee2f06..ec616656e 100644
--- a/npc/guild/payg_cas05.txt
+++ b/npc/guild/payg_cas05.txt
@@ -16,9 +16,9 @@
 
 // Guild Flags (Outside Castle)
 //============================================================
--	script	Bamboo Grove Hill#1::OutsideFlagsPA5	722,{
+-	script	Bamboo Grove Hill#1::OutsideFlagsPA5	GUILD_FLAG,{
 
-	set .@GID, GetCastleData("payg_cas05",1);
+	set .@GID, getcastledata("payg_cas05",1);
 
 	if (.@GID == 0) {
 		mes "[ Edict of the Divine Rune-Midgarts Kingdom ]";
@@ -41,7 +41,7 @@
 		next;
 		if(select("Return to the guild castle.:Quit.") == 1) {
 			close2;
-			if (getcharid(2) == GetCastleData("payg_cas05",1)) {
+			if (getcharid(2) == getcastledata("payg_cas05",1)) {
 					warp "payg_cas05",243,27;
 				end;
 			}
@@ -53,57 +53,57 @@
 	mes " ";
 	mes "1. Follow the ordinance of The Divine Rune-Midgarts Kingdom, ";
 	mes "we approve that this place is in";
-	mes "the private prossession of ^ff0000"+GetGuildName(.@GID)+"^000000 Guild.";
+	mes "the private prossession 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.";
 	close;
 
 OnRecvCastlePy05:
-	FlagEmblem GetCastleData("payg_cas05",1);
+	flagemblem getcastledata("payg_cas05",1);
 	end;
 }
 
-pay_gld,208,268,4	duplicate(OutsideFlagsPA5)	Bamboo Grove Hill#1-2	722
-pay_gld,199,268,4	duplicate(OutsideFlagsPA5)	Bamboo Grove Hill#2	722
-pay_gld,190,277,3	duplicate(OutsideFlagsPA5)	Bamboo Grove Hill#3	722
-pay_gld,187,294,2	duplicate(OutsideFlagsPA5)	Bamboo Grove Hill#4	722
+pay_gld,208,268,4	duplicate(OutsideFlagsPA5)	Bamboo Grove Hill#1-2	GUILD_FLAG
+pay_gld,199,268,4	duplicate(OutsideFlagsPA5)	Bamboo Grove Hill#2	GUILD_FLAG
+pay_gld,190,277,3	duplicate(OutsideFlagsPA5)	Bamboo Grove Hill#3	GUILD_FLAG
+pay_gld,187,294,2	duplicate(OutsideFlagsPA5)	Bamboo Grove Hill#4	GUILD_FLAG
 
 // Guild Flags (Inside Castle)
 //============================================================
--	script	Bamboo Grove Hill#5::InsideFlagsPA5	722,{
+-	script	Bamboo Grove Hill#5::InsideFlagsPA5	GUILD_FLAG,{
 	end;
 
 OnRecvCastlePy05:
-	FlagEmblem GetCastleData("payg_cas05",1);
+	flagemblem getcastledata("payg_cas05",1);
 	end;
 }
 
-payg_cas05,32,249,4	duplicate(InsideFlagsPA5)	Bamboo Grove Hill#5-2	722
-payg_cas05,24,249,4	duplicate(InsideFlagsPA5)	Bamboo Grove Hill#6	722
-payg_cas05,62,271,0	duplicate(InsideFlagsPA5)	Bamboo Grove Hill#7	722
-payg_cas05,57,271,0	duplicate(InsideFlagsPA5)	Bamboo Grove Hill#8	722
-payg_cas05,55,252,2	duplicate(InsideFlagsPA5)	Bamboo Grove Hill#9	722
-payg_cas05,55,260,2	duplicate(InsideFlagsPA5)	Bamboo Grove Hill#10	722
+payg_cas05,32,249,4	duplicate(InsideFlagsPA5)	Bamboo Grove Hill#5-2	GUILD_FLAG
+payg_cas05,24,249,4	duplicate(InsideFlagsPA5)	Bamboo Grove Hill#6	GUILD_FLAG
+payg_cas05,62,271,0	duplicate(InsideFlagsPA5)	Bamboo Grove Hill#7	GUILD_FLAG
+payg_cas05,57,271,0	duplicate(InsideFlagsPA5)	Bamboo Grove Hill#8	GUILD_FLAG
+payg_cas05,55,252,2	duplicate(InsideFlagsPA5)	Bamboo Grove Hill#9	GUILD_FLAG
+payg_cas05,55,260,2	duplicate(InsideFlagsPA5)	Bamboo Grove Hill#10	GUILD_FLAG
 
 // Guild Flag (Town)
 //============================================================
-payon,123,322,4	duplicate(InsideFlagsPA5)	Bamboo Grove Hill#11	722
-payon,166,161,3	duplicate(InsideFlagsPA5)	Bamboo Grove Hill#12	722
+payon,123,322,4	duplicate(InsideFlagsPA5)	Bamboo Grove Hill#11	GUILD_FLAG
+payon,166,161,3	duplicate(InsideFlagsPA5)	Bamboo Grove Hill#12	GUILD_FLAG
 
 // Kafra Employee
 //============================================================
-payg_cas05,276,227,1	duplicate(guildkafra)	Kafra Staff#payg_cas05	117
+payg_cas05,276,227,1	duplicate(guildkafra)	Kafra Staff#payg_cas05	4_F_KAFRA1
 
 // Steward
 //============================================================
-payg_cas05,277,249,3	duplicate(cm)	Nahzarf#payg_cas05	55
+payg_cas05,277,249,3	duplicate(cm)	Nahzarf#payg_cas05	1_M_JOBTESTER
 
 // Treasure Room Exit
 //============================================================
-payg_cas05,161,136,0	script	#lever_PA05	111,{
+payg_cas05,161,136,0	script	#lever_PA05	HIDDEN_NPC,{
 
 	mes " ";
 	mes "There's a small lever. Will you pull it?";
@@ -118,7 +118,7 @@ payg_cas05,161,136,0	script	#lever_PA05	111,{
 
 // Guild Dungeon Switch
 //============================================================
-payg_cas05,249,15,0	duplicate(gdlever)	#payg_cas05	111
+payg_cas05,249,15,0	duplicate(gdlever)	#payg_cas05	HIDDEN_NPC
 
 // Guild Treasure Spawns
 //============================================================
diff --git a/npc/guild/prtg_cas01.txt b/npc/guild/prtg_cas01.txt
index 25206d922..a99f37ac9 100644
--- a/npc/guild/prtg_cas01.txt
+++ b/npc/guild/prtg_cas01.txt
@@ -16,9 +16,9 @@
 
 // Guild Flags (Outside Castle)
 //============================================================
--	script	Kriemhild#1::OutsideFlagsPR1	722,{
+-	script	Kriemhild#1::OutsideFlagsPR1	GUILD_FLAG,{
 
-	set .@GID, GetCastleData("prtg_cas01",1);
+	set .@GID, getcastledata("prtg_cas01",1);
 
 	if (.@GID == 0) {
 		mes "[ Edict of the Divine Rune-Midgarts Kingdom ]";
@@ -41,7 +41,7 @@
 		next;
 		if(select("Return to the guild castle.:Quit.") == 1) {
 			close2;
-			if (getcharid(2) == GetCastleData("prtg_cas01",1)) {
+			if (getcharid(2) == getcastledata("prtg_cas01",1)) {
 				warp "prtg_cas01",96,173;
 				end;
 			}
@@ -53,60 +53,60 @@
 	mes " ";
 	mes "1. Follow the ordinance of The Divine Rune-Midgarts Kingdom, ";
 	mes "we approve that this place is in";
-	mes "the private prossession of ^ff0000"+GetGuildName(.@GID)+"^000000 Guild.";
+	mes "the private prossession 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.";
 	close;
 
 OnRecvCastlePt01:
-	FlagEmblem GetCastleData("prtg_cas01",1);
+	flagemblem getcastledata("prtg_cas01",1);
 	end;
 }
 
-prt_gld,131,60,6	duplicate(OutsideFlagsPR1)	Kriemhild#1-2	722
-prt_gld,138,68,6	duplicate(OutsideFlagsPR1)	Kriemhild#2	722
-prt_gld,138,60,6	duplicate(OutsideFlagsPR1)	Kriemhild#3	722
-prt_gld,135,60,6	duplicate(OutsideFlagsPR1)	Kriemhild#4	722
+prt_gld,131,60,6	duplicate(OutsideFlagsPR1)	Kriemhild#1-2	GUILD_FLAG
+prt_gld,138,68,6	duplicate(OutsideFlagsPR1)	Kriemhild#2	GUILD_FLAG
+prt_gld,138,60,6	duplicate(OutsideFlagsPR1)	Kriemhild#3	GUILD_FLAG
+prt_gld,135,60,6	duplicate(OutsideFlagsPR1)	Kriemhild#4	GUILD_FLAG
 
 // Guild Flags (Inside Castle)
 //============================================================
--	script	Kriemhild#5::InsideFlagsPR1	722,{
+-	script	Kriemhild#5::InsideFlagsPR1	GUILD_FLAG,{
 	end;
 
 OnRecvCastlePt01:
-	FlagEmblem GetCastleData("prtg_cas01",1);
+	flagemblem getcastledata("prtg_cas01",1);
 	end;
 }
 
-prtg_cas01,58,56,4	duplicate(InsideFlagsPR1)	Kriemhild#5-2	722
-prtg_cas01,64,56,4	duplicate(InsideFlagsPR1)	Kriemhild#6	722
-prtg_cas01,76,32,4	duplicate(InsideFlagsPR1)	Kriemhild#7	722
-prtg_cas01,84,32,4	duplicate(InsideFlagsPR1)	Kriemhild#8	722
-prtg_cas01,94,39,4	duplicate(InsideFlagsPR1)	Kriemhild#9	722
-prtg_cas01,94,24,4	duplicate(InsideFlagsPR1)	Kriemhild#10	722
-prtg_cas01,73,14,4	duplicate(InsideFlagsPR1)	Kriemhild#11	722
-prtg_cas01,73,6,4	duplicate(InsideFlagsPR1)	Kriemhild#12	722
-prtg_cas01,55,46,4	duplicate(InsideFlagsPR1)	Kriemhild#13	722
-prtg_cas01,45,46,4	duplicate(InsideFlagsPR1)	Kriemhild#14	722
+prtg_cas01,58,56,4	duplicate(InsideFlagsPR1)	Kriemhild#5-2	GUILD_FLAG
+prtg_cas01,64,56,4	duplicate(InsideFlagsPR1)	Kriemhild#6	GUILD_FLAG
+prtg_cas01,76,32,4	duplicate(InsideFlagsPR1)	Kriemhild#7	GUILD_FLAG
+prtg_cas01,84,32,4	duplicate(InsideFlagsPR1)	Kriemhild#8	GUILD_FLAG
+prtg_cas01,94,39,4	duplicate(InsideFlagsPR1)	Kriemhild#9	GUILD_FLAG
+prtg_cas01,94,24,4	duplicate(InsideFlagsPR1)	Kriemhild#10	GUILD_FLAG
+prtg_cas01,73,14,4	duplicate(InsideFlagsPR1)	Kriemhild#11	GUILD_FLAG
+prtg_cas01,73,6,4	duplicate(InsideFlagsPR1)	Kriemhild#12	GUILD_FLAG
+prtg_cas01,55,46,4	duplicate(InsideFlagsPR1)	Kriemhild#13	GUILD_FLAG
+prtg_cas01,45,46,4	duplicate(InsideFlagsPR1)	Kriemhild#14	GUILD_FLAG
 
 // Guild Flag (Town)
 //============================================================
-prontera,155,190,4	duplicate(InsideFlagsPR1)	Kriemhild#15	722
+prontera,155,190,4	duplicate(InsideFlagsPR1)	Kriemhild#15	GUILD_FLAG
 
 // Kafra Employee
 //============================================================
-prtg_cas01,96,173,0	duplicate(guildkafra)	Kafra Staff#prtg_cas01	117
+prtg_cas01,96,173,0	duplicate(guildkafra)	Kafra Staff#prtg_cas01	4_F_KAFRA1
 
 // Steward
 //============================================================
-prtg_cas01,112,181,0	duplicate(cm)	Ahvray#prtg_cas01	55
+prtg_cas01,112,181,0	duplicate(cm)	Ahvray#prtg_cas01	1_M_JOBTESTER
 
 // Treasure Room Exit
 //============================================================
-prtg_cas01,15,208,0	script	#Lever_PR01	111,{
+prtg_cas01,15,208,0	script	#Lever_PR01	HIDDEN_NPC,{
 
 	mes " ";
 	mes "There's a small lever. Will you pull it?";
@@ -121,7 +121,7 @@ prtg_cas01,15,208,0	script	#Lever_PR01	111,{
 
 // Guild Dungeon Switch
 //============================================================
-prtg_cas01,94,200,0	duplicate(gdlever)	#prtg_cas01	111
+prtg_cas01,94,200,0	duplicate(gdlever)	#prtg_cas01	HIDDEN_NPC
 
 // Guild Treasure Spawns
 //============================================================
diff --git a/npc/guild/prtg_cas02.txt b/npc/guild/prtg_cas02.txt
index 4ddb3f64f..ceaae4821 100644
--- a/npc/guild/prtg_cas02.txt
+++ b/npc/guild/prtg_cas02.txt
@@ -16,9 +16,9 @@
 
 // Guild Flags (Outside Castle)
 //============================================================
--	script	Swanhild#1::OutsideFlagsPR2	722,{
+-	script	Swanhild#1::OutsideFlagsPR2	GUILD_FLAG,{
 
-	set .@GID, GetCastleData("prtg_cas02",1);
+	set .@GID, getcastledata("prtg_cas02",1);
 
 	if (.@GID == 0) {
 		mes "[ Edict of the Divine Rune-Midgarts Kingdom ]";
@@ -41,7 +41,7 @@
 		next;
 		if(select("Return to the guild castle.:Quit.") == 1) {
 			close2;
-			if (getcharid(2) == GetCastleData("prtg_cas02",1)) {
+			if (getcharid(2) == getcastledata("prtg_cas02",1)) {
 				warp "prtg_cas02",169,55;
 				end;
 			}
@@ -53,62 +53,62 @@
 	mes " ";
 	mes "1. Follow the ordinance of The Divine Rune-Midgarts Kingdom, ";
 	mes "we approve that this place is in";
-	mes "the private prossession of ^ff0000"+GetGuildName(.@GID)+"^000000 Guild.";
+	mes "the private prossession 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.";
 	close;
 
 OnRecvCastlePt02:
-	FlagEmblem GetCastleData("prtg_cas02",1);
+	flagemblem getcastledata("prtg_cas02",1);
 	end;
 }
 
-prt_gld,244,126,8	duplicate(OutsideFlagsPR2)	Swanhild#1-2	722
-prt_gld,244,128,8	duplicate(OutsideFlagsPR2)	Swanhild#2	722
-prt_gld,236,126,8	duplicate(OutsideFlagsPR2)	Swanhild#3	722
-prt_gld,236,128,8	duplicate(OutsideFlagsPR2)	Swanhild#4	722
+prt_gld,244,126,8	duplicate(OutsideFlagsPR2)	Swanhild#1-2	GUILD_FLAG
+prt_gld,244,128,8	duplicate(OutsideFlagsPR2)	Swanhild#2	GUILD_FLAG
+prt_gld,236,126,8	duplicate(OutsideFlagsPR2)	Swanhild#3	GUILD_FLAG
+prt_gld,236,128,8	duplicate(OutsideFlagsPR2)	Swanhild#4	GUILD_FLAG
 
 // Guild Flags (Inside Castle)
 //============================================================
--	script	Swanhild#5::InsideFlagsPR2	722,{
+-	script	Swanhild#5::InsideFlagsPR2	GUILD_FLAG,{
 	end;
 
 OnRecvCastlePt02:
-	FlagEmblem GetCastleData("prtg_cas02",1);
+	flagemblem getcastledata("prtg_cas02",1);
 	end;
 }
 
-prtg_cas02,40,227,4	duplicate(InsideFlagsPR2)	Swanhild#5-2	722
-prtg_cas02,46,227,4	duplicate(InsideFlagsPR2)	Swanhild#6	722
-prtg_cas02,11,219,4	duplicate(InsideFlagsPR2)	Swanhild#7	722
-prtg_cas02,11,214,4	duplicate(InsideFlagsPR2)	Swanhild#8	722
-prtg_cas02,20,219,4	duplicate(InsideFlagsPR2)	Swanhild#9	722
-prtg_cas02,20,214,4	duplicate(InsideFlagsPR2)	Swanhild#10	722
-prtg_cas02,79,227,8	duplicate(InsideFlagsPR2)	Swanhild#11	722
-prtg_cas02,70,227,8	duplicate(InsideFlagsPR2)	Swanhild#12	722
-prtg_cas02,38,189,8	duplicate(InsideFlagsPR2)	Swanhild#13	722
-prtg_cas02,34,189,8	duplicate(InsideFlagsPR2)	Swanhild#14	722
-prtg_cas02,153,161,4	duplicate(InsideFlagsPR2)	Swanhild#15	722
-prtg_cas02,162,161,4	duplicate(InsideFlagsPR2)	Swanhild#16	722
+prtg_cas02,40,227,4	duplicate(InsideFlagsPR2)	Swanhild#5-2	GUILD_FLAG
+prtg_cas02,46,227,4	duplicate(InsideFlagsPR2)	Swanhild#6	GUILD_FLAG
+prtg_cas02,11,219,4	duplicate(InsideFlagsPR2)	Swanhild#7	GUILD_FLAG
+prtg_cas02,11,214,4	duplicate(InsideFlagsPR2)	Swanhild#8	GUILD_FLAG
+prtg_cas02,20,219,4	duplicate(InsideFlagsPR2)	Swanhild#9	GUILD_FLAG
+prtg_cas02,20,214,4	duplicate(InsideFlagsPR2)	Swanhild#10	GUILD_FLAG
+prtg_cas02,79,227,8	duplicate(InsideFlagsPR2)	Swanhild#11	GUILD_FLAG
+prtg_cas02,70,227,8	duplicate(InsideFlagsPR2)	Swanhild#12	GUILD_FLAG
+prtg_cas02,38,189,8	duplicate(InsideFlagsPR2)	Swanhild#13	GUILD_FLAG
+prtg_cas02,34,189,8	duplicate(InsideFlagsPR2)	Swanhild#14	GUILD_FLAG
+prtg_cas02,153,161,4	duplicate(InsideFlagsPR2)	Swanhild#15	GUILD_FLAG
+prtg_cas02,162,161,4	duplicate(InsideFlagsPR2)	Swanhild#16	GUILD_FLAG
 
 // Guild Flag (Town)
 //============================================================
-prontera,146,194,3	duplicate(InsideFlagsPR2)	Swanhild#17	722
+prontera,146,194,3	duplicate(InsideFlagsPR2)	Swanhild#17	GUILD_FLAG
 
 // Kafra Employee
 //============================================================
-prtg_cas02,71,36,4	duplicate(guildkafra)	Kafra Staff#prtg_cas02	117
+prtg_cas02,71,36,4	duplicate(guildkafra)	Kafra Staff#prtg_cas02	4_F_KAFRA1
 
 // Steward
 //============================================================
-prtg_cas02,94,61,4	duplicate(cm)	Roy#prtg_cas02	55
+prtg_cas02,94,61,4	duplicate(cm)	Roy#prtg_cas02	1_M_JOBTESTER
 
 // Treasure Room Exit
 //============================================================
-prtg_cas02,207,228,0	script	#Lever_PR02	111,{
+prtg_cas02,207,228,0	script	#Lever_PR02	HIDDEN_NPC,{
 
 	mes " ";
 	mes "There's a small lever. Will you pull it?";
@@ -123,7 +123,7 @@ prtg_cas02,207,228,0	script	#Lever_PR02	111,{
 
 // Guild Dungeon Switch
 //============================================================
-prtg_cas02,84,72,0	duplicate(gdlever)	#prtg_cas02	111
+prtg_cas02,84,72,0	duplicate(gdlever)	#prtg_cas02	HIDDEN_NPC
 
 // Guild Treasure Spawns
 //============================================================
diff --git a/npc/guild/prtg_cas03.txt b/npc/guild/prtg_cas03.txt
index 28dea58d4..b0e0515ec 100644
--- a/npc/guild/prtg_cas03.txt
+++ b/npc/guild/prtg_cas03.txt
@@ -16,9 +16,9 @@
 
 // Guild Flags (Outside Castle)
 //============================================================
--	script	Fadhgridh#1::OutsideFlagsPR3	722,{
+-	script	Fadhgridh#1::OutsideFlagsPR3	GUILD_FLAG,{
 
-	set .@GID, GetCastleData("prtg_cas03",1);
+	set .@GID, getcastledata("prtg_cas03",1);
 
 	if (.@GID == 0) {
 		mes "[ Edict of the Divine Rune-Midgarts Kingdom ]";
@@ -41,7 +41,7 @@
 		next;
 		if(select("Return to the guild castle.:Quit.") == 1) {
 			close2;
-			if (getcharid(2) == GetCastleData("prtg_cas03",1)) {
+			if (getcharid(2) == getcastledata("prtg_cas03",1)) {
 				warp "prtg_cas03",181,215;
 				end;
 			}
@@ -53,60 +53,60 @@
 	mes " ";
 	mes "1. Follow the ordinance of The Divine Rune-Midgarts Kingdom, ";
 	mes "we approve that this place is in";
-	mes "the private prossession of ^ff0000"+GetGuildName(.@GID)+"^000000 Guild.";
+	mes "the private prossession 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.";
 	close;
 
 OnRecvCastlePt03:
-	FlagEmblem GetCastleData("prtg_cas03",1);
+	flagemblem getcastledata("prtg_cas03",1);
 	end;
 }
 
-prt_gld,147,140,4	duplicate(OutsideFlagsPR3)	Fadhgridh#1-2	722
-prt_gld,147,136,4	duplicate(OutsideFlagsPR3)	Fadhgridh#2	722
-prt_gld,158,140,4	duplicate(OutsideFlagsPR3)	Fadhgridh#3	722
-prt_gld,158,136,4	duplicate(OutsideFlagsPR3)	Fadhgridh#4	722
+prt_gld,147,140,4	duplicate(OutsideFlagsPR3)	Fadhgridh#1-2	GUILD_FLAG
+prt_gld,147,136,4	duplicate(OutsideFlagsPR3)	Fadhgridh#2	GUILD_FLAG
+prt_gld,158,140,4	duplicate(OutsideFlagsPR3)	Fadhgridh#3	GUILD_FLAG
+prt_gld,158,136,4	duplicate(OutsideFlagsPR3)	Fadhgridh#4	GUILD_FLAG
 
 // Guild Flags (Inside Castle)
 //============================================================
--	script	Fadhgridh#5::InsideFlagsPR3	722,{
+-	script	Fadhgridh#5::InsideFlagsPR3	GUILD_FLAG,{
 	end;
 
 OnRecvCastlePt03:
-	FlagEmblem GetCastleData("prtg_cas03",1);
+	flagemblem getcastledata("prtg_cas03",1);
 	end;
 }
 
-prtg_cas03,168,28,4	duplicate(InsideFlagsPR3)	Fadhgridh#5-2	722
-prtg_cas03,182,28,4	duplicate(InsideFlagsPR3)	Fadhgridh#6	722
-prtg_cas03,43,50,4	duplicate(InsideFlagsPR3)	Fadhgridh#7	722
-prtg_cas03,48,50,4	duplicate(InsideFlagsPR3)	Fadhgridh#8	722
-prtg_cas03,43,58,4	duplicate(InsideFlagsPR3)	Fadhgridh#9	722
-prtg_cas03,48,58,4	duplicate(InsideFlagsPR3)	Fadhgridh#10	722
-prtg_cas03,158,210,4	duplicate(InsideFlagsPR3)	Fadhgridh#11	722
-prtg_cas03,169,210,4	duplicate(InsideFlagsPR3)	Fadhgridh#12	722
-prtg_cas03,162,201,4	duplicate(InsideFlagsPR3)	Fadhgridh#13	722
-prtg_cas03,165,201,4	duplicate(InsideFlagsPR3)	Fadhgridh#14	722
+prtg_cas03,168,28,4	duplicate(InsideFlagsPR3)	Fadhgridh#5-2	GUILD_FLAG
+prtg_cas03,182,28,4	duplicate(InsideFlagsPR3)	Fadhgridh#6	GUILD_FLAG
+prtg_cas03,43,50,4	duplicate(InsideFlagsPR3)	Fadhgridh#7	GUILD_FLAG
+prtg_cas03,48,50,4	duplicate(InsideFlagsPR3)	Fadhgridh#8	GUILD_FLAG
+prtg_cas03,43,58,4	duplicate(InsideFlagsPR3)	Fadhgridh#9	GUILD_FLAG
+prtg_cas03,48,58,4	duplicate(InsideFlagsPR3)	Fadhgridh#10	GUILD_FLAG
+prtg_cas03,158,210,4	duplicate(InsideFlagsPR3)	Fadhgridh#11	GUILD_FLAG
+prtg_cas03,169,210,4	duplicate(InsideFlagsPR3)	Fadhgridh#12	GUILD_FLAG
+prtg_cas03,162,201,4	duplicate(InsideFlagsPR3)	Fadhgridh#13	GUILD_FLAG
+prtg_cas03,165,201,4	duplicate(InsideFlagsPR3)	Fadhgridh#14	GUILD_FLAG
 
 // Guild Flag (Town)
 //============================================================
-prontera,143,203,2	duplicate(InsideFlagsPR3)	Fadhgridh#15	722
+prontera,143,203,2	duplicate(InsideFlagsPR3)	Fadhgridh#15	GUILD_FLAG
 
 // Kafra Employee
 //============================================================
-prtg_cas03,181,215,4	duplicate(guildkafra)	Kafra Staff#prtg_cas03	117
+prtg_cas03,181,215,4	duplicate(guildkafra)	Kafra Staff#prtg_cas03	4_F_KAFRA1
 
 // Steward
 //============================================================
-prtg_cas03,51,100,4	duplicate(cm)	Sttick#prtg_cas03	55
+prtg_cas03,51,100,4	duplicate(cm)	Sttick#prtg_cas03	1_M_JOBTESTER
 
 // Treasure Room Exit
 //============================================================
-prtg_cas03,193,130,0	script	#Lever_PR03	111,{
+prtg_cas03,193,130,0	script	#Lever_PR03	HIDDEN_NPC,{
 
 	mes " ";
 	mes "There's a small lever. Will you pull it?";
@@ -121,7 +121,7 @@ prtg_cas03,193,130,0	script	#Lever_PR03	111,{
 
 // Guild Dungeon Switch
 //============================================================
-prtg_cas03,5,70,0	duplicate(gdlever)	#prtg_cas03	111
+prtg_cas03,5,70,0	duplicate(gdlever)	#prtg_cas03	HIDDEN_NPC
 
 // Guild Treasure Spawns
 //============================================================
diff --git a/npc/guild/prtg_cas04.txt b/npc/guild/prtg_cas04.txt
index d6bb7c15c..08f1522db 100644
--- a/npc/guild/prtg_cas04.txt
+++ b/npc/guild/prtg_cas04.txt
@@ -16,9 +16,9 @@
 
 // Guild Flags (Outside Castle)
 //============================================================
--	script	Skoegul#1::OutsideFlagsPR4	722,{
+-	script	Skoegul#1::OutsideFlagsPR4	GUILD_FLAG,{
 
-	set .@GID, GetCastleData("prtg_cas04",1);
+	set .@GID, getcastledata("prtg_cas04",1);
 
 	if (.@GID == 0) {
 		mes "[ Edict of the Divine Rune-Midgarts Kingdom ]";
@@ -41,7 +41,7 @@
 		next;
 		if(select("Return to the guild castle.:Quit.") == 1) {
 			close2;
-			if (getcharid(2) == GetCastleData("prtg_cas04",1)) {
+			if (getcharid(2) == getcastledata("prtg_cas04",1)) {
 					warp "prtg_cas04",258,247;
 				end;
 			}
@@ -53,60 +53,60 @@
 	mes " ";
 	mes "1. Follow the ordinance of The Divine Rune-Midgarts Kingdom, ";
 	mes "we approve that this place is in";
-	mes "the private prossession of ^ff0000"+GetGuildName(.@GID)+"^000000 Guild.";
+	mes "the private prossession 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.";
 	close;
 
 OnRecvCastlePt04:
-	FlagEmblem GetCastleData("prtg_cas04",1);
+	flagemblem getcastledata("prtg_cas04",1);
 	end;
 }
 
-prt_gld,120,243,6	duplicate(OutsideFlagsPR4)	Skoegul#1-2	722
-prt_gld,120,236,6	duplicate(OutsideFlagsPR4)	Skoegul#2	722
-prt_gld,122,243,6	duplicate(OutsideFlagsPR4)	Skoegul#3	722
-prt_gld,122,236,6	duplicate(OutsideFlagsPR4)	Skoegul#4	722
+prt_gld,120,243,6	duplicate(OutsideFlagsPR4)	Skoegul#1-2	GUILD_FLAG
+prt_gld,120,236,6	duplicate(OutsideFlagsPR4)	Skoegul#2	GUILD_FLAG
+prt_gld,122,243,6	duplicate(OutsideFlagsPR4)	Skoegul#3	GUILD_FLAG
+prt_gld,122,236,6	duplicate(OutsideFlagsPR4)	Skoegul#4	GUILD_FLAG
 
 // Guild Flags (Inside Castle)
 //============================================================
--	script	Skoegul#5::InsideFlagsPR4	722,{
+-	script	Skoegul#5::InsideFlagsPR4	GUILD_FLAG,{
 	end;
 
 OnRecvCastlePt04:
-	FlagEmblem GetCastleData("prtg_cas04",1);
+	flagemblem getcastledata("prtg_cas04",1);
 	end;
 }
 
-prtg_cas04,82,29,4	duplicate(InsideFlagsPR4)	Skoegul#5-2	722
-prtg_cas04,75,29,4	duplicate(InsideFlagsPR4)	Skoegul#6	722
-prtg_cas04,75,27,4	duplicate(InsideFlagsPR4)	Skoegul#7	722
-prtg_cas04,82,27,4	duplicate(InsideFlagsPR4)	Skoegul#8	722
-prtg_cas04,59,29,4	duplicate(InsideFlagsPR4)	Skoegul#9	722
-prtg_cas04,67,29,4	duplicate(InsideFlagsPR4)	Skoegul#10	722
-prtg_cas04,258,25,4	duplicate(InsideFlagsPR4)	Skoegul#11	722
-prtg_cas04,258,20,4	duplicate(InsideFlagsPR4)	Skoegul#12	722
-prtg_cas04,263,20,4	duplicate(InsideFlagsPR4)	Skoegul#13	722
-prtg_cas04,263,27,4	duplicate(InsideFlagsPR4)	Skoegul#14	722
+prtg_cas04,82,29,4	duplicate(InsideFlagsPR4)	Skoegul#5-2	GUILD_FLAG
+prtg_cas04,75,29,4	duplicate(InsideFlagsPR4)	Skoegul#6	GUILD_FLAG
+prtg_cas04,75,27,4	duplicate(InsideFlagsPR4)	Skoegul#7	GUILD_FLAG
+prtg_cas04,82,27,4	duplicate(InsideFlagsPR4)	Skoegul#8	GUILD_FLAG
+prtg_cas04,59,29,4	duplicate(InsideFlagsPR4)	Skoegul#9	GUILD_FLAG
+prtg_cas04,67,29,4	duplicate(InsideFlagsPR4)	Skoegul#10	GUILD_FLAG
+prtg_cas04,258,25,4	duplicate(InsideFlagsPR4)	Skoegul#11	GUILD_FLAG
+prtg_cas04,258,20,4	duplicate(InsideFlagsPR4)	Skoegul#12	GUILD_FLAG
+prtg_cas04,263,20,4	duplicate(InsideFlagsPR4)	Skoegul#13	GUILD_FLAG
+prtg_cas04,263,27,4	duplicate(InsideFlagsPR4)	Skoegul#14	GUILD_FLAG
 
 // Guild Flag (Town)
 //============================================================
-prontera,167,203,6	duplicate(InsideFlagsPR4)	Skoegul#15	722
+prontera,167,203,6	duplicate(InsideFlagsPR4)	Skoegul#15	GUILD_FLAG
 
 // Kafra Employee
 //============================================================
-prtg_cas04,258,247,4	duplicate(guildkafra)	Kafra Staff#prtg_cas04	117
+prtg_cas04,258,247,4	duplicate(guildkafra)	Kafra Staff#prtg_cas04	4_F_KAFRA1
 
 // Steward
 //============================================================
-prtg_cas04,259,265,4	duplicate(cm)	Van Dreth#prtg_cas04	55
+prtg_cas04,259,265,4	duplicate(cm)	Van Dreth#prtg_cas04	1_M_JOBTESTER
 
 // Treasure Room Exit
 //============================================================
-prtg_cas04,275,160,0	script	#Lever_PR04	111,{
+prtg_cas04,275,160,0	script	#Lever_PR04	HIDDEN_NPC,{
 
 	mes " ";
 	mes "There's a small lever. Will you pull it?";
@@ -121,7 +121,7 @@ prtg_cas04,275,160,0	script	#Lever_PR04	111,{
 
 // Guild Dungeon Switch
 //============================================================
-prtg_cas04,56,283,0	duplicate(gdlever)	#prtg_cas04	111
+prtg_cas04,56,283,0	duplicate(gdlever)	#prtg_cas04	HIDDEN_NPC
 
 // Guild Treasure Spawns
 //============================================================
diff --git a/npc/guild/prtg_cas05.txt b/npc/guild/prtg_cas05.txt
index 40c485f95..69ac3eb32 100644
--- a/npc/guild/prtg_cas05.txt
+++ b/npc/guild/prtg_cas05.txt
@@ -16,9 +16,9 @@
 
 // Guild Flags (Outside Castle)
 //============================================================
--	script	Gondul#1::OutsideFlagsPR5	722,{
+-	script	Gondul#1::OutsideFlagsPR5	GUILD_FLAG,{
 
-	set .@GID, GetCastleData("prtg_cas05",1);
+	set .@GID, getcastledata("prtg_cas05",1);
 
 	if (.@GID == 0) {
 		mes "[ Edict of the Divine Rune-Midgarts Kingdom ]";
@@ -41,7 +41,7 @@
 		next;
 		if(select("Return to the guild castle.:Quit.") == 1) {
 			close2;
-			if (getcharid(2) == GetCastleData("prtg_cas05",1)) {
+			if (getcharid(2) == getcastledata("prtg_cas05",1)) {
 				warp "prtg_cas05",52,41;
 				end;
 			}
@@ -53,58 +53,58 @@
 	mes " ";
 	mes "1. Follow the ordinance of The Divine Rune-Midgarts Kingdom, ";
 	mes "we approve that this place is in";
-	mes "the private prossession of ^ff0000"+GetGuildName(.@GID)+"^000000 Guild.";
+	mes "the private prossession 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.";
 	close;
 
 OnRecvCastlePt05:
-	FlagEmblem GetCastleData("prtg_cas05",1);
+	flagemblem getcastledata("prtg_cas05",1);
 	end;
 }
 
-prt_gld,199,243,2	duplicate(OutsideFlagsPR5)	Gondul#1-2	722
-prt_gld,199,236,2	duplicate(OutsideFlagsPR5)	Gondul#2	722
-prt_gld,197,243,2	duplicate(OutsideFlagsPR5)	Gondul#3	722
-prt_gld,197,236,2	duplicate(OutsideFlagsPR5)	Gondul#4	722
+prt_gld,199,243,2	duplicate(OutsideFlagsPR5)	Gondul#1-2	GUILD_FLAG
+prt_gld,199,236,2	duplicate(OutsideFlagsPR5)	Gondul#2	GUILD_FLAG
+prt_gld,197,243,2	duplicate(OutsideFlagsPR5)	Gondul#3	GUILD_FLAG
+prt_gld,197,236,2	duplicate(OutsideFlagsPR5)	Gondul#4	GUILD_FLAG
 
 // Guild Flags (Inside Castle)
 //============================================================
--	script	Gondul#5::InsideFlagsPR5	722,{
+-	script	Gondul#5::InsideFlagsPR5	GUILD_FLAG,{
 	end;
 
 OnRecvCastlePt05:
-	FlagEmblem GetCastleData("prtg_cas05",1);
+	flagemblem getcastledata("prtg_cas05",1);
 	end;
 }
 
-prtg_cas05,19,247,4	duplicate(InsideFlagsPR5)	Gondul#5-2	722
-prtg_cas05,19,243,4	duplicate(InsideFlagsPR5)	Gondul#6	722
-prtg_cas05,26,247,4	duplicate(InsideFlagsPR5)	Gondul#7	722
-prtg_cas05,26,243,4	duplicate(InsideFlagsPR5)	Gondul#8	722
-prtg_cas05,249,289,4	duplicate(InsideFlagsPR5)	Gondul#9	722
-prtg_cas05,256,289,4	duplicate(InsideFlagsPR5)	Gondul#10	722
-prtg_cas05,253,271,4	duplicate(InsideFlagsPR5)	Gondul#11	722
-prtg_cas05,273,257,4	duplicate(InsideFlagsPR5)	Gondul#12	722
+prtg_cas05,19,247,4	duplicate(InsideFlagsPR5)	Gondul#5-2	GUILD_FLAG
+prtg_cas05,19,243,4	duplicate(InsideFlagsPR5)	Gondul#6	GUILD_FLAG
+prtg_cas05,26,247,4	duplicate(InsideFlagsPR5)	Gondul#7	GUILD_FLAG
+prtg_cas05,26,243,4	duplicate(InsideFlagsPR5)	Gondul#8	GUILD_FLAG
+prtg_cas05,249,289,4	duplicate(InsideFlagsPR5)	Gondul#9	GUILD_FLAG
+prtg_cas05,256,289,4	duplicate(InsideFlagsPR5)	Gondul#10	GUILD_FLAG
+prtg_cas05,253,271,4	duplicate(InsideFlagsPR5)	Gondul#11	GUILD_FLAG
+prtg_cas05,273,257,4	duplicate(InsideFlagsPR5)	Gondul#12	GUILD_FLAG
 
 // Guild Flag (Town)
 //============================================================
-prontera,165,194,5	duplicate(InsideFlagsPR5)	Gondul#13	722
+prontera,165,194,5	duplicate(InsideFlagsPR5)	Gondul#13	GUILD_FLAG
 
 // Kafra Employee
 //============================================================
-prtg_cas05,52,41,4	duplicate(guildkafra)	Kafra Staff#prtg_cas05	117
+prtg_cas05,52,41,4	duplicate(guildkafra)	Kafra Staff#prtg_cas05	4_F_KAFRA1
 
 // Steward
 //============================================================
-prtg_cas05,36,37,4	duplicate(cm)	Raynor#prtg_cas05	55
+prtg_cas05,36,37,4	duplicate(cm)	Raynor#prtg_cas05	1_M_JOBTESTER
 
 // Treasure Room Exit
 //============================================================
-prtg_cas05,281,176,0	script	#Lever_PR05	111,{
+prtg_cas05,281,176,0	script	#Lever_PR05	HIDDEN_NPC,{
 
 	mes " ";
 	mes "There's a small lever. Will you pull it?";
@@ -119,7 +119,7 @@ prtg_cas05,281,176,0	script	#Lever_PR05	111,{
 
 // Guild Dungeon Switch
 //============================================================
-prtg_cas05,212,95,0	duplicate(gdlever)	#prtg_cas05	111
+prtg_cas05,212,95,0	duplicate(gdlever)	#prtg_cas05	HIDDEN_NPC
 
 // Guild Treasure Spawns
 //============================================================
diff --git a/npc/guild/trs_rp.txt b/npc/guild/trs_rp.txt
index 7b3ae5545..260aa6162 100644
--- a/npc/guild/trs_rp.txt
+++ b/npc/guild/trs_rp.txt
@@ -1,16 +1,16 @@
 //===== Hercules Script ======================================
 //= Treasure Room Protection
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Masao
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.1
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= Warps every Player out of the Treasure Room except for the
 //= Guildleader.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 Converted from the official script.
 //= 1.1 Reverted back and optimized. [Daegaladh]
-//============================================================ 
+//============================================================
 
 -	script	Gld_Trea_Protect::Gld_Trea_Protect	-1,{
 
@@ -52,4 +52,4 @@ gefg_cas01,154,112,0	duplicate(Gld_Trea_Protect)	ban_warp#gefg_cas01	-1,6,6
 gefg_cas02,140,116,0	duplicate(Gld_Trea_Protect)	ban_warp#gefg_cas02	-1,6,6
 gefg_cas03,271,290,0	duplicate(Gld_Trea_Protect)	ban_warp#gefg_cas03	-1,6,6
 gefg_cas04,116,119,0	duplicate(Gld_Trea_Protect)	ban_warp#gefg_cas04	-1,6,6
-gefg_cas05,144,110,0	duplicate(Gld_Trea_Protect)	ban_warp#gefg_cas05	-1,6,6
\ No newline at end of file
+gefg_cas05,144,110,0	duplicate(Gld_Trea_Protect)	ban_warp#gefg_cas05	-1,6,6