Added ability to use constants instead of sprite IDs for NPCs. Converted all npcs to use this.

4 files changed, 242 insertions, 242 deletions

diff --git a/npc/instances/EndlessTower.txt b/npc/instances/EndlessTower.txt
index 80015ffc8..7d1bee6aa 100644
--- a/npc/instances/EndlessTower.txt
+++ b/npc/instances/EndlessTower.txt
@@ -43,7 +43,7 @@
 5@tower	mapflag	src4instance
 6@tower	mapflag	src4instance
 //============================================================
-alberta,214,77,6	script	Captain Janssen	709,{
+alberta,214,77,6	script	Captain Janssen	4_M_SEAMAN,{
 	if (checkweight(1201,1) == 0) {
 		mes "^008800Wait here!!";
 		mes "You're carrying too much stuff. Why don't you put some of it away, and then come back.^000000";
@@ -207,7 +207,7 @@ alberta,214,77,6	script	Captain Janssen	709,{
 	}
 }
 
-e_tower,81,105,0	script	Tower Protection Stone	406,{
+e_tower,81,105,0	script	Tower Protection Stone	2_MONEMUS,{
 
 	set .@party_id,getcharid(1);
 	set .@p_name$,getpartyname(.@party_id);
@@ -326,7 +326,7 @@ L_Enter:
 	}
 }
 
-e_tower,30,30,2	script	Huge Vortex	844,2,2,{
+e_tower,30,30,2	script	Huge Vortex	CLEAR_NPC,2,2,{
 	end;
 OnTouch:
 	mapannounce "e_tower","[ " + strcharinfo(0) + " ], seems to be engulfed by a huge vortex",bc_map,"0x00ff99",FW_NORMAL,12;
@@ -335,7 +335,7 @@ OnTouch:
 }
 
 // Original name: "#102Administrator Mode104"
-e_tower,1,1,2	script	#102Administrator Mode	844,{
+e_tower,1,1,2	script	#102Administrator Mode	CLEAR_NPC,{
 	callfunc "F_GM_NPC";
 	mes "Please enter the password";
 	set .@i, callfunc("F_GM_NPC","dmc2008",1);
@@ -361,7 +361,7 @@ e_tower,1,1,2	script	#102Administrator Mode	844,{
 	}
 }
 
-e_tower,69,117,4	script	Purification Stone#et1	406,{
+e_tower,69,117,4	script	Purification Stone#et1	2_MONEMUS,{
 	set etower_timer,0;
 	mes "^0000ffThe records and aftereffects related to the Endless Tower have been removed. You can generate and enter the Endless Tower again.^000000";
 	close;
@@ -392,7 +392,7 @@ OnTimer1800000:
 	end;
 }
 
-e_tower,151,185,4	script	Purification Stone#et2	844,{
+e_tower,151,185,4	script	Purification Stone#et2	CLEAR_NPC,{
 	callfunc "F_GM_NPC";
 	set etower_timer,0;
 	mes "^0000ffThe records and aftereffects related to the Endless Tower have been removed. You can generate and enter the Endless Tower again.^000000";
@@ -1196,7 +1196,7 @@ function	script	F_Tower_Warp	{
 
 // Levels 1-25
 //============================================================
-1@tower,50,360,0	script	Immortal Brazier#	844,{
+1@tower,50,360,0	script	Immortal Brazier#	CLEAR_NPC,{
 	mes "- A Message is Engraved on the Brazier -";
 	mes "The one who scatters the ashes of the darkness in this place shall become one step closer to Nacht Sieger, the Hegemon King of the Darkness...";
 	next;
@@ -1225,7 +1225,7 @@ OnTimer10000:
 	end;
 }
 
-1@tower,29,365,1	script	#1F Controller	844,{
+1@tower,29,365,1	script	#1F Controller	CLEAR_NPC,{
 	end;
 
 OnInstanceInit:
@@ -1299,29 +1299,29 @@ L_Display:
 	else if (.@mod == 3 && getarg(0) != 13) return getarg(0)+"rd";
 	else return getarg(0)+"th";
 }
-1@tower,96,393,0	duplicate(1FGate102tower)	2FGate102tower	45,2,2
-1@tower,184,393,0	duplicate(1FGate102tower)	3FGate102tower	45,2,2
-1@tower,270,393,0	duplicate(1FGate102tower)	4FGate102tower	45,2,2
-1@tower,355,393,0	duplicate(1FGate102tower)	5FGate102tower	45,2,2
-1@tower,12,309,0	duplicate(1FGate102tower)	6FGate102tower	45,2,2
-1@tower,96,309,0	duplicate(1FGate102tower)	7FGate102tower	45,2,2
-1@tower,184,309,0	duplicate(1FGate102tower)	8FGate102tower	45,2,2
-1@tower,270,309,0	duplicate(1FGate102tower)	9FGate102tower	45,2,2
-1@tower,355,309,0	duplicate(1FGate102tower)	10FGate102tower	45,2,2
-1@tower,12,222,0	duplicate(1FGate102tower)	11FGate102tower	45,2,2
-1@tower,96,222,0	duplicate(1FGate102tower)	12FGate102tower	45,2,2
-1@tower,184,222,0	duplicate(1FGate102tower)	13FGate102tower	45,2,2
-1@tower,270,222,0	duplicate(1FGate102tower)	14FGate102tower	45,2,2
-1@tower,355,222,0	duplicate(1FGate102tower)	15FGate102tower	45,2,2
-1@tower,12,138,0	duplicate(1FGate102tower)	16FGate102tower	45,2,2
-1@tower,96,138,0	duplicate(1FGate102tower)	17FGate102tower	45,2,2
-1@tower,184,138,0	duplicate(1FGate102tower)	18FGate102tower	45,2,2
-1@tower,270,138,0	duplicate(1FGate102tower)	19FGate102tower	45,2,2
-1@tower,355,138,0	duplicate(1FGate102tower)	20FGate102tower	45,2,2
-1@tower,12,51,0	duplicate(1FGate102tower)	21FGate102tower	45,2,2
-1@tower,96,51,0	duplicate(1FGate102tower)	22FGate102tower	45,2,2
-1@tower,184,51,0	duplicate(1FGate102tower)	23FGate102tower	45,2,2
-1@tower,270,51,0	duplicate(1FGate102tower)	24FGate102tower	45,2,2
+1@tower,96,393,0	duplicate(1FGate102tower)	2FGate102tower	WARPNPC,2,2
+1@tower,184,393,0	duplicate(1FGate102tower)	3FGate102tower	WARPNPC,2,2
+1@tower,270,393,0	duplicate(1FGate102tower)	4FGate102tower	WARPNPC,2,2
+1@tower,355,393,0	duplicate(1FGate102tower)	5FGate102tower	WARPNPC,2,2
+1@tower,12,309,0	duplicate(1FGate102tower)	6FGate102tower	WARPNPC,2,2
+1@tower,96,309,0	duplicate(1FGate102tower)	7FGate102tower	WARPNPC,2,2
+1@tower,184,309,0	duplicate(1FGate102tower)	8FGate102tower	WARPNPC,2,2
+1@tower,270,309,0	duplicate(1FGate102tower)	9FGate102tower	WARPNPC,2,2
+1@tower,355,309,0	duplicate(1FGate102tower)	10FGate102tower	WARPNPC,2,2
+1@tower,12,222,0	duplicate(1FGate102tower)	11FGate102tower	WARPNPC,2,2
+1@tower,96,222,0	duplicate(1FGate102tower)	12FGate102tower	WARPNPC,2,2
+1@tower,184,222,0	duplicate(1FGate102tower)	13FGate102tower	WARPNPC,2,2
+1@tower,270,222,0	duplicate(1FGate102tower)	14FGate102tower	WARPNPC,2,2
+1@tower,355,222,0	duplicate(1FGate102tower)	15FGate102tower	WARPNPC,2,2
+1@tower,12,138,0	duplicate(1FGate102tower)	16FGate102tower	WARPNPC,2,2
+1@tower,96,138,0	duplicate(1FGate102tower)	17FGate102tower	WARPNPC,2,2
+1@tower,184,138,0	duplicate(1FGate102tower)	18FGate102tower	WARPNPC,2,2
+1@tower,270,138,0	duplicate(1FGate102tower)	19FGate102tower	WARPNPC,2,2
+1@tower,355,138,0	duplicate(1FGate102tower)	20FGate102tower	WARPNPC,2,2
+1@tower,12,51,0	duplicate(1FGate102tower)	21FGate102tower	WARPNPC,2,2
+1@tower,96,51,0	duplicate(1FGate102tower)	22FGate102tower	WARPNPC,2,2
+1@tower,184,51,0	duplicate(1FGate102tower)	23FGate102tower	WARPNPC,2,2
+1@tower,270,51,0	duplicate(1FGate102tower)	24FGate102tower	WARPNPC,2,2
 
 1@tower,355,51,0	script	25FGate102tower	45,2,2,{
 	end;
@@ -1363,7 +1363,7 @@ OnTouch_:
 	end;
 }
 
