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

6 files changed, 205 insertions, 205 deletions

diff --git a/npc/re/jobs/3-1/archbishop.txt b/npc/re/jobs/3-1/archbishop.txt
index ccc03b7f2..26782eb94 100644
--- a/npc/re/jobs/3-1/archbishop.txt
+++ b/npc/re/jobs/3-1/archbishop.txt
@@ -24,7 +24,7 @@
 //= 1.9 Added GM management function. [Euphy]
 //============================================================
 
-prt_church,103,88,3	script	Praying Minister#arch	60,{
+prt_church,103,88,3	script	Praying Minister#arch	1_M_PASTOR,{
 	if (BaseJob != Job_Priest) {
 		if (Class == Job_Arch_Bishop || Class == Job_Arch_Bishop_T || Class == Job_Baby_Bishop) {
 			mes "[Praying Minister]";
@@ -162,13 +162,13 @@ prt_church,103,88,3	script	Praying Minister#arch	60,{
 	close;
 }
 
-umbala,137,227,5	script	Utan Boy#arch	787,{
+umbala,137,227,5	script	Utan Boy#arch	4_M_UMKID,{
 	mes "[Utan Boy]";
 	mes "........";
 	close;
 }
 
-umbala,139,227,3	script	Priest#arch	60,{
+umbala,139,227,3	script	Priest#arch	1_M_PASTOR,{
 	if (job_arch == 0) {
 		mes "[Priest]";
 		mes "Un...ba... Unba?";
@@ -414,7 +414,7 @@ umbala,139,227,3	script	Priest#arch	60,{
 	close;
 }
 
-yggdrasil01,220,47,0	script	#arch_pilgrimage	139,5,5,{
+yggdrasil01,220,47,0	script	#arch_pilgrimage	HIDDEN_WARP_NPC,5,5,{
 OnTouch:
 	if (job_arch == 2) {
 		mes "[" + strcharinfo(0) + "]";
@@ -573,7 +573,7 @@ OnTouch:
 	end;
 }
 
-hu_in01,205,204,7	script	Praying Nun#benew	79,{
+hu_in01,205,204,7	script	Praying Nun#benew	1_F_PRIEST,{
 	if (job_arch == 4) {
 		mes "- There is a nun closing her eyes as she murmurs something which sounds like a prayer. -";
 		next;
@@ -722,14 +722,14 @@ hu_in01,205,204,7	script	Praying Nun#benew	79,{
 	close;
 }
 
-odin_tem02,282,263,0	script	#find_val	139,3,3,{
+odin_tem02,282,263,0	script	#find_val	HIDDEN_WARP_NPC,3,3,{
 OnTouch:
 	if ((job_arch > 4) && (job_arch < 100))
 		hideoffnpc "Valkyrie Illusion#arch";
 	end;
 }
 
-odin_tem02,281,275,3	script	Valkyrie Illusion#arch	403,{
+odin_tem02,281,275,3	script	Valkyrie Illusion#arch	4_F_VALKYRIE2,{
 	if ((job_arch > 4) && (job_arch < 100)) {
 		mes "You can see Valkyrie who has a despairing face.";
 		next;
@@ -754,7 +754,7 @@ OnInit:
 	end;
 }
 
-job3_arch01,29,34,3	script	Valkyrie#arch	403,{
+job3_arch01,29,34,3	script	Valkyrie#arch	4_F_VALKYRIE2,{
 	if (checkweight(1201,1) == 0 || (MaxWeight - Weight) < 2000) {
 		mes "- Wait a Sec !! -";
 		mes "- You are carrying too many items, -";
@@ -980,7 +980,7 @@ OnBc:
 	end;
 }
 
-job3_arch02,119,49,0	script	#arch_1_start	139,6,6,{
+job3_arch02,119,49,0	script	#arch_1_start	HIDDEN_WARP_NPC,6,6,{
 OnTouch:
 	if (countitem(12381) == 0)
 		getitem 12381,1; //ValkyrieA_Scroll
@@ -1008,20 +1008,20 @@ OnTouch:
 	mapwarp "job3_arch02","job3_arch01",29,29;
 	end;
 }
-job3_arch02,112,73,0	duplicate(archbjcq)	#arch_1_01	139,5,5
-job3_arch02,94,123,0	duplicate(archbjcq)	#arch_1_02	139,5,5
-job3_arch02,93,173,0	duplicate(archbjcq)	#arch_1_03	139,5,5
-job3_arch02,114,186,0	duplicate(archbjcq)	#arch_1_04	139,5,5
-job3_arch02,134,201,0	duplicate(archbjcq)	#arch_1_05	139,5,5
-job3_arch02,154,211,0	duplicate(archbjcq)	#arch_1_06	139,5,5
-job3_arch02,175,227,0	duplicate(archbjcq)	#arch_1_07	139,5,5
-job3_arch02,201,240,0	duplicate(archbjcq)	#arch_1_08	139,5,5
-job3_arch02,223,252,0	duplicate(archbjcq)	#arch_1_09	139,5,5
-job3_arch02,255,268,0	duplicate(archbjcq)	#arch_1_10	139,5,5
-job3_arch02,269,302,0	duplicate(archbjcq)	#arch_1_11	139,5,5
-job3_arch02,245,289,0	duplicate(archbjcq)	#arch_1_12	139,5,5
+job3_arch02,112,73,0	duplicate(archbjcq)	#arch_1_01	HIDDEN_WARP_NPC,5,5
+job3_arch02,94,123,0	duplicate(archbjcq)	#arch_1_02	HIDDEN_WARP_NPC,5,5
+job3_arch02,93,173,0	duplicate(archbjcq)	#arch_1_03	HIDDEN_WARP_NPC,5,5
+job3_arch02,114,186,0	duplicate(archbjcq)	#arch_1_04	HIDDEN_WARP_NPC,5,5
+job3_arch02,134,201,0	duplicate(archbjcq)	#arch_1_05	HIDDEN_WARP_NPC,5,5
+job3_arch02,154,211,0	duplicate(archbjcq)	#arch_1_06	HIDDEN_WARP_NPC,5,5
+job3_arch02,175,227,0	duplicate(archbjcq)	#arch_1_07	HIDDEN_WARP_NPC,5,5
+job3_arch02,201,240,0	duplicate(archbjcq)	#arch_1_08	HIDDEN_WARP_NPC,5,5
+job3_arch02,223,252,0	duplicate(archbjcq)	#arch_1_09	HIDDEN_WARP_NPC,5,5
+job3_arch02,255,268,0	duplicate(archbjcq)	#arch_1_10	HIDDEN_WARP_NPC,5,5
+job3_arch02,269,302,0	duplicate(archbjcq)	#arch_1_11	HIDDEN_WARP_NPC,5,5
+job3_arch02,245,289,0	duplicate(archbjcq)	#arch_1_12	HIDDEN_WARP_NPC,5,5
 
-job3_arch02,203,286,0	script	#arch_1_boss	139,5,5,{
+job3_arch02,203,286,0	script	#arch_1_boss	HIDDEN_WARP_NPC,5,5,{
 OnTouch:
 	if (countitem(12381)) {
 		delitem 12381,1; //ValkyrieA_Scroll
@@ -1051,7 +1051,7 @@ OnRed:
 	end;
 }
 
-job3_arch02,390,389,1	script	#arch_val01	844,{
+job3_arch02,390,389,1	script	#arch_val01	CLEAR_NPC,{
 	end;
 OnEnable:
 	areamonster "job3_arch02",111,325,115,329,"Valkyrie's Nightmare",2036,1,"#arch_val01::OnMyMobDead";
@@ -1082,7 +1082,7 @@ OnKill:
 	end;
 }
 
-job3_arch02,390,387,1	script	#arch_val02	844,{
+job3_arch02,390,387,1	script	#arch_val02	CLEAR_NPC,{
 	end;
 OnEnable:
 	areamonster "job3_arch02",242,44,246,48,"Valkyrie's Nightmare",2036,1,"#arch_val02::OnMyMobDead";
@@ -1100,7 +1100,7 @@ OnKill:
 	end;
 }
 
-job3_arch02,113,327,5	script	Valkyrie#arch_01	403,{
+job3_arch02,113,327,5	script	Valkyrie#arch_01	4_F_VALKYRIE2,{
 	if (getmercinfo(1)) {
 		mes "[Valkyrie]";
 		mes "If you want to talk with me, you have to ^3131FFcancel all contracts^000000 with any mercenaries you have.";
@@ -1135,7 +1135,7 @@ job3_arch02,113,327,5	script	Valkyrie#arch_01	403,{
 	end;
 }
 
-job3_arch02,244,46,5	script	Valkyrie#arch_02	403,{
+job3_arch02,244,46,5	script	Valkyrie#arch_02	4_F_VALKYRIE2,{
 	mes "[Valkyrie Anguhilde]";
 	mes "Did you find the rest of the pieces?";
 	next;
@@ -1172,7 +1172,7 @@ job3_arch02,244,46,5	script	Valkyrie#arch_02	403,{
 	end;
 }
 
-job3_arch02,279,234,0	script	#arch_end	139,7,7,{
+job3_arch02,279,234,0	script	#arch_end	HIDDEN_WARP_NPC,7,7,{
 	end;
 OnTouch:
 	donpcevent "#arch_3_01::OnKill";
@@ -1304,14 +1304,14 @@ OnInit:
 	end;
 }
 
-job3_arch02,281,232,1	script	Valkyrie Anguhilde#end	403,{
+job3_arch02,281,232,1	script	Valkyrie Anguhilde#end	4_F_VALKYRIE2,{
 	end;
 OnInit:
 	hideonnpc "Valkyrie Anguhilde#end";
 	end;
 }
 
-job3_arch02,273,235,5	script	Valkyrie of the heavens	811,{
+job3_arch02,273,235,5	script	Valkyrie of the heavens	4_F_VALKYRIE,{
 	if (job_arch == 100) {
 		mes "[Valkyrie of the heavens]";
 		mes "Now, go back to your world.";
@@ -1330,7 +1330,7 @@ OnInit:
 	end;
 }
 
-job3_arch02,132,323,0	script	#arch_2_01	139,5,5,{
+job3_arch02,132,323,0	script	#arch_2_01	HIDDEN_WARP_NPC,5,5,{
 	end;
 OnTouch:
 	if (countitem(12382))
@@ -1357,33 +1357,33 @@ OnTouch:
 	mapwarp "job3_arch02","job3_arch01",29,29;
 	end;
 }
-job3_arch02,167,313,0	duplicate(archbjcq2)	#arch_2_02	139,5,5
-job3_arch02,127,304,0	duplicate(archbjcq2)	#arch_2_03	139,5,5
-job3_arch02,207,279,0	duplicate(archbjcq2)	#arch_2_04	139,5,5
-job3_arch02,239,281,0	duplicate(archbjcq2)	#arch_2_05	139,5,5
-job3_arch02,269,303,0	duplicate(archbjcq2)	#arch_2_06	139,5,5
-job3_arch02,288,283,0	duplicate(archbjcq2)	#arch_2_07	139,5,5
-job3_arch02,278,234,0	duplicate(archbjcq2)	#arch_2_08	139,5,5
-job3_arch02,234,179,0	duplicate(archbjcq2)	#arch_2_09	139,5,5
-job3_arch02,227,169,0	duplicate(archbjcq2)	#arch_2_10	139,5,5
-job3_arch02,190,146,0	duplicate(archbjcq2)	#arch_2_11	139,5,5
+job3_arch02,167,313,0	duplicate(archbjcq2)	#arch_2_02	HIDDEN_WARP_NPC,5,5
+job3_arch02,127,304,0	duplicate(archbjcq2)	#arch_2_03	HIDDEN_WARP_NPC,5,5
+job3_arch02,207,279,0	duplicate(archbjcq2)	#arch_2_04	HIDDEN_WARP_NPC,5,5
+job3_arch02,239,281,0	duplicate(archbjcq2)	#arch_2_05	HIDDEN_WARP_NPC,5,5
+job3_arch02,269,303,0	duplicate(archbjcq2)	#arch_2_06	HIDDEN_WARP_NPC,5,5
+job3_arch02,288,283,0	duplicate(archbjcq2)	#arch_2_07	HIDDEN_WARP_NPC,5,5
+job3_arch02,278,234,0	duplicate(archbjcq2)	#arch_2_08	HIDDEN_WARP_NPC,5,5
+job3_arch02,234,179,0	duplicate(archbjcq2)	#arch_2_09	HIDDEN_WARP_NPC,5,5
+job3_arch02,227,169,0	duplicate(archbjcq2)	#arch_2_10	HIDDEN_WARP_NPC,5,5
+job3_arch02,190,146,0	duplicate(archbjcq2)	#arch_2_11	HIDDEN_WARP_NPC,5,5
 
 /*
 // Not in official script.
-job3_arch02,252,267,0	script	#arch_2_12	139,5,5,{
+job3_arch02,252,267,0	script	#arch_2_12	HIDDEN_WARP_NPC,5,5,{
 OnTouch:
 	mapannounce "job3_arch02","Whispering of an impersonation: It's a crossroad. Let's go to the left side. I have to find my pipe.",bc_map,"0xFFCE00";
 	end;
 }
 
-job3_arch02,250,290,0	script	#arch_2_13	139,5,5,{
+job3_arch02,250,290,0	script	#arch_2_13	HIDDEN_WARP_NPC,5,5,{
 OnTouch:
 	mapannounce "job3_arch02","Whispering of an impersonation: I can see a ruined shrine. Take a rest in there.",bc_map,"0xFFCE00";
 	end;
 }
 */
 
-job3_arch02,206,113,0	script	#arch_2_boss	139,5,5,{
+job3_arch02,206,113,0	script	#arch_2_boss	HIDDEN_WARP_NPC,5,5,{
 OnTouch:
 	if (countitem(12382)) {
 		delitem 12382,1; //ValkyrieB_Scroll
@@ -1397,7 +1397,7 @@ OnTouch:
 	end;
 }
 
-job3_arch02,284,159,0	script	#arch_3_01	139,20,20,{
+job3_arch02,284,159,0	script	#arch_3_01	HIDDEN_WARP_NPC,20,20,{
 OnTouch:
 	if (Class != Job_Priest) {
 		mapannounce "job3_arch02","Frus: Do you want to see God? Okay, I'll send you to the land of the dead by myself!",bc_map,"0xFF0000";
@@ -1415,7 +1415,7 @@ OnKill:
 //	end;
 }
 
-job3_arch02,307,200,0	script	#arch_3_02	139,5,5,{
+job3_arch02,307,200,0	script	#arch_3_02	HIDDEN_WARP_NPC,5,5,{
 OnTouch:
 	if (BaseJob == Job_Priest) {
 		mapannounce "job3_arch02","Skogul: You are my guest!",bc_map,"0xFF0000";
@@ -1433,7 +1433,7 @@ OnKill:
 //	end;
 }
 
-job3_arch02,296,216,0	script	#arch_3_03	139,5,5,{
+job3_arch02,296,216,0	script	#arch_3_03	HIDDEN_WARP_NPC,5,5,{
 OnTouch:
 	mapannounce "job3_arch02","Frus: I like your face... Can I steal it?",bc_map,"0xFF0000";
 	monster "job3_arch02",296,216,"Frus",1762,1,"#arch_3_03::OnMyMobDead";
@@ -1449,7 +1449,7 @@ OnInit:
 	end;
 }
 
-job3_arch02,389,390,1	script	mob#arch_1	844,{
+job3_arch02,389,390,1	script	mob#arch_1	CLEAR_NPC,{
 	end;
 OnEnable:
 	monster "job3_arch02",100,102,"Shrine Invader",1394,2,"mob#arch_1::OnMyMobDead";
@@ -1470,7 +1470,7 @@ OnKill:
 	end;
 }
 
-job3_arch02,389,389,1	script	mob#arch_2	844,{
+job3_arch02,389,389,1	script	mob#arch_2	CLEAR_NPC,{
 	end;
 OnEnable:
 	monster "job3_arch02",156,321,"Shrine Invader",1480,2,"mob#arch_2::OnMyMobDead";
@@ -1493,7 +1493,7 @@ OnKill:
 	end;
 }
 
-job3_arch02,389,388,1	script	start#arch	844,{
+job3_arch02,389,388,1	script	start#arch	CLEAR_NPC,{
 	end;
 OnInit:
 	mapwarp "job3_arch02","job3_arch01",29,29;
@@ -1581,7 +1581,7 @@ OnTimer605000:
 	end;
 }
 
-job3_arch02,390,388,1	script	#arch_2_start	844,{
+job3_arch02,390,388,1	script	#arch_2_start	CLEAR_NPC,{
 	end;
 OnInit:
 	disablenpc "#arch_2_01";
@@ -1615,7 +1615,7 @@ OnEnable:
 	end;
 }
 
-job3_arch02,390,386,1	script	#arch_3_start	844,{
+job3_arch02,390,386,1	script	#arch_3_start	CLEAR_NPC,{
 	end;
 OnEnable:
 	enablenpc "#arch_3_01";
@@ -1626,14 +1626,14 @@ OnEnable:
 	end;
 }
 
-job3_arch02,290,221,0	script	#arch_end_eff	139,5,5,{
+job3_arch02,290,221,0	script	#arch_end_eff	HIDDEN_WARP_NPC,5,5,{
 OnTouch:
 	specialeffect EF_MAPPILLAR2,"#arch_end";
 	end;
 }
 
 /*
-job_arch01,26,25,0	script	#archremove	139,3,3,{
+job_arch01,26,25,0	script	#archremove	HIDDEN_WARP_NPC,3,3,{
 OnTouch:
 	if (countitem(6154)) delitem 6154, countitem(6154); //Broken_Horn_Pipe
 	if (countitem(12381)) delitem 12381, countitem(12381); //ValkyrieA_Scroll
@@ -1643,7 +1643,7 @@ OnTouch:
 }
 */
 
-job3_arch01,1,1,1	script	control#arch	844,{
+job3_arch01,1,1,1	script	control#arch	CLEAR_NPC,{
 	callfunc "F_GM_NPC";
 	mes "[Troll]";
 	mes "Password please.";
@@ -1671,14 +1671,14 @@ job3_arch01,1,1,1	script	control#arch	844,{
 	}
 }
 
-odin_tem02,30,181,0	script	#wherearch01	139,10,10,{
+odin_tem02,30,181,0	script	#wherearch01	HIDDEN_WARP_NPC,10,10,{
 OnTouch:
 	if (job_arch == 5)
 		viewpoint 1,282,263,1,0xFFFF99;
 	end;
 }
 
-odin_tem02,30,335,0	script	#wherearch02	139,10,10,{
+odin_tem02,30,335,0	script	#wherearch02	HIDDEN_WARP_NPC,10,10,{
 OnTouch:
 	if (job_arch == 5)
 		viewpoint 1,282,263,1,0xFFFF99;
diff --git a/npc/re/jobs/3-1/guillotine_cross.txt b/npc/re/jobs/3-1/guillotine_cross.txt
index 904c04148..c206599bb 100644
--- a/npc/re/jobs/3-1/guillotine_cross.txt
+++ b/npc/re/jobs/3-1/guillotine_cross.txt
@@ -18,7 +18,7 @@
 //= 1.5 Added GM management function. [Euphy]
 //============================================================
 