-1@tower,71,4,0	script	#Broadcast Mode1	844,{
+1@tower,71,4,0	script	#Broadcast Mode1	CLEAR_NPC,{
 	end;
 
 OnInstanceInit:
@@ -1380,7 +1380,7 @@ OnTimer120000:
 	end;
 }
 
-1@tower,71,1,0	script	#Manager Mode1	844,{
+1@tower,71,1,0	script	#Manager Mode1	CLEAR_NPC,{
 	callfunc "F_GM_NPC";
 	mes "Please enter the password.";
 	set .@i, callfunc("F_GM_NPC","dmc2008",1);
@@ -1403,7 +1403,7 @@ OnTimer120000:
 
 // Levels 26-50
 //============================================================
-2@tower,29,365,2	script	Immortal Furnace#1	844,{
+2@tower,29,365,2	script	Immortal Furnace#1	CLEAR_NPC,{
 	end;
 
 OnInstanceInit:
@@ -1431,32 +1431,32 @@ OnTimer5000:
 	end;
 }
 
-2@tower,12,393,0	duplicate(1FGate102tower)	26FGate102tower	45,2,2
-2@tower,96,393,0	duplicate(1FGate102tower)	27FGate102tower	45,2,2
-2@tower,184,393,0	duplicate(1FGate102tower)	28FGate102tower	45,2,2
-2@tower,270,393,0	duplicate(1FGate102tower)	29FGate102tower	45,2,2
-2@tower,355,393,0	duplicate(1FGate102tower)	30FGate102tower	45,2,2
-2@tower,12,309,0	duplicate(1FGate102tower)	31FGate102tower	45,2,2
-2@tower,96,309,0	duplicate(1FGate102tower)	32FGate102tower	45,2,2
-2@tower,184,309,0	duplicate(1FGate102tower)	33FGate102tower	45,2,2
-2@tower,270,309,0	duplicate(1FGate102tower)	34FGate102tower	45,2,2
-2@tower,355,309,0	duplicate(1FGate102tower)	35FGate102tower	45,2,2
-2@tower,12,222,0	duplicate(1FGate102tower)	36FGate102tower	45,2,2
-2@tower,96,222,0	duplicate(1FGate102tower)	37FGate102tower	45,2,2
-2@tower,184,222,0	duplicate(1FGate102tower)	38FGate102tower	45,2,2
-2@tower,270,222,0	duplicate(1FGate102tower)	39FGate102tower	45,2,2
-2@tower,355,222,0	duplicate(1FGate102tower)	40FGate102tower	45,2,2
-2@tower,12,138,0	duplicate(1FGate102tower)	41FGate102tower	45,2,2
-2@tower,96,138,0	duplicate(1FGate102tower)	42FGate102tower	45,2,2
-2@tower,184,138,0	duplicate(1FGate102tower)	43FGate102tower	45,2,2
-2@tower,270,138,0	duplicate(1FGate102tower)	44FGate102tower	45,2,2
-2@tower,355,138,0	duplicate(1FGate102tower)	45FGate102tower	45,2,2
-2@tower,12,51,0	duplicate(1FGate102tower)	46FGate102tower	45,2,2
-2@tower,96,51,0	duplicate(1FGate102tower)	47FGate102tower	45,2,2
-2@tower,184,51,0	duplicate(1FGate102tower)	48FGate102tower	45,2,2
-2@tower,270,51,0	duplicate(1FGate102tower)	49FGate102tower	45,2,2
-
-2@tower,355,51,0	script	50FGate102tower	45,2,2,{
+2@tower,12,393,0	duplicate(1FGate102tower)	26FGate102tower	WARPNPC,2,2
+2@tower,96,393,0	duplicate(1FGate102tower)	27FGate102tower	WARPNPC,2,2
+2@tower,184,393,0	duplicate(1FGate102tower)	28FGate102tower	WARPNPC,2,2
+2@tower,270,393,0	duplicate(1FGate102tower)	29FGate102tower	WARPNPC,2,2
+2@tower,355,393,0	duplicate(1FGate102tower)	30FGate102tower	WARPNPC,2,2
+2@tower,12,309,0	duplicate(1FGate102tower)	31FGate102tower	WARPNPC,2,2
+2@tower,96,309,0	duplicate(1FGate102tower)	32FGate102tower	WARPNPC,2,2
+2@tower,184,309,0	duplicate(1FGate102tower)	33FGate102tower	WARPNPC,2,2
+2@tower,270,309,0	duplicate(1FGate102tower)	34FGate102tower	WARPNPC,2,2
+2@tower,355,309,0	duplicate(1FGate102tower)	35FGate102tower	WARPNPC,2,2
+2@tower,12,222,0	duplicate(1FGate102tower)	36FGate102tower	WARPNPC,2,2
+2@tower,96,222,0	duplicate(1FGate102tower)	37FGate102tower	WARPNPC,2,2
+2@tower,184,222,0	duplicate(1FGate102tower)	38FGate102tower	WARPNPC,2,2
+2@tower,270,222,0	duplicate(1FGate102tower)	39FGate102tower	WARPNPC,2,2
+2@tower,355,222,0	duplicate(1FGate102tower)	40FGate102tower	WARPNPC,2,2
+2@tower,12,138,0	duplicate(1FGate102tower)	41FGate102tower	WARPNPC,2,2
+2@tower,96,138,0	duplicate(1FGate102tower)	42FGate102tower	WARPNPC,2,2
+2@tower,184,138,0	duplicate(1FGate102tower)	43FGate102tower	WARPNPC,2,2
+2@tower,270,138,0	duplicate(1FGate102tower)	44FGate102tower	WARPNPC,2,2
+2@tower,355,138,0	duplicate(1FGate102tower)	WARPNPCFGate102tower	WARPNPC,2,2
+2@tower,12,51,0	duplicate(1FGate102tower)	46FGate102tower	WARPNPC,2,2
+2@tower,96,51,0	duplicate(1FGate102tower)	47FGate102tower	WARPNPC,2,2
+2@tower,184,51,0	duplicate(1FGate102tower)	48FGate102tower	WARPNPC,2,2
+2@tower,270,51,0	duplicate(1FGate102tower)	49FGate102tower	WARPNPC,2,2
+
+2@tower,355,51,0	script	50FGate102tower	WARPNPC,2,2,{
 	end;
 
 OnInstanceInit:
@@ -1480,7 +1480,7 @@ OnTimer120000:
 	end;
 }
 
-2@tower,355,51,0	script	50FGate102tower-2	45,2,2,{
+2@tower,355,51,0	script	50FGate102tower-2	WARPNPC,2,2,{
 	end;
 
 OnInstanceInit:
@@ -1496,7 +1496,7 @@ OnTouch_:
 	end;
 }
 
-2@tower,71,1,0	script	#Manager Mode2	844,{
+2@tower,71,1,0	script	#Manager Mode2	CLEAR_NPC,{
 	callfunc "F_GM_NPC";
 	mes "Please enter the password.";
 	set .@i, callfunc("F_GM_NPC","dmc2008",1);
@@ -1519,7 +1519,7 @@ OnTouch_:
 
 // Levels 51-75
 //============================================================
-3@tower,29,365,2	script	Immortal Furnace#2	844,{
+3@tower,29,365,2	script	Immortal Furnace#2	CLEAR_NPC,{
 	end;
 
 OnInstanceInit:
@@ -1547,32 +1547,32 @@ OnTimer5000:
 	end;
 }
 
-3@tower,12,393,0	duplicate(1FGate102tower)	51FGate102tower	45,2,2
-3@tower,96,393,0	duplicate(1FGate102tower)	52FGate102tower	45,2,2
-3@tower,184,393,0	duplicate(1FGate102tower)	53FGate102tower	45,2,2
-3@tower,270,393,0	duplicate(1FGate102tower)	54FGate102tower	45,2,2
-3@tower,355,393,0	duplicate(1FGate102tower)	55FGate102tower	45,2,2
-3@tower,12,309,0	duplicate(1FGate102tower)	56FGate102tower	45,2,2
-3@tower,96,309,0	duplicate(1FGate102tower)	57FGate102tower	45,2,2
-3@tower,184,309,0	duplicate(1FGate102tower)	58FGate102tower	45,2,2
-3@tower,270,309,0	duplicate(1FGate102tower)	59FGate102tower	45,2,2
-3@tower,355,309,0	duplicate(1FGate102tower)	60FGate102tower	45,2,2
-3@tower,12,222,0	duplicate(1FGate102tower)	61FGate102tower	45,2,2
-3@tower,96,222,0	duplicate(1FGate102tower)	62FGate102tower	45,2,2
-3@tower,184,222,0	duplicate(1FGate102tower)	63FGate102tower	45,2,2
-3@tower,270,222,0	duplicate(1FGate102tower)	64FGate102tower	45,2,2
-3@tower,355,222,0	duplicate(1FGate102tower)	65FGate102tower	45,2,2
-3@tower,12,138,0	duplicate(1FGate102tower)	66FGate102tower	45,2,2
-3@tower,96,138,0	duplicate(1FGate102tower)	67FGate102tower	45,2,2
-3@tower,184,138,0	duplicate(1FGate102tower)	68FGate102tower	45,2,2
-3@tower,270,138,0	duplicate(1FGate102tower)	69FGate102tower	45,2,2
-3@tower,355,138,0	duplicate(1FGate102tower)	70FGate102tower	45,2,2
-3@tower,12,51,0	duplicate(1FGate102tower)	71FGate102tower	45,2,2
-3@tower,96,51,0	duplicate(1FGate102tower)	72FGate102tower	45,2,2
-3@tower,184,51,0	duplicate(1FGate102tower)	73FGate102tower	45,2,2
-3@tower,270,51,0	duplicate(1FGate102tower)	74FGate102tower	45,2,2
-
-3@tower,355,51,0	script	75FGate102tower	45,1,1,{
+3@tower,12,393,0	duplicate(1FGate102tower)	51FGate102tower	WARPNPC,2,2
+3@tower,96,393,0	duplicate(1FGate102tower)	52FGate102tower	WARPNPC,2,2
+3@tower,184,393,0	duplicate(1FGate102tower)	53FGate102tower	WARPNPC,2,2
+3@tower,270,393,0	duplicate(1FGate102tower)	54FGate102tower	WARPNPC,2,2
+3@tower,355,393,0	duplicate(1FGate102tower)	55FGate102tower	WARPNPC,2,2
+3@tower,12,309,0	duplicate(1FGate102tower)	56FGate102tower	WARPNPC,2,2
+3@tower,96,309,0	duplicate(1FGate102tower)	57FGate102tower	WARPNPC,2,2
+3@tower,184,309,0	duplicate(1FGate102tower)	58FGate102tower	WARPNPC,2,2
+3@tower,270,309,0	duplicate(1FGate102tower)	59FGate102tower	WARPNPC,2,2
+3@tower,355,309,0	duplicate(1FGate102tower)	60FGate102tower	WARPNPC,2,2
+3@tower,12,222,0	duplicate(1FGate102tower)	61FGate102tower	WARPNPC,2,2
+3@tower,96,222,0	duplicate(1FGate102tower)	62FGate102tower	WARPNPC,2,2
+3@tower,184,222,0	duplicate(1FGate102tower)	63FGate102tower	WARPNPC,2,2
+3@tower,270,222,0	duplicate(1FGate102tower)	64FGate102tower	WARPNPC,2,2
+3@tower,355,222,0	duplicate(1FGate102tower)	65FGate102tower	WARPNPC,2,2
+3@tower,12,138,0	duplicate(1FGate102tower)	66FGate102tower	WARPNPC,2,2
+3@tower,96,138,0	duplicate(1FGate102tower)	67FGate102tower	WARPNPC,2,2
+3@tower,184,138,0	duplicate(1FGate102tower)	68FGate102tower	WARPNPC,2,2
+3@tower,270,138,0	duplicate(1FGate102tower)	69FGate102tower	WARPNPC,2,2
+3@tower,355,138,0	duplicate(1FGate102tower)	70FGate102tower	WARPNPC,2,2
+3@tower,12,51,0	duplicate(1FGate102tower)	71FGate102tower	WARPNPC,2,2
+3@tower,96,51,0	duplicate(1FGate102tower)	72FGate102tower	WARPNPC,2,2
+3@tower,184,51,0	duplicate(1FGate102tower)	73FGate102tower	WARPNPC,2,2
+3@tower,270,51,0	duplicate(1FGate102tower)	74FGate102tower	WARPNPC,2,2
+
+3@tower,355,51,0	script	75FGate102tower	WARPNPC,1,1,{
 	end;
 
 OnInstanceInit:
@@ -1596,7 +1596,7 @@ OnTimer120000:
 	end;
 }
 
-3@tower,355,51,0	script	75FGate102tower-2	45,2,2,{
+3@tower,355,51,0	script	75FGate102tower-2	WARPNPC,2,2,{
 	end;
 
 OnInstanceInit:
@@ -1612,7 +1612,7 @@ OnTouch_:
 	end;
 }
 
-3@tower,71,1,0	script	#Manager Mode3	844,{
+3@tower,71,1,0	script	#Manager Mode3	CLEAR_NPC,{
 	callfunc "F_GM_NPC";
 	mes "Please enter the password.";
 	set .@i, callfunc("F_GM_NPC","dmc2008",1);
@@ -1635,7 +1635,7 @@ OnTouch_:
 
 // Levels 76-99
 //============================================================
-4@tower,29,365,2	script	Immortal Furnace#3	844,{
+4@tower,29,365,2	script	Immortal Furnace#3	CLEAR_NPC,{
 	end;
 
 OnInstanceInit:
@@ -1663,31 +1663,31 @@ OnTimer5000:
 	end;
 }
 
-4@tower,12,393,0	duplicate(1FGate102tower)	76FGate102tower	45,2,2
-4@tower,96,393,0	duplicate(1FGate102tower)	77FGate102tower	45,2,2
-4@tower,184,393,0	duplicate(1FGate102tower)	78FGate102tower	45,2,2
-4@tower,270,393,0	duplicate(1FGate102tower)	79FGate102tower	45,2,2
-4@tower,355,393,0	duplicate(1FGate102tower)	80FGate102tower	45,2,2
-4@tower,12,309,0	duplicate(1FGate102tower)	81FGate102tower	45,2,2
-4@tower,96,309,0	duplicate(1FGate102tower)	82FGate102tower	45,2,2
-4@tower,184,309,0	duplicate(1FGate102tower)	83FGate102tower	45,2,2
-4@tower,270,309,0	duplicate(1FGate102tower)	84FGate102tower	45,2,2
-4@tower,355,309,0	duplicate(1FGate102tower)	85FGate102tower	45,2,2
-4@tower,12,222,0	duplicate(1FGate102tower)	86FGate102tower	45,2,2
-4@tower,96,222,0	duplicate(1FGate102tower)	87FGate102tower	45,2,2
-4@tower,184,222,0	duplicate(1FGate102tower)	88FGate102tower	45,2,2
-4@tower,270,222,0	duplicate(1FGate102tower)	89FGate102tower	45,2,2
-4@tower,355,222,0	duplicate(1FGate102tower)	90FGate102tower	45,2,2
-4@tower,12,138,0	duplicate(1FGate102tower)	91FGate102tower	45,2,2
-4@tower,96,138,0	duplicate(1FGate102tower)	92FGate102tower	45,2,2
-4@tower,184,138,0	duplicate(1FGate102tower)	93FGate102tower	45,2,2
-4@tower,270,138,0	duplicate(1FGate102tower)	94FGate102tower	45,2,2
-4@tower,355,138,0	duplicate(1FGate102tower)	95FGate102tower	45,2,2
-4@tower,12,51,0	duplicate(1FGate102tower)	96FGate102tower	45,2,2
-4@tower,96,51,0	duplicate(1FGate102tower)	97FGate102tower	45,2,2
-4@tower,184,51,0	duplicate(1FGate102tower)	98FGate102tower	45,2,2
-
-4@tower,271,51,0	script	99FGate102tower	45,2,2,{
+4@tower,12,393,0	duplicate(1FGate102tower)	76FGate102tower	WARPNPC,2,2
+4@tower,96,393,0	duplicate(1FGate102tower)	77FGate102tower	WARPNPC,2,2
+4@tower,184,393,0	duplicate(1FGate102tower)	78FGate102tower	WARPNPC,2,2
+4@tower,270,393,0	duplicate(1FGate102tower)	79FGate102tower	WARPNPC,2,2
+4@tower,355,393,0	duplicate(1FGate102tower)	80FGate102tower	WARPNPC,2,2
+4@tower,12,309,0	duplicate(1FGate102tower)	81FGate102tower	WARPNPC,2,2
+4@tower,96,309,0	duplicate(1FGate102tower)	82FGate102tower	WARPNPC,2,2
+4@tower,184,309,0	duplicate(1FGate102tower)	83FGate102tower	WARPNPC,2,2
+4@tower,270,309,0	duplicate(1FGate102tower)	84FGate102tower	WARPNPC,2,2
+4@tower,355,309,0	duplicate(1FGate102tower)	85FGate102tower	WARPNPC,2,2
+4@tower,12,222,0	duplicate(1FGate102tower)	86FGate102tower	WARPNPC,2,2
+4@tower,96,222,0	duplicate(1FGate102tower)	87FGate102tower	WARPNPC,2,2
+4@tower,184,222,0	duplicate(1FGate102tower)	88FGate102tower	WARPNPC,2,2
+4@tower,270,222,0	duplicate(1FGate102tower)	89FGate102tower	WARPNPC,2,2
+4@tower,355,222,0	duplicate(1FGate102tower)	90FGate102tower	WARPNPC,2,2
+4@tower,12,138,0	duplicate(1FGate102tower)	91FGate102tower	WARPNPC,2,2
+4@tower,96,138,0	duplicate(1FGate102tower)	92FGate102tower	WARPNPC,2,2
+4@tower,184,138,0	duplicate(1FGate102tower)	93FGate102tower	WARPNPC,2,2
+4@tower,270,138,0	duplicate(1FGate102tower)	94FGate102tower	WARPNPC,2,2
+4@tower,355,138,0	duplicate(1FGate102tower)	95FGate102tower	WARPNPC,2,2
+4@tower,12,51,0	duplicate(1FGate102tower)	96FGate102tower	WARPNPC,2,2
+4@tower,96,51,0	duplicate(1FGate102tower)	97FGate102tower	WARPNPC,2,2
+4@tower,184,51,0	duplicate(1FGate102tower)	98FGate102tower	WARPNPC,2,2
+
+4@tower,271,51,0	script	99FGate102tower	WARPNPC,2,2,{
 	end;
 
 OnInstanceInit:
@@ -1711,7 +1711,7 @@ OnTimer120000:
 	end;
 }
 
-4@tower,271,51,0	script	99FGate102tower-2	45,2,2,{
+4@tower,271,51,0	script	99FGate102tower-2	WARPNPC,2,2,{
 	end;
 
 OnInstanceInit:
@@ -1727,7 +1727,7 @@ OnTouch_:
 	end;
 }
 
-4@tower,71,1,0	script	#Manager Mode4	844,{
+4@tower,71,1,0	script	#Manager Mode4	CLEAR_NPC,{
 	callfunc "F_GM_NPC";
 	mes "Please enter the password.";
 	set .@i, callfunc("F_GM_NPC","dmc2008",1);
@@ -1750,7 +1750,7 @@ OnTouch_:
 
 // Level 100
 //============================================================
-5@tower,106,109,2	script	Lucid Crystal#102	844,{
+5@tower,106,109,2	script	Lucid Crystal#102	CLEAR_NPC,{
 	if (in_102tower < 10) {
 		mes "^0000ffA mysterious voice echoes through the room as you touch the lucid crystal radiating a strong light.^000000";
 		next;
@@ -1802,7 +1802,7 @@ OnEnable:
 	end;
 }
 
-5@tower,106,109,2	script	#102Effect1	844,{
+5@tower,106,109,2	script	#102Effect1	CLEAR_NPC,{
 	end;
 
 OnInstanceInit:
@@ -1825,7 +1825,7 @@ OnTimer500:
 	end;
 }
 
-5@tower,106,109,2	script	#102Effect2	844,{
+5@tower,106,109,2	script	#102Effect2	CLEAR_NPC,{
 	end;
 
 OnInstanceInit:
@@ -1848,7 +1848,7 @@ OnTimer500:
 	end;
 }
 
-5@tower,82,112,2	script	#102FShadowDust1	844,{
+5@tower,82,112,2	script	#102FShadowDust1	CLEAR_NPC,{
 	end;
 
 OnInstanceInit:
@@ -1868,7 +1868,7 @@ OnMyMobDead:
 	end;
 }
 
-5@tower,82,113,2	script	#102FShadowDust	844,{
+5@tower,82,113,2	script	#102FShadowDust	CLEAR_NPC,{
 	end;
 
 OnInstanceInit:
@@ -1919,7 +1919,7 @@ OnEnable:
 	end;
 }
 