-que_job01,75,96,3	script	Guild Member#3rdgc01	997,{
+que_job01,75,96,3	script	Guild Member#3rdgc01	4_M_MOCASS1,{
 	if (job_3rd_gc == 0) {
 		if (Class == Job_Assassin || Class == Job_Assassin_Cross || Class == Job_Baby_Assassin) {
 			if (BaseLevel == 99) {
@@ -222,7 +222,7 @@ function	script	func_3rdgc	{
 	close;
 }
 
-job3_guil01,82,95,3	script	Daora#3rdgc02	940,{
+job3_guil01,82,95,3	script	Daora#3rdgc02	4_F_DESERT,{
 	mes "[Daora]";
 	if (Class == Job_Assassin || Class == Job_Assassin_Cross || Class == Job_Baby_Assassin) {
 		if (job_3rd_gc < 4) {
@@ -825,7 +825,7 @@ job3_guil01,82,95,3	script	Daora#3rdgc02	940,{
 	}
 }
 
-job3_guil01,16,20,4	script	Mayshell#3rdgc03	894,{
+job3_guil01,16,20,4	script	Mayshell#3rdgc03	4_F_KHELLISIA,{
 	if (!checkweight(1201,2)) {
 		mes "- You can't continue this quest because you have too many items. -";
 		close;
@@ -1097,7 +1097,7 @@ job3_guil01,16,20,4	script	Mayshell#3rdgc03	894,{
 	}
 }
 
-ve_in,228,108,3	script	Waitress#3rdgc04	80,{
+ve_in,228,108,3	script	Waitress#3rdgc04	1_F_PUBGIRL,{
 	mes "[Waitress]";
 	if (job_3rd_gc < 6) {
 		mes "Welcome~";
@@ -1330,7 +1330,7 @@ ve_in,228,108,3	script	Waitress#3rdgc04	80,{
 	}
 }
 
-ve_in,246,303,3	script	Young Merchant#3rdgc05	930,{
+ve_in,246,303,3	script	Young Merchant#3rdgc05	4_M_RACHMAN2,{
 	if (job_3rd_gc < 6) {
 		mes "[Young Merchant]";
 		mes "If you want to buy stuff, go to this person.";
@@ -1526,7 +1526,7 @@ ve_in,246,303,3	script	Young Merchant#3rdgc05	930,{
 	}
 }
 
-veins,291,215,3	script	Vigilante#3rdgc06	939,{
+veins,291,215,3	script	Vigilante#3rdgc06	4_DST_SOLDIER,{
 	if (job_3rd_gc < 6) {
 		mes "[Vigilante]";
 		mes "Do you have any inconveniences while you are traveling?";
@@ -1690,7 +1690,7 @@ veins,291,215,3	script	Vigilante#3rdgc06	939,{
 	}
 }
 
-veins,187,143,5	script	Peddler#3rdgc07	892,{
+veins,187,143,5	script	Peddler#3rdgc07	4_F_HUGRANMA,{
 	mes "[Peddler]";
 	if (job_3rd_gc < 6) {
 		mes "What a huge sandstorm.";
@@ -1793,7 +1793,7 @@ veins,187,143,5	script	Peddler#3rdgc07	892,{
 	}
 }
 
-veins,235,126,3	script	Old Man#3rdgc07	945,{
+veins,235,126,3	script	Old Man#3rdgc07	4_M_DST_GRAND,{
 	mes "[Old Man]";
 	if (job_3rd_gc < 6) {
 		mes "Haha... I can remember my past when I see a young adventurer like you...";
@@ -1900,7 +1900,7 @@ veins,235,126,3	script	Old Man#3rdgc07	945,{
 	}
 }
 
-veins,223,180,3	script	Girl#3rdgc09	941,{
+veins,223,180,3	script	Girl#3rdgc09	4_F_DST_CHILD,{
 	mes "[Melissa]";
 	if (job_3rd_gc == 8) {
 		mes "Hi?";
@@ -2071,7 +2071,7 @@ veins,223,180,3	script	Girl#3rdgc09	941,{
 	}
 }
 
-veins,337,284,0	script	#ghostestilla_3rdgc	139,3,3,{
+veins,337,284,0	script	#ghostestilla_3rdgc	HIDDEN_WARP_NPC,3,3,{
 	end;
 OnTouch:
 	if (job_3rd_gc == 9) {
@@ -2184,7 +2184,7 @@ OnTouch:
 	end;
 }
 
-veins,341,287,3	script	Estillda#3rdgc10	919,{
+veins,341,287,3	script	Estillda#3rdgc10	4_F_SHABBY,{
 OnInit:
 OnDisable:
 	disablenpc "Estillda#3rdgc10";
@@ -2194,7 +2194,7 @@ OnEnable:
 	end;
 }
 
-job3_guil01,79,15,1	script	Estillda#3rdgc11	919,{
+job3_guil01,79,15,1	script	Estillda#3rdgc11	4_F_SHABBY,{
 	if (job_3rd_gc == 11) {
 		mes "Estillda is looking around with an anxious expression on her face.";
 		next;
@@ -2313,7 +2313,7 @@ job3_guil01,79,15,1	script	Estillda#3rdgc11	919,{
 	end;
 }
 
-veins,206,56,0	script	#3rdgc_battleroom01	139,1,1,{
+veins,206,56,0	script	#3rdgc_battleroom01	HIDDEN_WARP_NPC,1,1,{
 	end;
 OnInit:
 	set $@3rdgc_room01, 0;
@@ -2352,7 +2352,7 @@ OnTouch:
 	end;
 }
 
-job3_guil02,34,44,0	script	#3rdgc_room01_mag01	139,2,2,{
+job3_guil02,34,44,0	script	#3rdgc_room01_mag01	HIDDEN_WARP_NPC,2,2,{
 	end;
 OnEnable:
 	enablenpc "#3rdgc_room01_mag01";
@@ -2397,7 +2397,7 @@ OnTimer300000:
 	end;
 }
 
-job3_guil02,51,43,7	script	A man with black clothes	456,4,4,{
+job3_guil02,51,43,7	script	A man with black clothes	4_M_DSTMAN,4,4,{
 	end;
 OnInit:
 OnDisable:
@@ -2452,7 +2452,7 @@ OnMyMobDead:
 	end;
 }
 
-job3_guil02,1,1,0	script	#3rdgc_2nd_timer	844,{
+job3_guil02,1,1,0	script	#3rdgc_2nd_timer	CLEAR_NPC,{
 	end;
 OnEnable:
 	initnpctimer;
@@ -2472,7 +2472,7 @@ OnTimer61000:
 	end;
 }
 
-job3_guil02,49,43,5	script	Dandelion#3rdgc12	457,{
+job3_guil02,49,43,5	script	Dandelion#3rdgc12	4_M_DSTMANDEAD,{
 	if (!checkweight(1201,2)) {
 		mes "- You can't continue this quest because you have too many items. -";
 		close;
@@ -2517,7 +2517,7 @@ OnEnable:
 	end;
 }
 
-rachel,115,77,3	script	Girke#3rdgc13	85,{
+rachel,115,77,3	script	Girke#3rdgc13	4_M_03,{
 	mes "[Girke]";
 	mes "Oh~ young man.";
 	mes "I'm Girke Sara.";
@@ -2564,7 +2564,7 @@ rachel,115,77,3	script	Girke#3rdgc13	85,{
 	close;
 }
 
-ra_in01,175,196,3	script	Oresa Rava#3rdgc13	866,{
+ra_in01,175,196,3	script	Oresa Rava#3rdgc13	4_M_LGTGRAND,{
 	mes "[Oresa Rava]";
 	if (job_3rd_gc == 13) {
 		mes "I don't know why you are visiting me, but I'm not crafting anymore.";
@@ -2649,7 +2649,7 @@ ra_in01,175,196,3	script	Oresa Rava#3rdgc13	866,{
 }
 
 //Pre-RE: ve_fild05 (327,308)
-ve_fild02,330,384,3	script	Girl#3rdgc14	466,{
+ve_fild02,330,384,3	script	Girl#3rdgc14	4_F_GUILLOTINE,{
 	if (job_3rd_gc > 14 && job_3rd_gc < 18) {
 		mes "[Renzak]";
 		if (job_3rd_gc == 15) {
@@ -2728,7 +2728,7 @@ OnInit:
 	end;
 }
 
-job3_guil03,22,70,0	script	#3rdgc_event01	139,3,3,{
+job3_guil03,22,70,0	script	#3rdgc_event01	HIDDEN_WARP_NPC,3,3,{
 	end;
 OnEnable:
 	enablenpc "#3rdgc_event01";
@@ -2763,7 +2763,7 @@ OnTimer902000:
 	end;
 }
 
-job3_guil03,1,4,0	script	#3rdgc_event_master	844,{
+job3_guil03,1,4,0	script	#3rdgc_event_master	CLEAR_NPC,{
 	end;
 OnEnable:
 	donpcevent "Barbed-Wire Entanglement::OnEnable";
@@ -2814,7 +2814,7 @@ OnReset:
 }
 
 //Original name: Barbed-Wire Entanglements#3rdgc_door01
-job3_guil03,55,79,0	script	Barbed-Wire Entanglement	844,1,1,{
+job3_guil03,55,79,0	script	Barbed-Wire Entanglement	CLEAR_NPC,1,1,{
 	end;
 OnEnable:
 	enablenpc "Barbed-Wire Entanglement";
@@ -2836,7 +2836,7 @@ OnTouch:
 	close;
 }
 
-job3_guil03,98,46,0	script	#3rdgc_hide01	139,1,4,{
+job3_guil03,98,46,0	script	#3rdgc_hide01	HIDDEN_WARP_NPC,1,4,{
 	end;
 OnStop:
 	killmonster "job3_guil03","#3rdgc_hide01::OnMyMobDead";
@@ -2863,7 +2863,7 @@ OnMyMobDead:
 	end;
 }
 