-5@tower,71,1,0	script	#Manager Mode5	844,{
+5@tower,71,1,0	script	#Manager Mode5	CLEAR_NPC,{
 	callfunc "F_GM_NPC";
 	mes "This NPC manages the crystal on the 100th Level. Please enter the password.";
 	set .@i, callfunc("F_GM_NPC","dmc2008",1);
@@ -1934,7 +1934,7 @@ OnEnable:
 
 // Level 101
 //============================================================
-6@tower,45,89,2	script	Life Spring#1	844,{
+6@tower,45,89,2	script	Life Spring#1	CLEAR_NPC,{
 	mes "^0066ffYou took a sip of the spring's clear water, and you feel invigorated.^000000";
 	heal (MaxHp-Hp),(MaxSp-Sp);
 	close;
@@ -1944,7 +1944,7 @@ OnInstanceInit:
 	end;
 }
 
-6@tower,45,89,2	script	Life Spring#2	844,{
+6@tower,45,89,2	script	Life Spring#2	CLEAR_NPC,{
 	end;
 
 OnEnable:
@@ -1958,7 +1958,7 @@ OnTimer2000:
 	end;
 }
 
-6@tower,45,89,2	script	Life Spring#3	844,{
+6@tower,45,89,2	script	Life Spring#3	CLEAR_NPC,{
 	end;
 
 OnEnable:
@@ -1974,7 +1974,7 @@ OnTimer2000:
 
 6@tower,32,100,0	warp	102FGate102tower	2,2,6@tower,155,64
 
-6@tower,156,151,2	script	Tyrant's Throne#	844,{
+6@tower,156,151,2	script	Tyrant's Throne#	CLEAR_NPC,{
 	end;
 
 OnInstanceInit:
@@ -1990,7 +1990,7 @@ OnMyMobDead:
 	end;
 }
 
-6@tower,156,151,2	script	#1st Beeper	844,{
+6@tower,156,151,2	script	#1st Beeper	CLEAR_NPC,{
 	end;
 
 OnEnable:
@@ -2033,7 +2033,7 @@ OnMyMobDead:
 	end;
 }
 
-6@tower,156,151,2	script	#2nd Beeper	844,{
+6@tower,156,151,2	script	#2nd Beeper	CLEAR_NPC,{
 	end;
 
 OnEnable:
@@ -2068,7 +2068,7 @@ OnMyMobDead:
 	end;
 }
 
-6@tower,156,151,2	script	#3rd Beeper	844,{
+6@tower,156,151,2	script	#3rd Beeper	CLEAR_NPC,{
 	end;
 
 OnEnable:
@@ -2103,7 +2103,7 @@ OnMyMobDead:
 	end;
 }
 
-6@tower,156,151,2	script	#4th Beeper	844,{
+6@tower,156,151,2	script	#4th Beeper	CLEAR_NPC,{
 	end;
 
 OnEnable:
@@ -2130,7 +2130,7 @@ OnMyMobDead:
 	end;
 }
 
-6@tower,169,127,2	script	Lost Soul#102	796,{
+6@tower,169,127,2	script	Lost Soul#102	4_M_NFDEADSWDMAN,{
 	if (checkweight(1201,1) == 0) {
 		mes "You're carrying too much stuff. Why don't you put some of it away, and then come back?";
 		close;
@@ -2210,7 +2210,7 @@ OnTimer10500:
 	end;
 }
 
-6@tower,169,127,2	script	#Effect30	844,{
+6@tower,169,127,2	script	#Effect30	CLEAR_NPC,{
 	end;
 
 OnInstanceInit:
@@ -2228,7 +2228,7 @@ OnTimer1000:
 	end;
 }
 
-6@tower,169,127,2	script	#Effect31	844,{
+6@tower,169,127,2	script	#Effect31	CLEAR_NPC,{
 	end;
 
 OnInstanceInit:
diff --git a/npc/instances/NydhoggsNest.txt b/npc/instances/NydhoggsNest.txt
index f17db1b7d..82e0b7a70 100644
--- a/npc/instances/NydhoggsNest.txt
+++ b/npc/instances/NydhoggsNest.txt
@@ -21,7 +21,7 @@
 1@nyd	mapflag	src4instance
 2@nyd	mapflag	src4instance
 //============================================================
-nyd_dun02,100,201,3	script	Yggdrasil Gatekeeper	111,8,8,{
+nyd_dun02,100,201,3	script	Yggdrasil Gatekeeper	HIDDEN_NPC,8,8,{
 	if (ins_nyd == 0) {
 		mes "A great stone gate stands before you. The sculpture of a terrible dragon spreads its powerful looking wings.";
 		next;
@@ -224,7 +224,7 @@ OnTouch_:
 	end;
 }
 
-mid_camp,271,299,3	script	Historian Magnifier#edq	755,3,3,{
+mid_camp,271,299,3	script	Historian Magnifier#edq	4_M_SAGE_C,3,3,{
 	mes "[Historian Magniffer]";
 	if (ins_nyd == 1) {
 		mes "Sure, the mainland also has lots of interesting adventures... Hello, I am Magnifier, a historian dispatched from the Prontera royal court.";
@@ -410,7 +410,7 @@ mid_camp,271,299,3	script	Historian Magnifier#edq	755,3,3,{
 	}
 }
 
-prt_in,171,94,3	script	Assistant Naomi#edq	893,3,3,{
+prt_in,171,94,3	script	Assistant Naomi#edq	4_F_HUWOMAN,3,3,{
 	mes "[Assistant Naomi]";
 	set .@name$,strcharinfo(0);
 	if (ins_nyd == 3) {
@@ -596,7 +596,7 @@ prt_in,171,94,3	script	Assistant Naomi#edq	893,3,3,{
 	}
 }
 
-splendide,198,178,3	script	Grumbling Soldier#edq	447,3,3,{
+splendide,198,178,3	script	Grumbling Soldier#edq	4_M_FAIRYSOLDIER,3,3,{
 	mes "[Grumbling Soldier]";
 	if (isequipped(2782) == 1) {
 		mes "Nowadays, the world has turned unstable. I can't even fly comfortably anymore.";
@@ -656,7 +656,7 @@ splendide,198,178,3	script	Grumbling Soldier#edq	447,3,3,{
 	}
 }
 
-splendide,240,164,3	script	Sighing Soldier#edq	461,3,3,{
+splendide,240,164,3	script	Sighing Soldier#edq	4_M_FAIRYSOLDIER2,3,3,{
 	mes "[Sighing Soldier]";
 	if (isequipped(2782) == 1) {
 		mes "When will we be finished with this combat with the Sapha? Ugghhhh...";
@@ -713,7 +713,7 @@ splendide,240,164,3	script	Sighing Soldier#edq	461,3,3,{
 	}
 }
 
-spl_in01,109,60,3	script	Commander Lebiordirr#edq	435,3,3,{
+spl_in01,109,60,3	script	Commander Lebiordirr#edq	4_F_FAIRY,3,3,{
 	mes "[Commander Lebiordirr]";
 	if (isequipped(2782) == 1) {
 		if (ins_nyd == 51) {
@@ -927,7 +927,7 @@ spl_in01,109,60,3	script	Commander Lebiordirr#edq	435,3,3,{
 	}
 }
 
-spl_in01,104,56,3	script	Aide Arioss#edq	437,3,3,{
+spl_in01,104,56,3	script	Aide Arioss#edq	4_F_FAIRYKID2,3,3,{
 	mes "[Aide Arioss]";
 	if (isequipped(2782) == 1) {
 		if (ins_nyd == 91) {
@@ -1072,21 +1072,21 @@ OnTouch_:
 	end;
 }
 
-spl_in01,101,52,5	script	Splendide Guard#1_edq	447,1,1,{
+spl_in01,101,52,5	script	Splendide Guard#1_edq	4_M_FAIRYSOLDIER,1,1,{
 	mes "[Splendide Guard]";
 	if (isequipped(2782) == 1) mes "This is the Splendide office. Don't act impolitely.";
 	else mes "ThusDurnah Ra SharVeldIyaz U UorAmanDur Yee neaOsaAdor Yee ";
 	close;
 }
 
-spl_in01,118,52,3	script	Splendide Guard#2_edq	447,1,1,{
+spl_in01,118,52,3	script	Splendide Guard#2_edq	4_M_FAIRYSOLDIER,1,1,{
 	mes "[Splendide Guard]";
 	if (isequipped(2782) == 1) mes "This is the Splendide office. Don't act impolitely.";
 	else mes "ThusDurnah Ra SharVeldIyaz U UorAmanDur Yee neaOsaAdor Yee ";
 	close;
 }
 
-man_in01,311,57,3	script	Neat Etorr#edq	453,3,3,{
+man_in01,311,57,3	script	Neat Etorr#edq	4_MAN_NITT,3,3,{
 	mes "[Neat Etorr]";
 	if (isequipped(2782) == 1) {
 		if (ins_nyd == 52) {
@@ -1293,21 +1293,21 @@ man_in01,311,57,3	script	Neat Etorr#edq	453,3,3,{
 	}
 }
 
-man_in01,286,61,5	script	Manuk Guard#1_edq	450,1,1,{
+man_in01,286,61,5	script	Manuk Guard#1_edq	4_MAN_GALTUN,1,1,{
 	mes "[Manuk Guard]";
 	if (isequipped(2782) == 1) mes "I'm guarding this Laphine prisoner. Leave me alone.";
 	else mes "Klekod Oi Thekd Pheid Okei.";
 	close;
 }
 
-man_in01,295,61,3	script	Manuk Guard#2_edq	450,1,1,{
+man_in01,295,61,3	script	Manuk Guard#2_edq	4_MAN_GALTUN,1,1,{
 	mes "[Manuk Guard]";
 	if (isequipped(2782) == 1) mes "I'm guarding this Laphine prisoner. Leave me alone.";
 	else mes "Liek QUekdk Ohei Vue.";
 	close;
 }
 