-job3_guil03,98,55,0	script	#3rdgc_hide02	139,1,4,{
+job3_guil03,98,55,0	script	#3rdgc_hide02	HIDDEN_WARP_NPC,1,4,{
 	end;
 OnStop:
 	killmonster "job3_guil03","#3rdgc_hide02::OnMyMobDead";
@@ -2890,7 +2890,7 @@ OnMyMobDead:
 	end;
 }
 
-job3_guil03,98,64,0	script	#3rdgc_hide03	139,1,4,{
+job3_guil03,98,64,0	script	#3rdgc_hide03	HIDDEN_WARP_NPC,1,4,{
 	end;
 OnStop:
 	killmonster "job3_guil03","#3rdgc_hide03::OnMyMobDead";
@@ -2917,7 +2917,7 @@ OnMyMobDead:
 	end;
 }
 
-job3_guil03,1,2,0	script	#3rdgc_guard	844,{
+job3_guil03,1,2,0	script	#3rdgc_guard	CLEAR_NPC,{
 	end;
 OnEnable:
 	initnpctimer;
@@ -2958,7 +2958,7 @@ OnTimer16000:
 	end;
 }
 
-job3_guil03,1,3,0	script	#3rdgc_guardoff	844,{
+job3_guil03,1,3,0	script	#3rdgc_guardoff	CLEAR_NPC,{
 	end;
 OnDisable:
 	initnpctimer;
@@ -3033,7 +3033,7 @@ OnEnable:
 	end;
 }
 
-job3_guil03,93,35,3	script	Front Gate Guard#g01	456,5,5,{
+job3_guil03,93,35,3	script	Front Gate Guard#g01	4_M_DSTMAN,5,5,{
 	end;
 OnInit:
 OnDisable:
@@ -3060,11 +3060,11 @@ OnTouch:
 OnMyMobDead:
 	end;
 }