-man_in01,291,62,3	script	Laphine Prisoner#edq	437,3,3,{
+man_in01,291,62,3	script	Laphine Prisoner#edq	4_F_FAIRYKID2,3,3,{
 	mes "[Laphine Prisoner]";
 	if (isequipped(2782) == 1) {
 		if (ins_nyd == 5) {
@@ -1516,7 +1516,7 @@ OnTouch_:
 
 // First floor
 //============================================================
-1@nyd,213,277,5	script	Murdered Yggdrasilid#1F	437,5,5,{
+1@nyd,213,277,5	script	Murdered Yggdrasilid#1F	4_F_FAIRYKID2,5,5,{
 	if ('ins_nyd2 == 0) {
 		mes "When a faint light enters your heart, a voice sounds in your head.";
 		next;
@@ -1752,7 +1752,7 @@ OnTimer1850000:
 	end;
 }
 
-1@nyd,195,320,0	script	nyd_to2f_warp	45,5,5,{
+1@nyd,195,320,0	script	nyd_to2f_warp	WARPNPC,5,5,{
 OnInstanceInit:
 OnDisable:
 	disablenpc instance_npcname("nyd_to2f_warp");
@@ -1952,7 +1952,7 @@ OnTimer180000:
 	end;
 }
 
-2@nyd,202,324,5	script	World Tree Yggdrasil#2F	437,3,3,{
+2@nyd,202,324,5	script	World Tree Yggdrasil#2F	4_F_FAIRYKID2,3,3,{
 	mes "[World Tree Yggdrasil]";
 	mes "Thank you. You're the saviour of humans and the Laphine Tribe.";
 	next;
@@ -2181,7 +2181,7 @@ OnMyPingDead:
 
 // GM Management NPCs
 //============================================================
-sec_in02,36,167,3	script	Nidhoggur Manager	447,1,1,{
+sec_in02,36,167,3	script	Nidhoggur Manager	4_M_FAIRYSOLDIER,1,1,{
 	callfunc "F_GM_NPC";
 	mes "Enter the password.";
 	next;
@@ -2225,7 +2225,7 @@ sec_in02,36,167,3	script	Nidhoggur Manager	447,1,1,{
 	}
 }
 
-nyd_dun02,7,7,2	script	Purification Admin#nyd2	844,2,0,{
+nyd_dun02,7,7,2	script	Purification Admin#nyd2	CLEAR_NPC,2,0,{
 	callfunc "F_GM_NPC";
 	mes "Please enter the password";
 	set .@i, callfunc("F_GM_NPC","dragonslayer",1);
@@ -2256,7 +2256,7 @@ nyd_dun02,7,7,2	script	Purification Admin#nyd2	844,2,0,{
 	}
 }
 
-nyd_dun02,88,195,4	script	Purification Stone#nyd2	406,{
+nyd_dun02,88,195,4	script	Purification Stone#nyd2	2_MONEMUS,{
 	erasequest 3135;
 	erasequest 3136;
 	set ins_nyd,200;
diff --git a/npc/instances/OrcsMemory.txt b/npc/instances/OrcsMemory.txt
index 9b26e5138..d06db682e 100644
--- a/npc/instances/OrcsMemory.txt
+++ b/npc/instances/OrcsMemory.txt
@@ -40,7 +40,7 @@
 
 // Entrance
 //============================================================
-gef_fild10,242,202,0	script	Dimensional Gorge Piece	406,{
+gef_fild10,242,202,0	script	Dimensional Gorge Piece	2_MONEMUS,{
 
 	set .@party_id,getcharid(1);
 	set .@p_name$,getpartyname(.@party_id);
@@ -116,7 +116,7 @@ L_Enter:
 	}
 }
 
-gef_fild10,238,202,6	script	Mad Scientist#orc	865,{
+gef_fild10,238,202,6	script	Mad Scientist#orc	4_LGTSCIENCE,{
 	if (BaseLevel < 50) {
 		mes "The Mad Scientist doesn't seem to notice you and keeps mumbling to himself...";
 		close;
@@ -177,7 +177,7 @@ gef_fild10,238,202,6	script	Mad Scientist#orc	865,{
 
 // Orc's Memory Floor 1
 //============================================================
-1@orcs,180,30,0	script	#Resurrect Monsters1	844,{
+1@orcs,180,30,0	script	#Resurrect Monsters1	CLEAR_NPC,{
 	end;
 
 OnInstanceInit:
@@ -238,7 +238,7 @@ OnTimer4010:
 	end;
 }
 
-1@orcs,180,30,0	script	#Resurrect Monsters2	844,{
+1@orcs,180,30,0	script	#Resurrect Monsters2	CLEAR_NPC,{
 	end;
 
 OnInstanceInit:
@@ -270,7 +270,7 @@ OnMyMobDead:
 	end;
 }
 
-1@orcs,180,30,0	script	#Resurrect Monsters3	844,{
+1@orcs,180,30,0	script	#Resurrect Monsters3	CLEAR_NPC,{
 	end;
 
 OnInstanceInit:
@@ -311,7 +311,7 @@ OnMyMobDead:
 	end;
 }
 
-1@orcs,180,30,0	script	#Resurrect Monsters4	844,{
+1@orcs,180,30,0	script	#Resurrect Monsters4	CLEAR_NPC,{
 	end;
 
 OnInstanceInit:
@@ -332,12 +332,12 @@ OnDisable:
 	end;
 }
 
-1@orcs,180,29,4	script	Kruger#1-1	433,{
+1@orcs,180,29,4	script	Kruger#1-1	4_ORCWARRIOR,{
 	donpcevent instance_npcname("Kruger#1-2")+"::OnEnable";
 	end;
 }
 
-1@orcs,180,29,4	script	Kruger#1-2	433,{
+1@orcs,180,29,4	script	Kruger#1-2	4_ORCWARRIOR,{
 	end;
 
 OnInstanceInit:
@@ -397,7 +397,7 @@ OnTimer60000:
 
 }
 
-1@orcs,168,125,0	script	B1 Area 1	45,3,3,{
+1@orcs,168,125,0	script	B1 Area 1	WARPNPC,3,3,{
 OnInstanceInit:
 	disablenpc instance_npcname("B1 Area 1");
 	end;
@@ -426,7 +426,7 @@ OnTimer18700:
 	end;
 }
 
-1@orcs,89,94,0	script	B1 Area 2	45,3,3,{
+1@orcs,89,94,0	script	B1 Area 2	WARPNPC,3,3,{
 OnInstanceInit:
 	disablenpc instance_npcname("B1 Area 2");
 	end;
@@ -455,7 +455,7 @@ OnTimer37600:
 	end;
 }
 
-1@orcs,38,105,0	script	B1 Area 3	45,3,3,{
+1@orcs,38,105,0	script	B1 Area 3	WARPNPC,3,3,{
 OnInstanceInit:
 	disablenpc instance_npcname("B1 Area 3");
 	end;
@@ -484,7 +484,7 @@ OnTimer32700:
 	end;
 }
 
-1@orcs,21,189,0	script	B1 Area 4	45,3,3,{
+1@orcs,21,189,0	script	B1 Area 4	WARPNPC,3,3,{
 OnInstanceInit:
 	disablenpc instance_npcname("B1 Area 4");
 	end;
@@ -524,7 +524,7 @@ OnMyMobDead3:
 
 // Orc's Memory Floor 2
 //============================================================
-2@orcs,36,171,0	script	#2Resurrect Monsters1	844,{
+2@orcs,36,171,0	script	#2Resurrect Monsters1	CLEAR_NPC,{
 	end;
 
 OnInstanceInit:
@@ -582,7 +582,7 @@ OnTimer4010:
 	end;
 }
 
-2@orcs,36,171,0	script	#2Resurrect Monsters3	844,{
+2@orcs,36,171,0	script	#2Resurrect Monsters3	CLEAR_NPC,{
 	end;
 
 OnInstanceInit:
@@ -623,7 +623,7 @@ OnDisable:
 	end;
 }
 
-2@orcs,180,30,0	script	#2Resurrect Monsters4	844,{
+2@orcs,180,30,0	script	#2Resurrect Monsters4	CLEAR_NPC,{
 	end;
 
 OnInstanceInit:
@@ -640,12 +640,12 @@ OnMyMobDead:
 	end;
 }
 
-2@orcs,35,169,4	script	Kruger#2-1	433,{
+2@orcs,35,169,4	script	Kruger#2-1	4_ORCWARRIOR,{
 	donpcevent instance_npcname("Kruger#2-2")+"::OnEnable";
 	end;
 }
 
-2@orcs,35,169,4	script	Kruger#2-2	433,{
+2@orcs,35,169,4	script	Kruger#2-2	4_ORCWARRIOR,{
 	end;
 
 OnInstanceInit:
@@ -687,7 +687,7 @@ OnTimer23910:
 	end;
 }
 
-2@orcs,26,164,0	script	Torch#1-1	844,{
+2@orcs,26,164,0	script	Torch#1-1	CLEAR_NPC,{
 	if(getpartyleader(getcharid(1),2) != getcharid(0)) end;
 	progressbar "ffff00",5;
 	setarray .@id[0], atoi(charat(strnpcinfo(2),0)), atoi(charat(strnpcinfo(2),2));
@@ -717,11 +717,11 @@ OnTimer2000:
 	stopnpctimer;
 	end;
 }
-2@orcs,55,155,0	duplicate(Torch#1-1)	Torch#1-2	844
-2@orcs,108,146,0	duplicate(Torch#1-1)	Torch#1-3	844
-2@orcs,98,171,0	duplicate(Torch#1-1)	Torch#1-4	844
+2@orcs,55,155,0	duplicate(Torch#1-1)	Torch#1-2	CLEAR_NPC
+2@orcs,108,146,0	duplicate(Torch#1-1)	Torch#1-3	CLEAR_NPC
+2@orcs,98,171,0	duplicate(Torch#1-1)	Torch#1-4	CLEAR_NPC
 
-2@orcs,48,100,0	script	#Warp2-1	45,3,3,{
+2@orcs,48,100,0	script	#Warp2-1	WARPNPC,3,3,{
 OnInstanceInit:
 	disablenpc instance_npcname("#Warp2-1");
 	end;
@@ -747,12 +747,12 @@ OnTouch:
 	end;
 }
 
-2@orcs,35,92,0	duplicate(Torch#1-1)	Torch#2-1	844
-2@orcs,32,70,0	duplicate(Torch#1-1)	Torch#2-2	844
-2@orcs,70,31,0	duplicate(Torch#1-1)	Torch#2-3	844
-2@orcs,84,51,0	duplicate(Torch#1-1)	Torch#2-4	844
+2@orcs,35,92,0	duplicate(Torch#1-1)	Torch#2-1	CLEAR_NPC
+2@orcs,32,70,0	duplicate(Torch#1-1)	Torch#2-2	CLEAR_NPC
+2@orcs,70,31,0	duplicate(Torch#1-1)	Torch#2-3	CLEAR_NPC
+2@orcs,84,51,0	duplicate(Torch#1-1)	Torch#2-4	CLEAR_NPC
 
-2@orcs,101,55,0	script	#Warp2-2	45,3,3,{
+2@orcs,101,55,0	script	#Warp2-2	WARPNPC,3,3,{
 OnInstanceInit:
 	disablenpc instance_npcname("#Warp2-2");
 	end;
@@ -778,12 +778,12 @@ OnTouch:
 	end;
 }
 
-2@orcs,142,145,0	duplicate(Torch#1-1)	Torch#3-1	844
-2@orcs,162,134,0	duplicate(Torch#1-1)	Torch#3-2	844
-2@orcs,144,117,0	duplicate(Torch#1-1)	Torch#3-3	844
-2@orcs,136,98,0	duplicate(Torch#1-1)	Torch#3-4	844
+2@orcs,142,145,0	duplicate(Torch#1-1)	Torch#3-1	CLEAR_NPC
+2@orcs,162,134,0	duplicate(Torch#1-1)	Torch#3-2	CLEAR_NPC
+2@orcs,144,117,0	duplicate(Torch#1-1)	Torch#3-3	CLEAR_NPC
+2@orcs,136,98,0	duplicate(Torch#1-1)	Torch#3-4	CLEAR_NPC
 
-2@orcs,167,104,0	script	#Warp2-3	45,3,3,{
+2@orcs,167,104,0	script	#Warp2-3	WARPNPC,3,3,{
 OnInstanceInit:
 	disablenpc instance_npcname("#Warp2-3");
 	end;
@@ -823,7 +823,7 @@ OnTouch:
 	end;
 }
 
-2@orcs,36,171,0	script	#Boss Control	844,{
+2@orcs,36,171,0	script	#Boss Control	CLEAR_NPC,{
 	end;
 
 OnInstanceInit:
@@ -862,7 +862,7 @@ OnMyMobDead:
 	end;
 }
 
-2@orcs,182,8,0	script	#Warp Outside Orc Dun	45,3,3,{
+2@orcs,182,8,0	script	#Warp Outside Orc Dun	WARPNPC,3,3,{
 OnInstanceInit:
 	disablenpc instance_npcname("#Warp Outside Orc Dun");
 	end;
@@ -876,7 +876,7 @@ OnTouch:
 	end;
 }
 
-2@orcs,172,13,0	script	Kruger#	434,{
+2@orcs,172,13,0	script	Kruger#	4_ORCWARRIOR2,{
 	if (yong_odun < 2) {
 		mes "[Kruger]";
 		mes "*Coughing*";
@@ -917,7 +917,7 @@ OnEnable:
 	end;
 }
 
-2@orcs,36,171,0	script	#Mobs Control	844,{
+2@orcs,36,171,0	script	#Mobs Control	CLEAR_NPC,{
 	end;
 
 OnMyMobDead1:
diff --git a/npc/instances/SealedShrine.txt b/npc/instances/SealedShrine.txt
index b5fc61cc3..c565b182c 100644
--- a/npc/instances/SealedShrine.txt
+++ b/npc/instances/SealedShrine.txt
@@ -33,7 +33,7 @@
 
 // Sealed Catacomb Entrance
 //============================================================
-monk_test,309,146,3	script	Friar Patrick#edq	412,{
+monk_test,309,146,3	script	Friar Patrick#edq	4_M_OLDFRIAR,{
 	cutin "ins_cata_pri_n",2;
 	mes "[Friar Patrick]";
 	mes "The peace of this world cannot last forever... The hands of Evil are reaching into the world again...";
@@ -216,7 +216,7 @@ monk_test,309,146,3	script	Friar Patrick#edq	412,{
 	end;
 }
 
-monk_test,306,151,3	script	Grave of Baphomet#edq	111,{
+monk_test,306,151,3	script	Grave of Baphomet#edq	HIDDEN_NPC,{
 	if (countitem(6002)) delitem 6002,countitem(6002); //Token_Of_Apostle
 	mes "This gravestone has a carving of a wicked devil with large horns. It arouses an ominous feeling.";
 	next;
@@ -260,7 +260,7 @@ monk_test,306,151,3	script	Grave of Baphomet#edq	111,{
 	}
 }
 
-prt_monk,261,91,3	script	Rust Blackhand#edq	826,{
+prt_monk,261,91,3	script	Rust Blackhand#edq	4_M_DWARF,{
 	set .@new_maje,checkquest(3043);
 	mes "[Rust Blackhand]";
 	mes "Who are you? What do you want me for?";
@@ -483,7 +483,7 @@ OnMyMobDead:
 
 // Soul of hero near the north grave
 //============================================================
-1@cata,141,221,0	script	Gravestone#	844,3,3,{
+1@cata,141,221,0	script	Gravestone#	CLEAR_NPC,3,3,{
 	set .@party_id,getcharid(1);
 	if ('ins_baphomet == 0) {
 		mes "The gravestone is trembling...";
@@ -590,7 +590,7 @@ OnInstanceInit: // Temporary fix for @reloadscript.
 	end;
 }
 
-1@cata,176,119,4	script	Ancient Hero's Soul#1F	411,{
+1@cata,176,119,4	script	Ancient Hero's Soul#1F	4_M_CHAMPSOUL,{
 	set .@party_id,getcharid(1);
 	cutin "ins_cata_champ_n",2;
 	if ('ins_baphomet == 2) {
@@ -811,7 +811,7 @@ OnInstanceInit:
 
 // To 2F Warp
 //============================================================
-1@cata,281,12,0	script	ins_bapho_to_2f	45,1,1,{
+1@cata,281,12,0	script	ins_bapho_to_2f	WARPNPC,1,1,{
 OnTouch:
 	if (countitem(6002) > 0) {
 		delitem 6002,countitem(6002); //Token_Of_Apostle
@@ -847,37 +847,37 @@ OnInstanceInit:
 		close;
 	}
 }
-1@cata,86,214,0	duplicate(Gravestone#SS1)	Gravestone#1F_1T	844
-1@cata,200,209,0	duplicate(Gravestone#SS1)	Gravestone#1F_2T	844
-1@cata,230,195,0	duplicate(Gravestone#SS1)	Gravestone#1F_3T	844
-1@cata,118,182,0	duplicate(Gravestone#SS1)	Gravestone#1F_4T	844
-1@cata,193,182,0	duplicate(Gravestone#SS1)	Gravestone#1F_5T	844
-1@cata,253,156,0	duplicate(Gravestone#SS1)	Gravestone#1F_6T	844
-1@cata,88,154,0	duplicate(Gravestone#SS1)	Gravestone#1F_7T	844
-1@cata,127,116,0	duplicate(Gravestone#SS1)	Gravestone#1F_8T	844
-1@cata,90,98,0	duplicate(Gravestone#SS1)	Gravestone#1F_9T	844
-1@cata,188,84,0	duplicate(Gravestone#SS1)	Gravestone#1F_10T	844
-1@cata,244,42,0	duplicate(Gravestone#SS1)	Gravestone#1F_11T	844
-1@cata,127,32,0	duplicate(Gravestone#SS1)	Gravestone#1F_12T	844
-1@cata,267,30,0	duplicate(Gravestone#SS1)	Gravestone#1F_13T	844
+1@cata,86,214,0	duplicate(Gravestone#SS1)	Gravestone#1F_1T	CLEAR_NPC
+1@cata,200,209,0	duplicate(Gravestone#SS1)	Gravestone#1F_2T	CLEAR_NPC
+1@cata,230,195,0	duplicate(Gravestone#SS1)	Gravestone#1F_3T	CLEAR_NPC
+1@cata,118,182,0	duplicate(Gravestone#SS1)	Gravestone#1F_4T	CLEAR_NPC
+1@cata,193,182,0	duplicate(Gravestone#SS1)	Gravestone#1F_5T	CLEAR_NPC
+1@cata,253,156,0	duplicate(Gravestone#SS1)	Gravestone#1F_6T	CLEAR_NPC
+1@cata,88,154,0	duplicate(Gravestone#SS1)	Gravestone#1F_7T	CLEAR_NPC
+1@cata,127,116,0	duplicate(Gravestone#SS1)	Gravestone#1F_8T	CLEAR_NPC
+1@cata,90,98,0	duplicate(Gravestone#SS1)	Gravestone#1F_9T	CLEAR_NPC
+1@cata,188,84,0	duplicate(Gravestone#SS1)	Gravestone#1F_10T	CLEAR_NPC
+1@cata,244,42,0	duplicate(Gravestone#SS1)	Gravestone#1F_11T	CLEAR_NPC
+1@cata,127,32,0	duplicate(Gravestone#SS1)	Gravestone#1F_12T	CLEAR_NPC
+1@cata,267,30,0	duplicate(Gravestone#SS1)	Gravestone#1F_13T	CLEAR_NPC
 
 -	script	Gravestone#SS2	-1,{
 	mes "I can only feel gloom from this Gravestone.";
 	close;
 }
-1@cata,86,214,0	duplicate(Gravestone#SS2)	Gravestone#1F_1F	844
-1@cata,200,209,0	duplicate(Gravestone#SS2)	Gravestone#1F_2F	844
-1@cata,230,195,0	duplicate(Gravestone#SS2)	Gravestone#1F_3F	844
-1@cata,118,182,0	duplicate(Gravestone#SS2)	Gravestone#1F_4F	844
-1@cata,193,182,0	duplicate(Gravestone#SS2)	Gravestone#1F_5F	844
-1@cata,253,156,0	duplicate(Gravestone#SS2)	Gravestone#1F_6F	844
-1@cata,88,154,0	duplicate(Gravestone#SS2)	Gravestone#1F_7F	844
-1@cata,127,116,0	duplicate(Gravestone#SS2)	Gravestone#1F_8F	844
-1@cata,90,98,0	duplicate(Gravestone#SS2)	Gravestone#1F_9F	844
-1@cata,188,84,0	duplicate(Gravestone#SS2)	Gravestone#1F_10F	844
-1@cata,244,42,0	duplicate(Gravestone#SS2)	Gravestone#1F_11F	844
-1@cata,127,32,0	duplicate(Gravestone#SS2)	Gravestone#1F_12F	844
-1@cata,267,30,0	duplicate(Gravestone#SS2)	Gravestone#1F_13F	844
+1@cata,86,214,0	duplicate(Gravestone#SS2)	Gravestone#1F_1F	CLEAR_NPC
+1@cata,200,209,0	duplicate(Gravestone#SS2)	Gravestone#1F_2F	CLEAR_NPC
+1@cata,230,195,0	duplicate(Gravestone#SS2)	Gravestone#1F_3F	CLEAR_NPC
+1@cata,118,182,0	duplicate(Gravestone#SS2)	Gravestone#1F_4F	CLEAR_NPC
+1@cata,193,182,0	duplicate(Gravestone#SS2)	Gravestone#1F_5F	CLEAR_NPC
+1@cata,253,156,0	duplicate(Gravestone#SS2)	Gravestone#1F_6F	CLEAR_NPC
+1@cata,88,154,0	duplicate(Gravestone#SS2)	Gravestone#1F_7F	CLEAR_NPC
+1@cata,127,116,0	duplicate(Gravestone#SS2)	Gravestone#1F_8F	CLEAR_NPC
+1@cata,90,98,0	duplicate(Gravestone#SS2)	Gravestone#1F_9F	CLEAR_NPC
+1@cata,188,84,0	duplicate(Gravestone#SS2)	Gravestone#1F_10F	CLEAR_NPC
+1@cata,244,42,0	duplicate(Gravestone#SS2)	Gravestone#1F_11F	CLEAR_NPC
+1@cata,127,32,0	duplicate(Gravestone#SS2)	Gravestone#1F_12F	CLEAR_NPC
+1@cata,267,30,0	duplicate(Gravestone#SS2)	Gravestone#1F_13F	CLEAR_NPC
 
 // Bobbing Torches
 //============================================================
@@ -918,18 +918,18 @@ OnInstanceInit:
 	disablenpc instance_npcname(strnpcinfo(0));
 	end;
 }
-1@cata,267,210,0	duplicate(Bobbing Torch#SS)	Bobbing Torch#1	844
-1@cata,85,182,0	duplicate(Bobbing Torch#SS)	Bobbing Torch#2	844
-1@cata,267,154,0	duplicate(Bobbing Torch#SS)	Bobbing Torch#3	844
-1@cata,157,139,0	duplicate(Bobbing Torch#SS)	Bobbing Torch#4	844
-1@cata,193,138,0	duplicate(Bobbing Torch#SS)	Bobbing Torch#5	844
-1@cata,193,102,0	duplicate(Bobbing Torch#SS)	Bobbing Torch#6	844
-1@cata,157,102,0	duplicate(Bobbing Torch#SS)	Bobbing Torch#7	844
-1@cata,113,112,0	duplicate(Bobbing Torch#SS)	Bobbing Torch#8	844
-1@cata,253,56,0	duplicate(Bobbing Torch#SS)	Bobbing Torch#9	844
-1@cata,239,56,0	duplicate(Bobbing Torch#SS)	Bobbing Torch#10	844
-1@cata,71,42,0	duplicate(Bobbing Torch#SS)	Bobbing Torch#11	844
-1@cata,155,14,0	duplicate(Bobbing Torch#SS)	Bobbing Torch#12	844
+1@cata,267,210,0	duplicate(Bobbing Torch#SS)	Bobbing Torch#1	CLEAR_NPC
+1@cata,85,182,0	duplicate(Bobbing Torch#SS)	Bobbing Torch#2	CLEAR_NPC
+1@cata,267,154,0	duplicate(Bobbing Torch#SS)	Bobbing Torch#3	CLEAR_NPC
+1@cata,157,139,0	duplicate(Bobbing Torch#SS)	Bobbing Torch#4	CLEAR_NPC
+1@cata,193,138,0	duplicate(Bobbing Torch#SS)	Bobbing Torch#5	CLEAR_NPC
+1@cata,193,102,0	duplicate(Bobbing Torch#SS)	Bobbing Torch#6	CLEAR_NPC
+1@cata,157,102,0	duplicate(Bobbing Torch#SS)	Bobbing Torch#7	CLEAR_NPC
+1@cata,113,112,0	duplicate(Bobbing Torch#SS)	Bobbing Torch#8	CLEAR_NPC
+1@cata,253,56,0	duplicate(Bobbing Torch#SS)	Bobbing Torch#9	CLEAR_NPC
+1@cata,239,56,0	duplicate(Bobbing Torch#SS)	Bobbing Torch#10	CLEAR_NPC
+1@cata,71,42,0	duplicate(Bobbing Torch#SS)	Bobbing Torch#11	CLEAR_NPC
+1@cata,155,14,0	duplicate(Bobbing Torch#SS)	Bobbing Torch#12	CLEAR_NPC
 
 1@cata,1,1,0	script	ins_baphomet_1f_timer	-1,{
 OnInstanceInit:
@@ -1114,13 +1114,13 @@ OnInstanceInit:
 	disablenpc instance_npcname(strnpcinfo(0));
 	end;
 }
-2@cata,79,81,0	duplicate(Magical Seal#SS)	Magical Seal#0	844
-2@cata,123,109,0	duplicate(Magical Seal#SS)	Magical Seal#2	844
-2@cata,123,22,0	duplicate(Magical Seal#SS)	Magical Seal#4	844
-2@cata,35,21,0	duplicate(Magical Seal#SS)	Magical Seal#8	844
-2@cata,35,109,0	duplicate(Magical Seal#SS)	Magical Seal#10	844
+2@cata,79,81,0	duplicate(Magical Seal#SS)	Magical Seal#0	CLEAR_NPC
+2@cata,123,109,0	duplicate(Magical Seal#SS)	Magical Seal#2	CLEAR_NPC
+2@cata,123,22,0	duplicate(Magical Seal#SS)	Magical Seal#4	CLEAR_NPC
+2@cata,35,21,0	duplicate(Magical Seal#SS)	Magical Seal#8	CLEAR_NPC
+2@cata,35,109,0	duplicate(Magical Seal#SS)	Magical Seal#10	CLEAR_NPC
 
-2@cata,79,65,0	script	The Main Altar#ss	844,{
+2@cata,79,65,0	script	The Main Altar#ss	CLEAR_NPC,{
 	set .@party_id,getcharid(1);
 	if (('ins_baphomet == 5) && (getpartyleader(.@party_id,2) == getcharid(0))) {
 		mes "An evil power, too terrible to describe, lies under the great altar radiating a violet color.";
@@ -1147,7 +1147,7 @@ OnInstanceInit:
 	end;
 }
 
-2@cata,80,63,4	script	Ancient Hero's Soul#2F	411,{
+2@cata,80,63,4	script	Ancient Hero's Soul#2F	4_M_CHAMPSOUL,{
 	cutin "ins_cata_champ_s",2;
 	if (checkquest(3041)>=0) erasequest 3041;
 	mes "[Ancient Hero's Soul]";