-job3_guil03,93,36,3	duplicate(#3rdgc_guard00)	Front Gate Guard#g03	456
-job3_guil03,93,34,3	duplicate(#3rdgc_guard00)	Front Gate Guard#g04	456
-job3_guil03,93,33,3	duplicate(#3rdgc_guard00)	Front Gate Guard#g05	456
+job3_guil03,93,36,3	duplicate(#3rdgc_guard00)	Front Gate Guard#g03	4_M_DSTMAN
+job3_guil03,93,34,3	duplicate(#3rdgc_guard00)	Front Gate Guard#g04	4_M_DSTMAN
+job3_guil03,93,33,3	duplicate(#3rdgc_guard00)	Front Gate Guard#g05	4_M_DSTMAN
 
-job3_guil03,133,52,5	script	Back Gate Guard#g01	456,5,5,{
+job3_guil03,133,52,5	script	Back Gate Guard#g01	4_M_DSTMAN,5,5,{
 	end;
 OnInit:
 OnDisable:
@@ -3091,11 +3091,11 @@ OnTouch:
 OnMyMobDead:
 	end;
 }
-job3_guil03,133,53,5	duplicate(#3rdgc_guard00)	Back Gate Guard#g03	456
-job3_guil03,133,51,5	duplicate(#3rdgc_guard00)	Back Gate Guard#g04	456
-job3_guil03,133,50,5	duplicate(#3rdgc_guard00)	Back Gate Guard#g05	456
+job3_guil03,133,53,5	duplicate(#3rdgc_guard00)	Back Gate Guard#g03	4_M_DSTMAN
+job3_guil03,133,51,5	duplicate(#3rdgc_guard00)	Back Gate Guard#g04	4_M_DSTMAN
+job3_guil03,133,50,5	duplicate(#3rdgc_guard00)	Back Gate Guard#g05	4_M_DSTMAN
 
-job3_guil03,117,51,4	script	Interior Guard#g01	456,5,5,{
+job3_guil03,117,51,4	script	Interior Guard#g01	4_M_DSTMAN,5,5,{
 	end;
 OnInit:
 OnDisable:
@@ -3122,11 +3122,11 @@ OnTouch:
 OnMyMobDead:
 	end;
 }
-job3_guil03,117,52,4	duplicate(#3rdgc_guard00)	Interior Guard#g03	456
-job3_guil03,117,50,4	duplicate(#3rdgc_guard00)	Interior Guard#g04	456
-job3_guil03,117,49,4	duplicate(#3rdgc_guard00)	Interior Guard#g05	456
+job3_guil03,117,52,4	duplicate(#3rdgc_guard00)	Interior Guard#g03	4_M_DSTMAN
+job3_guil03,117,50,4	duplicate(#3rdgc_guard00)	Interior Guard#g04	4_M_DSTMAN
+job3_guil03,117,49,4	duplicate(#3rdgc_guard00)	Interior Guard#g05	4_M_DSTMAN
 
-job3_guil03,88,44,4	script	Exterior Guard#g01	456,5,5,{
+job3_guil03,88,44,4	script	Exterior Guard#g01	4_M_DSTMAN,5,5,{
 	end;
 OnInit:
 OnDisable:
@@ -3149,7 +3149,7 @@ OnMyMobDead:
 	end;
 }
 
-job3_guil03,88,55,4	script	Exterior Guard#g02	456,5,5,{
+job3_guil03,88,55,4	script	Exterior Guard#g02	4_M_DSTMAN,5,5,{
 	end;
 OnInit:
 OnDisable:
@@ -3172,7 +3172,7 @@ OnMyMobDead:
 	end;
 }
 
-job3_guil03,88,64,4	script	Exterior Guard#g03	456,5,5,{
+job3_guil03,88,64,4	script	Exterior Guard#g03	4_M_DSTMAN,5,5,{
 	end;
 OnInit:
 OnDisable:
@@ -3195,7 +3195,7 @@ OnMyMobDead:
 	end;
 }
 
-job3_guil03,73,62,4	script	Exterior Guard#g04	456,5,5,{
+job3_guil03,73,62,4	script	Exterior Guard#g04	4_M_DSTMAN,5,5,{
 	end;
 OnInit:
 OnDisable:
@@ -3218,7 +3218,7 @@ OnMyMobDead:
 	end;
 }
 
-job3_guil03,77,51,4	script	Exterior Guard#g05	456,5,5,{
+job3_guil03,77,51,4	script	Exterior Guard#g05	4_M_DSTMAN,5,5,{
 	end;
 OnInit:
 OnDisable:
@@ -3241,7 +3241,7 @@ OnMyMobDead:
 	end;
 }
 
-job3_guil03,73,34,4	script	Exterior Guard#g06	456,5,5,{
+job3_guil03,73,34,4	script	Exterior Guard#g06	4_M_DSTMAN,5,5,{
 	end;
 OnInit:
 OnDisable:
@@ -3310,7 +3310,7 @@ OnMyMobDead:
 	end;
 }
 
-job3_guil03,2,1,0	script	#3rdgc_sunchal_nomal	844,{
+job3_guil03,2,1,0	script	#3rdgc_sunchal_nomal	CLEAR_NPC,{
 	end;
 OnEnable:
 	monster "job3_guil03",62,35,"Guard",1985,1,"#3rdgc_sunchal_nomal::OnMyMobDead";
@@ -3347,7 +3347,7 @@ OnMyMobDead:
 	end;
 }
 
-job3_guil03,2,2,0	script	#3rdgc_sunchal_kill01	844,{
+job3_guil03,2,2,0	script	#3rdgc_sunchal_kill01	CLEAR_NPC,{
 	end;
 OnEnable:
 	set .@i, atoi(charat(strnpcinfo(0),20));
@@ -3377,10 +3377,10 @@ OnTimer10000:
 	stopnpctimer;
 	end;
 }
-job3_guil03,2,3,0	duplicate(#3rdgc_sunchal_kill01)	#3rdgc_sunchal_kill02	844
-job3_guil03,2,4,0	duplicate(#3rdgc_sunchal_kill01)	#3rdgc_sunchal_kill03	844
+job3_guil03,2,3,0	duplicate(#3rdgc_sunchal_kill01)	#3rdgc_sunchal_kill02	CLEAR_NPC
+job3_guil03,2,4,0	duplicate(#3rdgc_sunchal_kill01)	#3rdgc_sunchal_kill03	CLEAR_NPC
 
-job3_guil03,64,68,3	script	#3rdgc_gojung_kill01	456,7,7,{
+job3_guil03,64,68,3	script	#3rdgc_gojung_kill01	4_M_DSTMAN,7,7,{
 	end;
 OnEnable:
 	enablenpc strnpcinfo(0);
@@ -3415,10 +3415,10 @@ OnTimer10000:
 	stopnpctimer;
 	end;
 }
-job3_guil03,86,63,1	duplicate(#3rdgc_gojung_kill01)	#3rdgc_gojung_kill02	456,8,8
-job3_guil03,83,36,5	duplicate(#3rdgc_gojung_kill01)	#3rdgc_gojung_kill03	456,6,6
+job3_guil03,86,63,1	duplicate(#3rdgc_gojung_kill01)	#3rdgc_gojung_kill02	4_M_DSTMAN,8,8
+job3_guil03,83,36,5	duplicate(#3rdgc_gojung_kill01)	#3rdgc_gojung_kill03	4_M_DSTMAN,6,6
 
-job3_guil03,88,71,0	script	#3rdgc_safezone01	139,1,1,{
+job3_guil03,88,71,0	script	#3rdgc_safezone01	HIDDEN_WARP_NPC,1,1,{
 	end;
 OnTouch:
 	mes "It's a good bush to hide yourself.";
@@ -3440,10 +3440,10 @@ OnTimer:
 		donpcevent "#3rdgc_guardoff::OnDisable";
 	end;
 }
-job3_guil03,82,45,0	duplicate(#3rdgc_safezone01)	#3rdgc_safezone02	139,1,1
-job3_guil03,72,53,0	duplicate(#3rdgc_safezone01)	#3rdgc_safezone03	139,1,1
+job3_guil03,82,45,0	duplicate(#3rdgc_safezone01)	#3rdgc_safezone02	HIDDEN_WARP_NPC,1,1
+job3_guil03,72,53,0	duplicate(#3rdgc_safezone01)	#3rdgc_safezone03	HIDDEN_WARP_NPC,1,1
 
-job3_guil03,111,51,7	script	Priest from Rachel	928,{
+job3_guil03,111,51,7	script	Priest from Rachel	4_M_MIDDLE1,{
 	if (!.on) end;
 	mes "[Priest from Rachel]";
 	if (job_3rd_gc == 17) {
@@ -3538,7 +3538,7 @@ OnTimer61500:
 	end;
 }
 
-job3_guil03,146,70,3	script	Renzak#3rdgc16	466,{
+job3_guil03,146,70,3	script	Renzak#3rdgc16	4_F_GUILLOTINE,{
 	mes "[Renzak]";
 	if (checkquest(7110,HUNTING) == 2) {
 		mes "My peers will come here to settle this affair.";
@@ -3575,7 +3575,7 @@ OnDisable:
 	end;
 }
 
-job3_guil01,148,53,3	script	Bercasell#3rdgc16	467,{
+job3_guil01,148,53,3	script	Bercasell#3rdgc16	4_M_GUILLOTINE,{
 	if (!checkweight(1201,2)) {
 		mes "- You can't continue this quest because you have too many items. -";
 		close;
@@ -3788,7 +3788,7 @@ L_Info:
 
 // Warp Portals
 //============================================================
-job3_guil01,80,77,0	script	#gate_to_guil05	45,1,1,{
+job3_guil01,80,77,0	script	#gate_to_guil05	WARPNPC,1,1,{
 	end;
 OnTouch:
 	if (job_3rd_gc > 3)
@@ -3801,7 +3801,7 @@ OnTouch:
 	}
 	end;
 }
-job3_guil01,51,55,0	script	#gate_to_guil07	45,1,1,{
+job3_guil01,51,55,0	script	#gate_to_guil07	WARPNPC,1,1,{
 	end;
 OnTouch:
 	if (job_3rd_gc == 4 || job_3rd_gc == 14 || job_3rd_gc > 17)
@@ -3818,7 +3818,7 @@ OnTouch:
 	}
 	end;
 }
-job3_guil01,51,44,0	script	#gate_to_guil09	45,1,1,{
+job3_guil01,51,44,0	script	#gate_to_guil09	WARPNPC,1,1,{
 	end;
 OnTouch:
 	if (job_3rd_gc == 11 || job_3rd_gc == 12)
@@ -3832,7 +3832,7 @@ OnTouch:
 	end;
 }
 
-job3_guil02,1,3,0	script	#GMhelper01_gc	844,{
+job3_guil02,1,3,0	script	#GMhelper01_gc	CLEAR_NPC,{
 	callfunc "F_GM_NPC";
 	mes "What can I do for you?";
 	next;
@@ -3871,7 +3871,7 @@ job3_guil02,1,3,0	script	#GMhelper01_gc	844,{
 	}
 }
 
-job3_guil03,1,8,0	script	#GMhelper02_gc	844,{
+job3_guil03,1,8,0	script	#GMhelper02_gc	CLEAR_NPC,{
 	callfunc "F_GM_NPC";
 	mes "What can I do for you?";
 	next;
diff --git a/npc/re/jobs/3-1/mechanic.txt b/npc/re/jobs/3-1/mechanic.txt
index 2133a227a..8300576f2 100644
--- a/npc/re/jobs/3-1/mechanic.txt
+++ b/npc/re/jobs/3-1/mechanic.txt
@@ -13,7 +13,7 @@
 //= 1.2 Updated script. [Euphy]
 //============================================================
 
-yuno,129,156,3	script	Chainheart	923,{
+yuno,129,156,3	script	Chainheart	4_M_DOCTOR,{
 	mes "[Chainheart]";
 	if (BaseLevel > 99) {
 		mes "Living as a Mechanic is tough,";
@@ -293,7 +293,7 @@ yuno,129,156,3	script	Chainheart	923,{
 	close;
 }
 
-jupe_cave,37,55,5	script	Scholar#Mechanic	883,{
+jupe_cave,37,55,5	script	Scholar#Mechanic	4_M_ALCHE_D,{
 	if (checkweight(1201,1) == 0 || MaxWeight - Weight < 300) {
 		mes "- Your pack is too heavy. -";
 		mes "- Lighten your body first -";
@@ -384,7 +384,7 @@ jupe_cave,37,55,5	script	Scholar#Mechanic	883,{
 	close;
 }
 
-jupe_core2,149,273,3	script	Ghostfire#1	802,{
+jupe_core2,149,273,3	script	Ghostfire#1	4_NFWISP,{
 	mes "[?]";
 	if (job__mechanic == 11) {
 		mes "I've lost my body and all that's left is my spirit in this place.";
@@ -470,7 +470,7 @@ jupe_core2,149,273,3	script	Ghostfire#1	802,{
 	end;
 }
 
-jupe_core2,53,75,3	script	Ghostfire#2	802,{
+jupe_core2,53,75,3	script	Ghostfire#2	4_NFWISP,{
 	mes "[?]";
 	if (job__mechanic > 5) {
 		mes "Juperos... I...";
@@ -532,7 +532,7 @@ jupe_core2,53,75,3	script	Ghostfire#2	802,{
 	end;
 }
 
-jupe_core2,242,62,3	script	Ghostfire#3	802,{
+jupe_core2,242,62,3	script	Ghostfire#3	4_NFWISP,{
 	mes "[?]";
 	if (job__mechanic > 6) {
 		mes "I want to know more about the knowledge...";
@@ -573,7 +573,7 @@ jupe_core2,242,62,3	script	Ghostfire#3	802,{
 	end;
 }
 
-jupe_core2,29,150,0	script	#Foothold	139,1,1,{
+jupe_core2,29,150,0	script	#Foothold	HIDDEN_WARP_NPC,1,1,{
 OnTouch:
 	if (job__mechanic == 8) {
 		percentheal 0,-30;
@@ -612,7 +612,7 @@ OnTouch:
 	end;
 }
 
-jupe_core2,272,149,0	script	#Foothold2	139,1,1,{
+jupe_core2,272,149,0	script	#Foothold2	HIDDEN_WARP_NPC,1,1,{
 OnTouch:
 	if (job__mechanic == 9) {
 		mes "-I had a feeling that power-";
@@ -647,7 +647,7 @@ OnTouch:
 	end;
 }
 
-jupe_core2,288,142,3	script	#Door	844,1,1,{
+jupe_core2,288,142,3	script	#Door	CLEAR_NPC,1,1,{
 	end;
 OnInit:
 OnDisable:
@@ -701,7 +701,7 @@ OnTouch:
 	end;
 }
 
-jupe_core2,149,34,0	script	#Acquiring Knowledge	139,1,0,{
+jupe_core2,149,34,0	script	#Acquiring Knowledge	HIDDEN_WARP_NPC,1,0,{
 OnTouch:
 	if (job__mechanic == 9) {
 		mes "-The moment I stepped on-";
@@ -726,6 +726,6 @@ OnTouch:
 	}
 	end;
 }
-jupe_core2,150,33,0	duplicate(#Acquiring Knowledge)	#Acquiring Knowledge2	139,1,0
+jupe_core2,150,33,0	duplicate(#Acquiring Knowledge)	#Acquiring Knowledge2	HIDDEN_WARP_NPC,1,0
 
 jupe_core2,0,0,0,0	monster	Dimik	1669,100,0,0,0
\ No newline at end of file
diff --git a/npc/re/jobs/3-1/ranger.txt b/npc/re/jobs/3-1/ranger.txt
index b35c8ebfc..0b52df91f 100644
--- a/npc/re/jobs/3-1/ranger.txt
+++ b/npc/re/jobs/3-1/ranger.txt
@@ -21,7 +21,7 @@
 //= 1.6 Added GM management function. [Euphy]
 //============================================================
 
-tur_dun01,156,36,5	script	Survival Instructor#jr01	59,{
+tur_dun01,156,36,5	script	Survival Instructor#jr01	1_M_ORIENT01,{
 	mes "[Survival Instructor, Rescue]";
 	if (BaseJob == Job_Hunter) {
 		if (job_ranger01 < 1) {
@@ -304,7 +304,7 @@ tur_dun01,156,36,5	script	Survival Instructor#jr01	59,{
 	close;
 }
 
-tur_dun01,91,169,3	script	Test Instructor#jr02	732,{
+tur_dun01,91,169,3	script	Test Instructor#jr02	4_M_JOB_HUNTER,{
 	mes "[Test Instructor, Teardrop]";
 	if (BaseJob == Job_Hunter) {
 		if (job_ranger01 < 3) {
@@ -672,7 +672,7 @@ L_Start:
 	end;
 }
 
-job3_rang01,30,44,3	script	Test Waiting Room#jr_03	88,{
+job3_rang01,30,44,3	script	Test Waiting Room#jr_03	4_M_ORIENT01,{
 	mes "[Staff DTS]";
 	mes "Please wait at the practical test waiting room to start the test process.";
 	next;
@@ -798,7 +798,7 @@ OnDisable:
 	end;
 }
 
-job3_rang02,100,95,0	script	Test Supervisor#jr_04	139,{
+job3_rang02,100,95,0	script	Test Supervisor#jr_04	HIDDEN_WARP_NPC,{
 OnInit:
 	set $@job_rang_point01,0;
 	disablenpc "Test Supervisor#jr_04";
@@ -841,7 +841,7 @@ OnTimer18000:
 	end;
 }
 
-job3_rang02,102,95,0	script	First Test Timer#jr_05	139,{
+job3_rang02,102,95,0	script	First Test Timer#jr_05	HIDDEN_WARP_NPC,{
 OnInit:
 	disablenpc "First Test Timer#jr_05";
 	end;
@@ -942,7 +942,7 @@ OnTimer157000:
 	end;
 }
 
-job3_rang02,104,95,0	script	CallCorrectAnswer#jr	139,{
+job3_rang02,104,95,0	script	CallCorrectAnswer#jr	HIDDEN_WARP_NPC,{
 OnInit:
 OnDisable:
 	disablenpc "CallCorrectAnswer#jr";
@@ -969,7 +969,7 @@ OnMyMobDead:
 	end;
 }
 
-job3_rang02,106,95,0	script	CallWrongAnswer#jr	139,{
+job3_rang02,106,95,0	script	CallWrongAnswer#jr	HIDDEN_WARP_NPC,{
 OnInit:
 OnDisable:
 	disablenpc "CallWrongAnswer#jr";
@@ -1059,7 +1059,7 @@ OnMyMobDead:
 	end;
 }
 
-job3_rang02,100,93,0	script	Second Test Timer#jr_08	139,{
+job3_rang02,100,93,0	script	Second Test Timer#jr_08	HIDDEN_WARP_NPC,{
 OnInit:
 	disablenpc "Second Test Timer#jr_08";
 	end;
@@ -1166,7 +1166,7 @@ OnTimer223000:
 	end;
 }
 
-job3_rang02,111,56,3	script	Staff Rust#jr_09	89,{
+job3_rang02,111,56,3	script	Staff Rust#jr_09	4_M_ORIENT02,{
 	if (job_ranger01 == 6) {
 		if (countitem(12258) < 1) {
 			percentheal 100,0;
@@ -1211,7 +1211,7 @@ OnDisable:
 	end;
 }
 
-job3_rang02,136,21,0	script	Summon Monster#jr_10	139,5,5,{
+job3_rang02,136,21,0	script	Summon Monster#jr_10	HIDDEN_WARP_NPC,5,5,{
 OnInit:
 	disablenpc "Summon Monster#jr_10";
 	end;
@@ -1260,7 +1260,7 @@ OnMyMobDead:
 	end;
 }
 
-job3_rang02,180,78,3	script	Test Supervisor#jr_11	882,1,1,{
+job3_rang02,180,78,3	script	Test Supervisor#jr_11	4_F_SITDOWN,1,1,{
 	mes "[Test Supervisor, Caution]";
 	mes "Come, come near, nearer, nearer!!";
 	close;
@@ -1360,7 +1360,7 @@ OnTimer105000:
 	end;
 }
 
-job3_rang02,104,93,0	script	Third Test Timer#jr_12	139,{
+job3_rang02,104,93,0	script	Third Test Timer#jr_12	HIDDEN_WARP_NPC,{
 OnInit:
 	disablenpc "Third Test Timer#jr_12";
 	end;
@@ -1447,7 +1447,7 @@ OnTimer130000:
 	end;
 }
 
-job3_rang02,251,49,3	script	Test Supervisor#jr_13	732,{
+job3_rang02,251,49,3	script	Test Supervisor#jr_13	4_M_JOB_HUNTER,{
 	mes "[Test Supervisor, Freeze]";
 	if (job_ranger01 == 6) {
 		if (checkquest(8261) == -1) {
@@ -1602,23 +1602,23 @@ OnTimer10000:
 	donpcevent strnpcinfo(0)+"::OnDisable";
 	end;
 }
-job3_rang02,246,42,0	duplicate(Egg Bomb#0)	Egg Bomb#14	139
-job3_rang02,249,46,0	duplicate(Egg Bomb#0)	Egg Bomb#15	139
-job3_rang02,256,43,0	duplicate(Egg Bomb#0)	Egg Bomb#16	139
-job3_rang02,243,54,0	duplicate(Egg Bomb#0)	Egg Bomb#17	139
-job3_rang02,246,58,0	duplicate(Egg Bomb#0)	Egg Bomb#18	139
-job3_rang02,255,56,0	duplicate(Egg Bomb#0)	Egg Bomb#19	139
-job3_rang02,260,48,0	duplicate(Egg Bomb#0)	Egg Bomb#20	139
-job3_rang02,244,53,0	duplicate(Egg Bomb#0)	Egg Bomb#21	139
-job3_rang02,254,50,0	duplicate(Egg Bomb#0)	Egg Bomb#22	139
-job3_rang02,241,41,0	duplicate(Egg Bomb#0)	Egg Bomb#23	139
-job3_rang02,259,41,0	duplicate(Egg Bomb#0)	Egg Bomb#24	139
-job3_rang02,256,52,0	duplicate(Egg Bomb#0)	Egg Bomb#25	139
-job3_rang02,259,58,0	duplicate(Egg Bomb#0)	Egg Bomb#26	139
-job3_rang02,254,52,0	duplicate(Egg Bomb#0)	Egg Bomb#27	139
-job3_rang02,247,42,0	duplicate(Egg Bomb#0)	Egg Bomb#28	139
+job3_rang02,246,42,0	duplicate(Egg Bomb#0)	Egg Bomb#14	HIDDEN_WARP_NPC
+job3_rang02,249,46,0	duplicate(Egg Bomb#0)	Egg Bomb#15	HIDDEN_WARP_NPC
+job3_rang02,256,43,0	duplicate(Egg Bomb#0)	Egg Bomb#16	HIDDEN_WARP_NPC
+job3_rang02,243,54,0	duplicate(Egg Bomb#0)	Egg Bomb#17	HIDDEN_WARP_NPC
+job3_rang02,246,58,0	duplicate(Egg Bomb#0)	Egg Bomb#18	HIDDEN_WARP_NPC
+job3_rang02,255,56,0	duplicate(Egg Bomb#0)	Egg Bomb#19	HIDDEN_WARP_NPC
+job3_rang02,260,48,0	duplicate(Egg Bomb#0)	Egg Bomb#20	HIDDEN_WARP_NPC
+job3_rang02,244,53,0	duplicate(Egg Bomb#0)	Egg Bomb#21	HIDDEN_WARP_NPC
+job3_rang02,254,50,0	duplicate(Egg Bomb#0)	Egg Bomb#22	HIDDEN_WARP_NPC
+job3_rang02,241,41,0	duplicate(Egg Bomb#0)	Egg Bomb#23	HIDDEN_WARP_NPC
+job3_rang02,259,41,0	duplicate(Egg Bomb#0)	Egg Bomb#24	HIDDEN_WARP_NPC
+job3_rang02,256,52,0	duplicate(Egg Bomb#0)	Egg Bomb#25	HIDDEN_WARP_NPC
+job3_rang02,259,58,0	duplicate(Egg Bomb#0)	Egg Bomb#26	HIDDEN_WARP_NPC
+job3_rang02,254,52,0	duplicate(Egg Bomb#0)	Egg Bomb#27	HIDDEN_WARP_NPC
+job3_rang02,247,42,0	duplicate(Egg Bomb#0)	Egg Bomb#28	HIDDEN_WARP_NPC
 
-job3_rang01,90,43,3	script	Ranger Master#jr_29	832,{
+job3_rang01,90,43,3	script	Ranger Master#jr_29	4_M_REIDIN_KURS,{
 	mes "[Ranger Master, Neveragain]";
 	if (job_ranger01 < 6) {
 		mes "... ...Huh?";
@@ -1756,7 +1756,7 @@ job3_rang01,90,43,3	script	Ranger Master#jr_29	832,{
 	}
 }
 
-job3_rang01,58,1,0	script	Worker#job_ranger	88,{
+job3_rang01,58,1,0	script	Worker#job_ranger	4_M_ORIENT01,{
 	callfunc "F_GM_NPC";
 	switch(select("Enable Waiting Room:Disable Waiting Room:Enable 1st Test:Disable 1st Test:Enable 2nd Test:Disable 2nd Test:Enable 3rd Test:Disable 3rd Test:Cancel")) {
 	case 1:
diff --git a/npc/re/jobs/3-1/rune_knight.txt b/npc/re/jobs/3-1/rune_knight.txt
index f9264574a..ffb395e07 100644
--- a/npc/re/jobs/3-1/rune_knight.txt
+++ b/npc/re/jobs/3-1/rune_knight.txt
@@ -17,7 +17,7 @@
 //= 1.5 Added GM management function. [Euphy]
 //============================================================
 
-prt_in,162,24,3	script	Splendid-Looking Knight	470,2,2,{
+prt_in,162,24,3	script	Splendid-Looking Knight	4_M_KNIGHT_SILVER,2,2,{
 	mes "[Rune Knight Manuel]";
 	if (Class == Job_Rune_Knight || Class == Job_Rune_Knight_T || Class == Job_Baby_Rune) {
 		mes "You are now a member of our select brethren. I can still remember when I first met you.";
@@ -125,7 +125,7 @@ prt_in,162,24,3	script	Splendid-Looking Knight	470,2,2,{
 	close;
 }
 
-glast_01,44,363,3	script	Guide, Jungberg	468,2,2,{
+glast_01,44,363,3	script	Guide, Jungberg	4_M_KNIGHT_BLACK,2,2,{
 	mes "[Guide, Jungberg]";
 	if (Class == Job_Rune_Knight || Class == Job_Rune_Knight_T || Class == Job_Baby_Rune) {
 		mes "Oh, you must be "+strcharinfo(0)+".";
@@ -249,7 +249,7 @@ glast_01,44,363,3	script	Guide, Jungberg	468,2,2,{
 	}
 }
 
-gl_knt02,150,55,3	script	Rune Knight Staff	83,2,2,{
+gl_knt02,150,55,3	script	Rune Knight Staff	4_M_01,2,2,{
 	mes "[Rune Knight Staff]";
 	if (Class == Job_Rune_Knight || Class == Job_Rune_Knight_T || Class == Job_Baby_Rune) {
 		mes "Welcome, "+strcharinfo(0)+". Are you going to the gathering place?";
@@ -296,7 +296,7 @@ gl_knt02,150,55,3	script	Rune Knight Staff	83,2,2,{
 	close;
 }
 
-job3_rune01,80,60,3	script	Rune Knight Captain	470,2,2,{
+job3_rune01,80,60,3	script	Rune Knight Captain	4_M_KNIGHT_SILVER,2,2,{
 	if (checkweight(1201,1) == 0 || MaxWeight - Weight < 1000) {
 		mes "You've got too many things. You cannot proceed anymore. Please try again after losing some weight.";
 		close;
@@ -574,7 +574,7 @@ L_Warning:
 	return;
 }
 
-job3_rune01,90,50,3	script	Rune Knight Lunarea	469,2,2,{
+job3_rune01,90,50,3	script	Rune Knight Lunarea	4_M_KNIGHT_GOLD,2,2,{
 	if (Class == Job_Rune_Knight || Class == Job_Rune_Knight_T || Class == Job_Baby_Rune) {
 		mes "She holds up her chin quietly, nods lightly and notices me.";
 		next;
@@ -688,7 +688,7 @@ L_Test:
 	close;
 }
 
-job3_rune01,55,50,3	script	Rune Knight, Renoa	469,2,2,{
+job3_rune01,55,50,3	script	Rune Knight, Renoa	4_M_KNIGHT_GOLD,2,2,{
 	mes "[Rune Knight, Renoa]";
 	if (Class == Job_Rune_Knight || Class == Job_Rune_Knight_T || Class == Job_Baby_Rune) {
 		mes "Congratulations for becoming one of us. Junior Rune Knight, "+strcharinfo(0)+".";
@@ -904,7 +904,7 @@ job3_rune01,55,50,3	script	Rune Knight, Renoa	469,2,2,{
 	close;
 }
 
-job3_rune01,58,51,1	script	Rune Furnace	844,{
+job3_rune01,58,51,1	script	Rune Furnace	CLEAR_NPC,{
 	if (job_rune_edq < 15) {
 		mes "[Rune Knight Renoa]";
 		mes "You don't want to touch that thing. Believe me, I'm not kidding.";
@@ -976,7 +976,7 @@ job3_rune01,58,51,1	script	Rune Furnace	844,{
 	close;
 }
 
-job3_rune01,40,54,1	script	Runes and Rune Knights	844,{
+job3_rune01,40,54,1	script	Runes and Rune Knights	CLEAR_NPC,{
 	if (job_rune_edq < 8) {
 		mes "[Rune Knight Renoa]";
 		mes "Besides touching stuff in this place without permission. Would you be able to understand the contents of the book?";
@@ -1035,7 +1035,7 @@ job3_rune01,40,54,1	script	Runes and Rune Knights	844,{
 	}
 }
 
-job3_rune01,43,44,1	script	The Principles of Runes	844,{
+job3_rune01,43,44,1	script	The Principles of Runes	CLEAR_NPC,{
 	if (job_rune_edq < 8) {
 		mes "[Rune Knight Renoa]";
 		mes "Besides touching stuff in this place without permission. Would you be able to understand the contents of the book?";
@@ -1082,7 +1082,7 @@ job3_rune01,43,44,1	script	The Principles of Runes	844,{
 	}
 }
 
-job3_rune01,50,36,1	script	Runes, Make & Use	844,{
+job3_rune01,50,36,1	script	Runes, Make & Use	CLEAR_NPC,{
 	if (job_rune_edq < 8) {
 		mes "[Rune Knight Renoa]";
 		mes "Besides touching stuff in this place without permission. Would you be able to understand the contents of the book?";
@@ -1181,7 +1181,7 @@ job3_rune01,50,36,1	script	Runes, Make & Use	844,{
 	}
 }
 
-mid_camp,238,250,3	script	Rune Knight Sage Guard	468,2,2,{
+mid_camp,238,250,3	script	Rune Knight Sage Guard	4_M_KNIGHT_BLACK,2,2,{
 	mes "[Rune Knight Sage Guard]";
 	if (Class == Job_Rune_Knight || Class == Job_Rune_Knight_T || Class == Job_Baby_Rune) {
 		mes "The sage Serpeone is the one who has been with us since the beginning of the Rune Knights.";
@@ -1208,7 +1208,7 @@ mid_camp,238,250,3	script	Rune Knight Sage Guard	468,2,2,{
 	close;
 }
 
-mid_camp,13,138,3	script	Dispatched Rune Knight#1	83,2,2,{
+mid_camp,13,138,3	script	Dispatched Rune Knight#1	4_M_01,2,2,{
 	mes "[Dispatched Rune Knight]";
 	if (Class == Job_Rune_Knight || Class == Job_Rune_Knight_T || Class == Job_Baby_Rune) {
 		mes "Thanks for your work. We will continue our mission for the Rune Knight testers.";
@@ -1236,9 +1236,9 @@ mid_camp,13,138,3	script	Dispatched Rune Knight#1	83,2,2,{
 	mes "Shh... Our mission is not something to be revealed to the public. Please just move along.";
 	close;
 }
-spl_fild01,361,327,3	duplicate(Dispatched Rune Knight#1)	Dispatched Rune Knight#2	83,2,2
+spl_fild01,361,327,3	duplicate(Dispatched Rune Knight#1)	Dispatched Rune Knight#2	4_M_01,2,2
 
-spl_fild02,13,241,0	script	#Barricade1	139,10,10,{
+spl_fild02,13,241,0	script	#Barricade1	HIDDEN_WARP_NPC,10,10,{
 	end;
 OnTouch:
 	if (job_rune_edq > 0 && job_rune_edq < 23) {
@@ -1256,7 +1256,7 @@ OnTouch:
 	end;
 }
 
-mid_camp,235,250,3	script	Sage Serpeone	435,2,2,{
+mid_camp,235,250,3	script	Sage Serpeone	4_F_FAIRY,2,2,{
 	mes "[Sage Serpeone]";
 	if (Class == Job_Rune_Knight || Class == Job_Rune_Knight_T || Class == Job_Baby_Rune) {
 		mes "Finally you are an honorable Rune Knight. I'm happy to help you.";
@@ -1420,7 +1420,7 @@ mid_camp,235,250,3	script	Sage Serpeone	435,2,2,{
 	close;
 }
 
-job3_rune01,114,50,3	script	Rune Knight Velpino	468,{
+job3_rune01,114,50,3	script	Rune Knight Velpino	4_M_KNIGHT_BLACK,{
 	if (Class == Job_Rune_Knight || Class == Job_Rune_Knight_T || Class == Job_Baby_Rune) {
 		mes "[Rune Knight Velpino]";
 		mes "You still smell like a fledging. Bring honor to the Rune Knights and raise your power...";
@@ -1554,7 +1554,7 @@ job3_rune01,114,50,3	script	Rune Knight Velpino	468,{
 	close;
 }
 
-job3_rune02,38,40,0	script	#RK Test Hidden Portal 1	139,15,15,{
+job3_rune02,38,40,0	script	#RK Test Hidden Portal 1	HIDDEN_WARP_NPC,15,15,{
 	end;
 OnEnable:
 	enablenpc "#RK Test Hidden Portal 1";
@@ -1588,7 +1588,7 @@ OnTouch:
 	}
 }
 
-job3_rune02,1,1,0	script	job_rune_edq#1st_tb	139,{
+job3_rune02,1,1,0	script	job_rune_edq#1st_tb	HIDDEN_WARP_NPC,{
 	end;
 OnInit:
 	disablenpc "job_rune_edq#1st_tb";
@@ -1617,7 +1617,7 @@ OnTimer14000:
 	end;
 }
 
-job3_rune02,1,2,0	script	job_rune_edq#1st_tc	139,{
+job3_rune02,1,2,0	script	job_rune_edq#1st_tc	HIDDEN_WARP_NPC,{
 	end;
 OnInit:
 	disablenpc "job_rune_edq#1st_tc";
@@ -1653,7 +1653,7 @@ OnTimer305000:
 	end;
 }
 
-job3_rune02,3,10,0	script	job_rune_edq#1st_tcmc	139,{
+job3_rune02,3,10,0	script	job_rune_edq#1st_tcmc	HIDDEN_WARP_NPC,{
 	end;
 OnInit:
 	disablenpc "job_rune_edq#1st_tcmc";
@@ -1706,7 +1706,7 @@ OnMyMobDead:
 	end;
 }
 
-job3_rune02,3,11,0	script	job_rune_edq#1st_tcmc2	139,{
+job3_rune02,3,11,0	script	job_rune_edq#1st_tcmc2	HIDDEN_WARP_NPC,{
 	end;
 OnInit:
 	disablenpc "job_rune_edq#1st_tcmc2";
@@ -1756,7 +1756,7 @@ OnMyMobDead:
 	end;
 }
 
-job3_rune02,1,10,0	script	job_rune_edq#1st_tcnc	139,{
+job3_rune02,1,10,0	script	job_rune_edq#1st_tcnc	HIDDEN_WARP_NPC,{
 	end;
 OnInit:
 	disablenpc "job_rune_edq#1st_tcnc";
@@ -1802,7 +1802,7 @@ OnTimer60000:
 	end;
 }
 
-job3_rune02,34,46,5	script	Captain Tigris#jrt1	470,2,2,{
+job3_rune02,34,46,5	script	Captain Tigris#jrt1	4_M_KNIGHT_SILVER,2,2,{
 	if (job_rune_edq != 4 || $@job_rune_test2 != 0) {
 		donpcevent "job_rune_edq#1st_tcnc::OnUse";
 		end;
@@ -1848,7 +1848,7 @@ OnTimer5000:
 	end;
 }
 
-job3_rune02,43,46,3	script	Rune Knight Lunarea#jrt1	469,2,2,{
+job3_rune02,43,46,3	script	Rune Knight Lunarea#jrt1	4_M_KNIGHT_GOLD,2,2,{
 	if (job_rune_edq != 4 || $@job_rune_test2 != 0) {
 		donpcevent "job_rune_edq#1st_tcnc::OnUse";
 		end;
@@ -1893,7 +1893,7 @@ OnTimer5000:
 	end;
 }
 
-job3_rune02,43,34,1	script	Rune Knight Renoa#jrt1	469,2,2,{
+job3_rune02,43,34,1	script	Rune Knight Renoa#jrt1	4_M_KNIGHT_GOLD,2,2,{
 	if (job_rune_edq != 4 || $@job_rune_test2 != 0) {
 		donpcevent "job_rune_edq#1st_tcnc::OnUse";
 		end;
@@ -1939,7 +1939,7 @@ OnTimer5000:
 	end;
 }
 
-job3_rune02,34,34,7	script	Rune Knight Velpino#jrt1	468,2,2,{
+job3_rune02,34,34,7	script	Rune Knight Velpino#jrt1	4_M_KNIGHT_BLACK,2,2,{
 	if (job_rune_edq != 4 || $@job_rune_test2 != 0) {
 		donpcevent "job_rune_edq#1st_tcnc::OnUse";
 		end;
@@ -1984,7 +1984,7 @@ OnTimer5000:
 	end;
 }
 
-job3_rune02,2,1,0	script	job_rune_edq#3rd_tb	139,{
+job3_rune02,2,1,0	script	job_rune_edq#3rd_tb	HIDDEN_WARP_NPC,{
 	end;
 OnInit:
 	disablenpc "job_rune_edq#3rd_tb";
@@ -2013,7 +2013,7 @@ OnTimer14000:
 	end;
 }
 
-job3_rune02,2,2,0	script	job_rune_edq#3rd_tc	139,{
+job3_rune02,2,2,0	script	job_rune_edq#3rd_tc	HIDDEN_WARP_NPC,{
 	end;
 OnInit:
 	disablenpc "job_rune_edq#3rd_tc";
@@ -2050,7 +2050,7 @@ OnTimer482000:
 	end;
 }
 
-job3_rune02,2,3,0	script	job_rune_edq#3rd_tc1	139,{
+job3_rune02,2,3,0	script	job_rune_edq#3rd_tc1	HIDDEN_WARP_NPC,{
 	end;
 OnInit:
 	disablenpc "job_rune_edq#3rd_tc1";
@@ -2074,7 +2074,7 @@ OnMyMobDead:
 	end;
 }
 
-job3_rune02,2,4,0	script	job_rune_edq#3rd_tc2	139,{
+job3_rune02,2,4,0	script	job_rune_edq#3rd_tc2	HIDDEN_WARP_NPC,{
 	end;
 OnInit:
 	disablenpc "job_rune_edq#3rd_tc2";
@@ -2098,7 +2098,7 @@ OnMyMobDead:
 	end;
 }
 
-job3_rune02,2,5,0	script	job_rune_edq#3rd_tc3	139,{
+job3_rune02,2,5,0	script	job_rune_edq#3rd_tc3	HIDDEN_WARP_NPC,{
 	end;
 OnInit:
 	disablenpc "job_rune_edq#3rd_tc3";
@@ -2134,7 +2134,7 @@ OnMyMobDead:
 	end;
 }
 
-sec_in02,34,167,3	script	R.Knight Job Manager	470,1,1,{
+sec_in02,34,167,3	script	R.Knight Job Manager	4_M_KNIGHT_SILVER,1,1,{
 	callfunc "F_GM_NPC";
 	mes "Enter the Password.";
 	next;
@@ -2154,4 +2154,4 @@ sec_in02,34,167,3	script	R.Knight Job Manager	470,1,1,{
 	}
 	close;
 }
-job3_rune01,1,1,3	duplicate(R.Knight Job Manager)	#renshucheck	844
+job3_rune01,1,1,3	duplicate(R.Knight Job Manager)	#renshucheck	CLEAR_NPC
diff --git a/npc/re/jobs/3-1/warlock.txt b/npc/re/jobs/3-1/warlock.txt
index 263ccd9b0..0efc323c8 100644
--- a/npc/re/jobs/3-1/warlock.txt
+++ b/npc/re/jobs/3-1/warlock.txt
@@ -66,9 +66,9 @@ OnTouch:
 	}
 	end;
 }
-//morocc,103,144,0	duplicate(#distorted_space_)	#distorted_space_1	139,1,1
-morocc,95,132,0	duplicate(#distorted_space_)	#distorted_space_1	139,1,1
-splendide,141,284,0	duplicate(#distorted_space_)	#distorted_space_2	139,1,1
+//morocc,103,144,0	duplicate(#distorted_space_)	#distorted_space_1	HIDDEN_WARP_NPC,1,1
+morocc,95,132,0	duplicate(#distorted_space_)	#distorted_space_1	HIDDEN_WARP_NPC,1,1
+splendide,141,284,0	duplicate(#distorted_space_)	#distorted_space_2	HIDDEN_WARP_NPC,1,1
 
 function	script	F_Warlock	{
 	mes "[Assistant]";
@@ -203,7 +203,7 @@ function	script	F_Warlock	{
 	end;
 }
 
-spl_in02,77,107,5	script	Assistant#Warlock1	446,{
+spl_in02,77,107,5	script	Assistant#Warlock1	4_M_FAIRYKID5,{
 	if (job_wl == 0) {
 		callfunc "F_Warlock";
 		end;
@@ -321,7 +321,7 @@ L_Quest:
 	return;
 }
 
-spl_in02,60,231,5	script	Yoop#Warlock	446,{
+spl_in02,60,231,5	script	Yoop#Warlock	4_M_FAIRYKID5,{
 	mes "[Yoop]";
 	if (job_wl < 4) {
 		mes "Who are you?";
@@ -450,7 +450,7 @@ spl_in02,60,231,5	script	Yoop#Warlock	446,{
 	}
 }
 
-spl_in02,84,103,3	script	Assistant#Warlock2	439,{
+spl_in02,84,103,3	script	Assistant#Warlock2	4_F_FAIRYKID4,{
 	if (job_wl == 0) {
 		callfunc "F_Warlock";
 		end;
@@ -541,7 +541,7 @@ spl_in02,84,103,3	script	Assistant#Warlock2	439,{
 	}
 }
 
-spl_in02,78,110,5	script	Assistant#Warlock3	437,{
+spl_in02,78,110,5	script	Assistant#Warlock3	4_F_FAIRYKID2,{
 	if (job_wl == 0) {
 		callfunc "F_Warlock";
 		end;
@@ -568,7 +568,7 @@ spl_in02,78,110,5	script	Assistant#Warlock3	437,{
 	}
 }
 
-spl_in02,80,108,5	script	Guild Master#Warlock	465,{
+spl_in02,80,108,5	script	Guild Master#Warlock	4_F_FAIRY1,{
 	if (job_wl == 0) {
 		callfunc "F_Warlock";
 		end;
@@ -710,14 +710,14 @@ spl_in02,80,108,5	script	Guild Master#Warlock	465,{
 	}
 }
 
-job3_war01,22,22,7	script	Yoop#WRR	439,{
+job3_war01,22,22,7	script	Yoop#WRR	4_F_FAIRYKID4,{
 	mes "[Yoop]";
 	mes "If you ask Ebein to be sent to the magical room, he would send you there.";
 	mes "Wait in the queue to enter the Chamber of Magic.";
 	close;
 }
 
-job3_war01,29,25,0	script	Ebein#WRR	437,{
+job3_war01,29,25,0	script	Ebein#WRR	4_F_FAIRYKID2,{
 	mes "[Ebein]";
 	mes "Would you like to take a test?";
 	mes "If you stand by in the waiting room, you'll be able to go into the Chamber of Magic.";
@@ -742,7 +742,7 @@ job3_war01,29,25,0	script	Ebein#WRR	437,{
 	}
 }
 
-job3_war01,29,25,5	script	The chamber of magic#1	437,{
+job3_war01,29,25,5	script	The chamber of magic#1	4_F_FAIRYKID2,{
 	end;
 OnInit:
 	disablenpc "The chamber of magic#1";
@@ -1054,7 +1054,7 @@ OnTimer6000:
 	end;
 }
 
-job3_war01,1,2,0	script	Button Girl#wl	66,{
+job3_war01,1,2,0	script	Button Girl#wl	1_F_01,{
 	callfunc "F_GM_NPC";
 	switch(select("Open Arena:Close Arena:Open the Chamber of Magic:Close the Chamber of Magic:Hollow Stone On:Hollow Stone Off:Cancel")) {
 	case 1: