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

33 files changed, 176 insertions, 176 deletions

diff --git a/npc/jobs/1-1e/gunslinger.txt b/npc/jobs/1-1e/gunslinger.txt
index a34a8252a..aafe2d0c4 100644
--- a/npc/jobs/1-1e/gunslinger.txt
+++ b/npc/jobs/1-1e/gunslinger.txt
@@ -26,7 +26,7 @@
 //= 2.2 Updated to match AEGIS script and Added Quest Log commands. [Kisuka]
 //============================================================
 
-que_ng,152,167,3	script	Master Miller	901,{
+que_ng,152,167,3	script	Master Miller	4_M_HUOLDARMY,{
 	if (Upper == 2) {
 		mes "[Master Miller]";
 		mes "Well, aren't you an";
@@ -208,7 +208,7 @@ que_ng,152,167,3	script	Master Miller	901,{
 	}
 }
 
-payon,184,65,3	script	Wise Bull Horn	866,{
+payon,184,65,3	script	Wise Bull Horn	4_M_LGTGRAND,{
 	if (GUNS_Q == 1) {
 		mes "[Wise Bull Horn]";
 		mes "Hello, young wolf.";
diff --git a/npc/jobs/1-1e/ninja.txt b/npc/jobs/1-1e/ninja.txt
index d74ed85d6..90cc08edc 100644
--- a/npc/jobs/1-1e/ninja.txt
+++ b/npc/jobs/1-1e/ninja.txt
@@ -15,7 +15,7 @@
 //= 1.6 Fixed AEGIS amatsu warp typo. [Kisuka]
 //============================================================
 
-alberta,30,65,3	script	Akagi	730,{
+alberta,30,65,3	script	Akagi	4_M_JOB_ASSASSIN,{
 	if (Class == Job_Novice) {
 		if (JobLevel == 10) {
 			mes "[Akagi]";
@@ -71,7 +71,7 @@ alberta,30,65,3	script	Akagi	730,{
 	}
 }
 
-que_ng,30,65,3	script	Cougar#nq	730,{
+que_ng,30,65,3	script	Cougar#nq	4_M_JOB_ASSASSIN,{
 	if (Upper == 2) {
 		mes "[Cougar]";
 		mes "I... I've never";
@@ -371,7 +371,7 @@ que_ng,30,65,3	script	Cougar#nq	730,{
 	}
 }
 
-einbroch,184,194,3	script	Suspicious Man#nq	 	881,{
+einbroch,184,194,3	script	Suspicious Man#nq	4_M_SITDOWN,{
 	if (NINJ_Q == 1) {
 		mes "[Suspicious Man]";
 		mes "I've traveled to many";
diff --git a/npc/jobs/1-1e/taekwon.txt b/npc/jobs/1-1e/taekwon.txt
index dffae4639..6403c2648 100644
--- a/npc/jobs/1-1e/taekwon.txt
+++ b/npc/jobs/1-1e/taekwon.txt
@@ -14,7 +14,7 @@
 //= 1.4 Removed use of 'goto', and fixed some indentation. [L0ne_W0lf]
 //============================================================
 
-payon,157,141,5	script	Phoenix#TKJobChange	753,{
+payon,157,141,5	script	Phoenix#TKJobChange	4_M_MONK,{
 	if(Upper == 2) {
 		mes "[Phoenix]";
 		mes "Hello, child.";
diff --git a/npc/jobs/2-1/assassin.txt b/npc/jobs/2-1/assassin.txt
index b0550c12f..e4b231fcf 100644
--- a/npc/jobs/2-1/assassin.txt
+++ b/npc/jobs/2-1/assassin.txt
@@ -49,7 +49,7 @@
 //= 3.6 Fixed broken event calls. [Euphy]
 //============================================================
 
-in_moc_16,19,33,1	script	Guildsman#asn	55,{
+in_moc_16,19,33,1	script	Guildsman#asn	1_M_JOBTESTER,{
 	if (Upper == 1) {
 		mes "[Ferocious-looking guy]";
 		mes "Hm? You....?";
@@ -290,7 +290,7 @@ in_moc_16,19,33,1	script	Guildsman#asn	55,{
 	}
 }
 
-in_moc_16,25,90,1	script	Guildsman#ASN2	730,2,2,{
+in_moc_16,25,90,1	script	Guildsman#ASN2	4_M_JOB_ASSASSIN,2,2,{
 	mes "[Assassin 'Khai']";
 	mes "Umm?!";
 	emotion e_gasp;
@@ -1094,7 +1094,7 @@ OnTouch:
 	}
 }
 
-in_moc_16,21,165,2	script	Standby Room#ASNTEST	725,{
+in_moc_16,21,165,2	script	Standby Room#ASNTEST	4_F_JOB_ASSASSIN,{
 	end;
 
 OnInit:
@@ -1121,7 +1121,7 @@ OnStart:
 	end;
 }
 
-in_moc_16,21,165,2	script	Test Guide#ASN	725,4,4,{
+in_moc_16,21,165,2	script	Test Guide#ASN	4_F_JOB_ASSASSIN,4,4,{
 	end;
 
 OnTouch:
@@ -1444,7 +1444,7 @@ in_moc_16,86,147,0	duplicate(SinTrap)	18_2	-1,0,0
 in_moc_16,87,146,0	duplicate(SinTrap)	18_3	-1,0,0
 in_moc_16,87,147,0	duplicate(SinTrap)	18_4	-1,0,0
 
-in_moc_16,87,137,0	script	Keeper of the Door#ASN	45,2,1,{
+in_moc_16,87,137,0	script	Keeper of the Door#ASN	WARPNPC,2,1,{
 OnInit:
 	disablenpc "Keeper of the Door#ASN";
 	end;
@@ -1492,7 +1492,7 @@ OnMyMobDead:
 	end;
 }
 
-in_moc_16,89,98,1	script	Thomas#ASNTEST	118,5,1,{
+in_moc_16,89,98,1	script	Thomas#ASNTEST	2_M_THIEFMASTER,5,1,{
 	end;
 
 OnTouch:
@@ -1582,7 +1582,7 @@ OnDisable:
 	end;
 }
 
-in_moc_16,87,48,2	script	Barcardi#ASN	725,2,2,{
+in_moc_16,87,48,2	script	Barcardi#ASN	4_F_JOB_ASSASSIN,2,2,{
 OnTouch:
 	donpcevent "timestopper#1::OnDisable";
 	donpcevent "Thomas#ASNTEST::OnDisable";
@@ -1596,7 +1596,7 @@ OnTouch:
 	end;
 }
 
-in_moc_16,182,169,0	script	Maze Assistant	45,1,1,{
+in_moc_16,182,169,0	script	Maze Assistant	WARPNPC,1,1,{
 OnTouch:
 	if (ASSIN_Q == 5 || ASSIN_Q == 6) {
 		warp "in_moc_16",181,183;
@@ -1633,7 +1633,7 @@ OnCast:
 	end;
 }
 
-in_moc_16,149,80,4	script	Guildmaster#ASN2	106,1,1,{
+in_moc_16,149,80,4	script	Guildmaster#ASN2	1_M_MOC_LORD,1,1,{
 OnTouch:
 	savepoint "morocc",100,100;
 	if (ASSIN_Q == 7 && BaseJob == Job_Thief) {
@@ -2172,7 +2172,7 @@ OnTouch:
 	}
 }
 
-in_moc_16,186,81,1	script	Master Assist	55,1,1,{
+in_moc_16,186,81,1	script	Master Assist	1_M_JOBTESTER,1,1,{
 	mes "[Assistent Gayle Maroubitz]";
 	mes "Sorry, but I'm not in charge of job changes. Go to the Guildmaster, as he has told you.";
 	close;
@@ -2246,10 +2246,10 @@ OnInit:
 	disablenpc strnpcinfo(0);
 	end;
 }
-in_moc_16,156,87,1	duplicate(#moc_assin_dup)	[Huey]	55
-in_moc_16,156,85,1	duplicate(#moc_assin_dup)	[Khai]	730
-in_moc_16,156,83,1	duplicate(#moc_assin_dup)	[The Anonymous One]	106
-in_moc_16,156,81,2	duplicate(#moc_assin_dup)	[Barcardi]	725
-in_moc_16,156,79,1	duplicate(#moc_assin_dup)	[Beholder]	118
-in_moc_16,156,77,1	duplicate(#moc_assin_dup)	[Thomas]	118
-in_moc_16,156,75,1	duplicate(#moc_assin_dup)	[Gayle Maroubitz]	55
+in_moc_16,156,87,1	duplicate(#moc_assin_dup)	[Huey]	1_M_JOBTESTER
+in_moc_16,156,85,1	duplicate(#moc_assin_dup)	[Khai]	4_M_JOB_ASSASSIN
+in_moc_16,156,83,1	duplicate(#moc_assin_dup)	[The Anonymous One]	1_M_MOC_LORD
+in_moc_16,156,81,2	duplicate(#moc_assin_dup)	[Barcardi]	4_F_JOB_ASSASSIN
+in_moc_16,156,79,1	duplicate(#moc_assin_dup)	[Beholder]	2_M_THIEFMASTER
+in_moc_16,156,77,1	duplicate(#moc_assin_dup)	[Thomas]	2_M_THIEFMASTER
+in_moc_16,156,75,1	duplicate(#moc_assin_dup)	[Gayle Maroubitz]	1_M_JOBTESTER
diff --git a/npc/jobs/2-1/blacksmith.txt b/npc/jobs/2-1/blacksmith.txt
index f58158be3..c8cfd8a2d 100644
--- a/npc/jobs/2-1/blacksmith.txt
+++ b/npc/jobs/2-1/blacksmith.txt
@@ -40,7 +40,7 @@
 //= 2.8 Removed the need for use of 'goto.' [L0ne_W0lf]
 //==============================================================
 
-ein_in01,18,28,4	script	Guildsman#BLS	731,{
+ein_in01,18,28,4	script	Guildsman#BLS	4_M_JOB_BLACKSMITH,{
 	if (Upper == 1) {
 		mes "[Altiregen]";
 		mes "Hey hey. I don't have time for chit-chat, I'm a pretty busy guy. There's all these Merchants working hard to become Blacksmiths.";
@@ -276,7 +276,7 @@ ein_in01,18,28,4	script	Guildsman#BLS	731,{
 	}
 }
 
-ein_in01,201,27,3	script	Guildsman#alberta	63,{
+ein_in01,201,27,3	script	Guildsman#alberta	1_M_SMITH,{
 	mes "[Geschupenschte]";
 	mes "Hello there!";
 	mes "I'm ^8E6B23Geschupenschte^000000,";
@@ -931,7 +931,7 @@ ein_in01,201,27,3	script	Guildsman#alberta	63,{
 	}
 }
 
-geffen,46,164,1	script	Baisulist#BLS	69,{
+geffen,46,164,1	script	Baisulist#BLS	1_F_04,{
 	if (BSMITH_Q == 9 && countitem(1610) > 0) {
 		mes "[Baisulist]";
 		mes "Oh, hello!";
@@ -1006,7 +1006,7 @@ geffen,46,164,1	script	Baisulist#BLS	69,{
 	}
 }
 
-morocc,27,112,4	script	Wickebine#BLS	725,{
+morocc,27,112,4	script	Wickebine#BLS	4_F_JOB_ASSASSIN,{
 	if (BSMITH_Q == 10 && countitem(1219) > 0) {
 		cutin "Job_Black_hucke01",2;
 		mes "[Wickebine]";
@@ -1107,7 +1107,7 @@ morocc,27,112,4	script	Wickebine#BLS	725,{
 	}
 }
 
-lighthalzen,209,80,4	script	Krongast#BLS	734,{
+lighthalzen,209,80,4	script	Krongast#BLS	4_M_JOB_KNIGHT2,{
 	if (BSMITH_Q == 11 && countitem(1119) > 0) {
 		mes "[Krongast]";
 		mes "Ohhhhhh~";
@@ -1185,7 +1185,7 @@ lighthalzen,209,80,4	script	Krongast#BLS	734,{
 	}
 }
 
-payon,214,79,4	script	Talpiz#BLS	59,{
+payon,214,79,4	script	Talpiz#BLS	1_M_ORIENT01,{
 	if (BSMITH_Q == 12 && countitem(1713) > 0) {
 		mes "[Talpiz]";
 		mes "Oh~";
@@ -1259,7 +1259,7 @@ payon,214,79,4	script	Talpiz#BLS	59,{
 	}
 }
 
-hugel,168,183,1	script	Bismarc#BLS	118,{
+hugel,168,183,1	script	Bismarc#BLS	2_M_THIEFMASTER,{
 	if (BSMITH_Q == 13 && countitem(1122) > 0) {
 		mes "[Bismarc]";
 		mes "Sweet God...";
@@ -1356,7 +1356,7 @@ hugel,168,183,1	script	Bismarc#BLS	118,{
 	}
 }
 
-ein_in01,24,41,5	script	Blacksmith Guildsman#moc	726,{
+ein_in01,24,41,5	script	Blacksmith Guildsman#moc	4_F_JOB_BLACKSMITH,{
 	if (BSMITH_Q == 16) {
 		emotion e_hmm;
 		mes "[Mitehmaeeuh]";
@@ -1578,7 +1578,7 @@ ein_in01,24,41,5	script	Blacksmith Guildsman#moc	726,{
 	}
 }
 
-geffen_in,109,170,3	script	Blacksmith Guildsman#gef	726,{
+geffen_in,109,170,3	script	Blacksmith Guildsman#gef	4_F_JOB_BLACKSMITH,{
 	mes "[Blacksmith Guildsman]";
 	mes "Good day, are you here to visit Blacksmith Guild?";
 	next;
diff --git a/npc/jobs/2-1/hunter.txt b/npc/jobs/2-1/hunter.txt
index 326ef5fbb..d8e36f6af 100644
--- a/npc/jobs/2-1/hunter.txt
+++ b/npc/jobs/2-1/hunter.txt
@@ -55,7 +55,7 @@
 
 // Notices in the old Hunter Guild.
 //============================================================
-in_hunter,99,99,4	script	Hunter Info#hnt::HntNotice	727,{
+in_hunter,99,99,4	script	Hunter Info#hnt::HntNotice	4_F_JOB_HUNTER,{
 	mes "============Notice ============";
 	mes "We would like to inform that the Hunter Job Change Location";
 	mes "has been moved to ^ff0000Hugel^000000 in the Schwaltzvalt Republic.";
@@ -72,11 +72,11 @@ in_hunter,99,99,4	script	Hunter Info#hnt::HntNotice	727,{
 	close;
 }
 
-pay_fild10,148,252,3	duplicate(HntNotice)	Job Change Location#hu	857
+pay_fild10,148,252,3	duplicate(HntNotice)	Job Change Location#hu	4_BOARD3
 
 // Actual Job quest start
 //============================================================
-hu_in01,386,373,4	script	Hunter Guildsman#hnt	727,{
+hu_in01,386,373,4	script	Hunter Guildsman#hnt	4_F_JOB_HUNTER,{
 	if (Upper == 1) {
 		mes "[Hunter Sherin]";
 		mes "Oh, how have you been? It's been a long time, hasn't it?";
@@ -468,7 +468,7 @@ hu_in01,386,373,4	script	Hunter Guildsman#hnt	727,{
 	close;
 }
 
-hu_in01,382,382,4	script	Guild Receptionist#hnt	732,{
+hu_in01,382,382,4	script	Guild Receptionist#hnt	4_M_JOB_HUNTER,{
 	if (HNTR_Q == 2) {
 		mes "[Guild Receptionist]";
 		mes "Greetings. They call me... ^660000The Demon Hunter^000000. I am the one in charge of processing applications. Your name is ... " + strcharinfo(0) + ", correct?";
@@ -612,7 +612,7 @@ hu_in01,382,382,4	script	Guild Receptionist#hnt	732,{
 	}
 }
 
-payon_in03,131,7,3	script	Hunter#htnGM	59,{
+payon_in03,131,7,3	script	Hunter#htnGM	1_M_ORIENT01,{
 	if (HNTR_Q == 10) {
 		mes "[Hunter Guildmaster]";
 		mes "Hmpf. You must be here for the Hunter job test. Let me tell you about the testing process. What would you like to know?";
@@ -765,7 +765,7 @@ payon_in03,131,7,3	script	Hunter#htnGM	59,{
 	}
 }
 
-payon_in02,21,31,1	script	Hunter#htnGM2	59,{
+payon_in02,21,31,1	script	Hunter#htnGM2	1_M_ORIENT01,{
 	cutin "job_huntermaster",2;
 	if (HNTR_Q == 11) {
 		mes "[Hunter Guildmaster]";
@@ -966,7 +966,7 @@ payon_in02,21,31,1	script	Hunter#htnGM2	59,{
 	}
 }
 
-job_hunte,178,32,1	script	Guide#hnt	107,5,2,{
+job_hunte,178,32,1	script	Guide#hnt	1_M_PAY_ELDER,5,2,{
 OnTouch:
 	if (HNTR_Q == 12) {
 		mes "[Guide]";
@@ -1023,7 +1023,7 @@ OnTouch:
 	end;
 }
 
-job_hunte,178,38,1	script	Waiting Room#hnt	66,{
+job_hunte,178,38,1	script	Waiting Room#hnt	1_F_01,{
 	end;
 
 OnInit:
@@ -1042,7 +1042,7 @@ OnStart:
 	end;
 }
 
-job_hunte,1,1,1	script	Manager#hnt	66,{
+job_hunte,1,1,1	script	Manager#hnt	1_F_01,{
 OnInit:
 	disablenpc "Manager#hnt";
 	end;
@@ -1203,7 +1203,7 @@ OnTimer197000:
 	end;
 }
 
-job_hunte,93,101,1	script	Switch#hnt	723,1,1,{
+job_hunte,93,101,1	script	Switch#hnt	1_SHADOW_NPC,1,1,{
 OnTouch:
 	mes "^3355FFThere are 3 buttons";
 	mes "on the escape switch.^000000";
@@ -1246,7 +1246,7 @@ OnEnable:
 	end;
 }
 
-job_hunte,89,139,0	script	exit#hnttest	45,2,2,{
+job_hunte,89,139,0	script	exit#hnttest	WARPNPC,2,2,{
 OnInit:
 	disablenpc "exit#hnttest";
 	end;
@@ -1633,7 +1633,7 @@ job_hunte,64,92,0	duplicate(HntTrap)	57-1	-1,0,0
 job_hunte,64,93,0	duplicate(HntTrap)	57-2	-1,0,0
 job_hunte,65,92,0	duplicate(HntTrap)	57-3	-1,0,0
 
-job_hunte,65,93,0	script	57-4::HntTrap2	-1,{
+job_hunte,65,93,0	script	1_M_LIBRARYMASTER-4::HntTrap2	-1,{
 OnTouch:
 	mapannounce "job_hunte",strcharinfo(0) + ", has failed me! Go back to where you started!",bc_map;
 	set HNTR_Q,13;
diff --git a/npc/jobs/2-1/knight.txt b/npc/jobs/2-1/knight.txt
index cde608454..0b988998e 100644
--- a/npc/jobs/2-1/knight.txt
+++ b/npc/jobs/2-1/knight.txt
@@ -40,7 +40,7 @@
 //= 3.3 Fixed missing changequest. [Joseph]
 //============================================================
 
-prt_in,88,101,4	script	Chivalry Captain#knt	56,{
+prt_in,88,101,4	script	Chivalry Captain#knt	1_M_KNIGHTMASTER,{
 	mes "[Captain Herman]";
 	if (Upper == 1) {
 		mes "Hm? You're... What is it about you? I've been an honorable Knight for a long time, but I cannot understand this feeling I'm getting from you...";
@@ -464,7 +464,7 @@ L_Mission:
 	}
 }
 
-prt_in,75,107,4	script	Sir Andrew#knt	65,{
+prt_in,75,107,4	script	Sir Andrew#knt	1_M_YOUNGKNIGHT,{
 	mes "[Sir Andrew]";
 	if (BaseJob != Job_Swordman) {
 		if (BaseJob == Job_Knight) {
@@ -668,7 +668,7 @@ prt_in,75,107,4	script	Sir Andrew#knt	65,{
 	}
 }
 
-prt_in,71,91,0	script	Sir Siracuse#knt	65,{
+prt_in,71,91,0	script	Sir Siracuse#knt	1_M_YOUNGKNIGHT,{
 	mes "[Sir Siracuse]";
 	if (BaseJob != Job_Swordman) {
 		if (BaseJob == Job_Knight) {
@@ -1053,7 +1053,7 @@ prt_in,71,91,0	script	Sir Siracuse#knt	65,{
 	}
 }
 
-prt_in,79,94,4	script	Sir Windsor#knt	733,{
+prt_in,79,94,4	script	Sir Windsor#knt	4_M_JOB_KNIGHT1,{
 	mes "[Sir Windsor]";
 	mes "...";
 	next;
@@ -1148,7 +1148,7 @@ prt_in,79,94,4	script	Sir Windsor#knt	733,{
 
 // Test 2 part 1
 //==========================================================
-job_knt,89,106,4	script	Knight Windsor#knt	733,{
+job_knt,89,106,4	script	Knight Windsor#knt	4_M_JOB_KNIGHT1,{
 	mes "[Sir Windsor]";
 	mes "...";
 	next;
@@ -1221,7 +1221,7 @@ job_knt,89,106,4	script	Knight Windsor#knt	733,{
 	}
 }
 
-job_knt,89,106,4	script	Windsor Benedict#knt	733,{
+job_knt,89,106,4	script	Windsor Benedict#knt	4_M_JOB_KNIGHT1,{
 	end;
 
 OnInit:
@@ -1443,7 +1443,7 @@ OnTimer182000:
 
 // Test 3 (Manners)
 //==========================================================
-prt_in,69,107,6	script	Lady Amy#knt	728,{
+prt_in,69,107,6	script	Lady Amy#knt	4_F_JOB_KNIGHT,{
 	mes "[Lady Amy]";
 	if (BaseJob != Job_Swordman) {
 		if (BaseJob == Job_Knight) {
@@ -1785,7 +1785,7 @@ prt_in,69,107,6	script	Lady Amy#knt	728,{
 
 // Test 4 (patience)
 //==========================================================
-prt_in,70,99,6	script	Sir Edmond#knt	734,{
+prt_in,70,99,6	script	Sir Edmond#knt	4_M_JOB_KNIGHT2,{
 	mes "[Sir Edmond]";
 	if (BaseJob != Job_Swordman) {
 		if (BaseJob == Job_Knight) {
@@ -1938,7 +1938,7 @@ prt_in,70,99,6	script	Sir Edmond#knt	734,{
 	}
 }
 
-job_knt,1,1,1	script	Timer#knt	107,{
+job_knt,1,1,1	script	Timer#knt	1_M_PAY_ELDER,{
 OnTimer300000:
 	enablenpc "Warp#knt";
 	end;
@@ -1987,7 +1987,7 @@ OnMyMobDead:
 	end;
 }
 
-job_knt,145,57,1	script	Warp#knt	107,22,22,{
+job_knt,145,57,1	script	Warp#knt	1_M_PAY_ELDER,22,22,{
 OnInit:
 	disablenpc "Warp#knt";
 	end;
@@ -2000,7 +2000,7 @@ OnTouch:
 
 // Test 5, and creates Claymores for knights
 //==========================================================
-prt_in,87,92,4	script	Sir Gray#knt	119,{
+prt_in,87,92,4	script	Sir Gray#knt	2_M_SWORDMASTER,{
 	mes "[Sir Gray]";
 	if (BaseJob != Job_Swordman) {
 		if (BaseJob == Job_Knight) {
diff --git a/npc/jobs/2-1/priest.txt b/npc/jobs/2-1/priest.txt
index cca2860a0..e5aceea72 100644
--- a/npc/jobs/2-1/priest.txt
+++ b/npc/jobs/2-1/priest.txt
@@ -30,7 +30,7 @@
 //= 2.6 Removed the need for use of 'goto.' [L0ne_W0lf]
 //==========================================================
 
-prt_church,16,41,4	script	High Bishop#prst	60,{
+prt_church,16,41,4	script	High Bishop#prst	1_M_PASTOR,{
 	// Uncomment the following 'if' statement to allow High Priests to assist Acolytes with the job change quest.
 	// Officially High Priests are blocked from helping by an indiscriminate check if you are a transcended character.
 	//if (Class == Job_High_Priest) set .@AllowHPAssist,1;
@@ -530,7 +530,7 @@ prt_church,16,41,4	script	High Bishop#prst	60,{
 	}
 }
 
-prt_church,27,24,1	script	Sister Cecilia	79,{
+prt_church,27,24,1	script	Sister Cecilia	1_F_PRIEST,{
 	mes "[Sister Cecilia]";
 	if (BaseJob != Job_Acolyte) {
 		if (BaseJob == Job_Priest) {
@@ -842,7 +842,7 @@ prt_church,27,24,1	script	Sister Cecilia	79,{
 
 // 2nd Test
 //==========================================================
-job_prist,24,187,4	script	Peter S. Alberto	110,{
+job_prist,24,187,4	script	Peter S. Alberto	4_M_MINISTER,{
 	mes "[Father Peter]";
 	if (BaseJob == Job_Priest) {
 		mes "Welcome!";
@@ -1030,7 +1030,7 @@ OnDisable:
 	end;
 }
 
-job_prist,23,187,1	script	Peter S. Alberto#2	110,{
+job_prist,23,187,1	script	Peter S. Alberto#2	4_M_MINISTER,{
 	mes "[Father Peter]";
 	if (BaseJob == Job_Priest) {
 		mes "Welcome!";
@@ -1085,7 +1085,7 @@ OnDisable:
 	end;
 }
 
--	script	Zombie_Generator#prst	110,{
+-	script	Zombie_Generator#prst	4_M_MINISTER,{
 OnInit:
 	disablenpc "Zombie_Generator#prst";
 	end;
@@ -1290,7 +1290,7 @@ OnDisable:
 	disablenpc "Zombie5_1";
 }
 
-job_prist,24,109,4	script	prst1_1	45,3,3,{
+job_prist,24,109,4	script	prst1_1	WARPNPC,3,3,{
 OnTouch:
 	set .@mobs,getvariableofnpc(.MyMobs,"Zombie_Generator#prst");
 	if (BaseJob == Job_Priest) warp "job_prist",168,17;
@@ -1533,7 +1533,7 @@ OnTouch:
 	}
 }
 
-job_prist,168,150,4	script	Baphomet#prst	736,8,1,{
+job_prist,168,150,4	script	Baphomet#prst	4_BAPHOMET,8,1,{
 OnTouch:
 	if (BaseJob == Job_Priest) {
 		mes "[Baphomet]";
@@ -1595,7 +1595,7 @@ OnTouch:
 	}
 }
 
-job_prist,168,180,4	script	prst2_1	45,3,3,{
+job_prist,168,180,4	script	prst2_1	WARPNPC,3,3,{
 OnTouch:
 	if (BaseJob == Job_Priest) warp "job_prist",98,40;
 	else if (BaseClass == Job_Acolyte) {
@@ -1607,7 +1607,7 @@ OnTouch:
 
 // 4th Test
 //==========================================================
-job_prist,1,2,1	script	Mummy_Generator	110,1,1,{
+job_prist,1,2,1	script	Mummy_Generator	4_M_MINISTER,1,1,{
 OnInit:
 	disablenpc "Mummy_Generator";
 	end;
@@ -1702,7 +1702,7 @@ OnDisable:
 	end;
 }
 
-job_prist,98,105,4	script	prst3_1	45,3,3,{
+job_prist,98,105,4	script	prst3_1	WARPNPC,3,3,{
 OnTouch:
 	if (BaseJob == Job_Priest) {
 		warp "prt_church",15,36;
diff --git a/npc/jobs/2-1/wizard.txt b/npc/jobs/2-1/wizard.txt
index 549ebcc95..b1b4d05ab 100644
--- a/npc/jobs/2-1/wizard.txt
+++ b/npc/jobs/2-1/wizard.txt
@@ -27,7 +27,7 @@
 //= 3.3 Fixed waitingroom bug. [Euphy]
 //============================================================
 
-gef_tower,111,37,4	script	Wizard Guildsman	70,{
+gef_tower,111,37,4	script	Wizard Guildsman	1_F_GYPSY,{
 	if (Upper == 1) {
 		mes "[Catherine]";
 		mes "? Excuse me, I am wondering if we have met before...?";
@@ -446,7 +446,7 @@ gef_tower,111,37,4	script	Wizard Guildsman	70,{
 	}
 }
 
-gef_tower,102,24,2	script	Gloomy Wizard	735,{
+gef_tower,102,24,2	script	Gloomy Wizard	4_M_JOB_WIZARD,{
 	if (BaseJob != Job_Mage) {
 		if (BaseJob == Job_Wizard) {
 			mes "[Raulel]";
@@ -1053,7 +1053,7 @@ gef_tower,102,24,2	script	Gloomy Wizard	735,{
 	}
 }
 
-job_wiz,50,165,4	script	Arena Assistant	700,{
+job_wiz,50,165,4	script	Arena Assistant	8_F_GIRL,{
 	mes "[Arena Assistant]";
 	mes "Welcome to the Wizard Job Change Arena.";
 	mes "If you would like to take the final test, then please enter the waiting room.";
@@ -1086,7 +1086,7 @@ OnStart:
 
 // Water Room (Test 2 part 1)
 //==========================================================
-job_wiz,1,1,1	script	Room of Water	66,{
+job_wiz,1,1,1	script	Room of Water	1_F_01,{
 OnInit:
 	disablenpc "Room of Water";
 	end;
@@ -1180,7 +1180,7 @@ OnTimer186000:
 	end;
 }
 
-job_wiz,1,2,1	script	Room of Water#Door	66,{
+job_wiz,1,2,1	script	Room of Water#Door	1_F_01,{
 OnInit:
 	disablenpc "Room of Water#Door";
 	end;
@@ -1259,7 +1259,7 @@ OnTouch:
 
 // Earth Room (Test 2 part 2)
 //==========================================================
-job_wiz,1,3,1	script	Room of Earth	66,{
+job_wiz,1,3,1	script	Room of Earth	1_F_01,{
 OnInit:
 	disablenpc "Room of Earth";
 	end;
@@ -1354,7 +1354,7 @@ OnTimer186000:
 	end;
 }
 
-job_wiz,1,4,1	script	Room of Earth#Door	66,{
+job_wiz,1,4,1	script	Room of Earth#Door	1_F_01,{
 OnInit:
 	disablenpc "Room of Earth#Door";
 	end;
@@ -1439,7 +1439,7 @@ OnTouch:
 
 // Fire Room (Test 2 part 3)
 //==========================================================
-job_wiz,1,5,1	script	Room of Fire	66,{
+job_wiz,1,5,1	script	Room of Fire	1_F_01,{
 OnInit:
 	disablenpc "Room of Fire";
 	end;
@@ -1532,7 +1532,7 @@ OnTimer186000:
 	end;
 }
 
-job_wiz,1,6,1	script	Room of Fire#Door	66,{
+job_wiz,1,6,1	script	Room of Fire#Door	1_F_01,{
 OnInit:
 	disablenpc "Room of Fire#Door";
 	end;
@@ -1619,7 +1619,7 @@ OnTouch:
 	end;
 }
 
-job_wiz,1,7,1	script	Test Helper#wiz	66,{
+job_wiz,1,7,1	script	Test Helper#wiz	1_F_01,{
 	end;
 
 OnInit:
@@ -1657,7 +1657,7 @@ OnTimer9000:
 	end;
 }
 
-gef_tower,107,36,4	script	White Dog#wiz	81,{
+gef_tower,107,36,4	script	White Dog#wiz	4_DOG01,{
 	if (BaseJob != Job_Mage) {
 		if (BaseJob == Job_Wizard) {
 			mes "[Maria]";
diff --git a/npc/jobs/2-1a/AssassinCross.txt b/npc/jobs/2-1a/AssassinCross.txt
index ff15ab302..a9fdee622 100644
--- a/npc/jobs/2-1a/AssassinCross.txt
+++ b/npc/jobs/2-1a/AssassinCross.txt
@@ -13,7 +13,7 @@
 //= 1.3 Now saves/restores all the quest skills [Lupus]
 //============================================================
 
-valkyrie,44,58,5	script	Assassin Cross#Valkyrie	725,{
+valkyrie,44,58,5	script	Assassin Cross#Valkyrie	4_F_JOB_ASSASSIN,{
 	if (ADVJOB == 0 || Upper != 1) {
 		set .@karma_d,rand(1,10);
 		if (.@karma_d > 4) {
diff --git a/npc/jobs/2-1a/HighPriest.txt b/npc/jobs/2-1a/HighPriest.txt
index 9c6109dba..e7dffe9b9 100644
--- a/npc/jobs/2-1a/HighPriest.txt
+++ b/npc/jobs/2-1a/HighPriest.txt
@@ -13,7 +13,7 @@
 //= 1.3 Now saves/restores all the quest skills [Lupus]
 //============================================================
 
-valkyrie,44,42,5	script	High Priest#Valkyrie	60,{
+valkyrie,44,42,5	script	High Priest#Valkyrie	1_M_PASTOR,{
 	if (ADVJOB == 0 || Upper != 1) {
 		set .@karma_d,rand(1,10);
 		if (.@karma_d > 4) {
diff --git a/npc/jobs/2-1a/HighWizard.txt b/npc/jobs/2-1a/HighWizard.txt
index 6a152a5cb..12517e04c 100644
--- a/npc/jobs/2-1a/HighWizard.txt
+++ b/npc/jobs/2-1a/HighWizard.txt
@@ -13,7 +13,7 @@
 //= 1.3 Now saves/restores all the quest skills [Lupus]
 //============================================================
 
-valkyrie,44,47,5	script	High Wizard#Valkyrie	735,{
+valkyrie,44,47,5	script	High Wizard#Valkyrie	4_M_JOB_WIZARD,{
 	if (ADVJOB == 0 ||  Upper != 1) {
 		set .@karma_d,rand(1,10);
 		if (.@karma_d > 4) {
diff --git a/npc/jobs/2-1a/LordKnight.txt b/npc/jobs/2-1a/LordKnight.txt
index f1254c08a..eb310e360 100644
--- a/npc/jobs/2-1a/LordKnight.txt
+++ b/npc/jobs/2-1a/LordKnight.txt
@@ -13,7 +13,7 @@
 //= 1.3 Now saves/restores all the quest skills [Lupus]
 //============================================================
 
-valkyrie,44,39,5	script	Lord Knight#Valkyrie	56,{
+valkyrie,44,39,5	script	Lord Knight#Valkyrie	1_M_KNIGHTMASTER,{
 	if (ADVJOB == 0 || Upper != 1) {
 		set .@karma_d,rand(1,10);
 		if (.@karma_d > 4) {
diff --git a/npc/jobs/2-1a/Sniper.txt b/npc/jobs/2-1a/Sniper.txt
index de9b8e44e..c7060cdf6 100644
--- a/npc/jobs/2-1a/Sniper.txt
+++ b/npc/jobs/2-1a/Sniper.txt
@@ -13,7 +13,7 @@
 //= 1.3 Now saves/restores all the quest skills [Lupus]
 //============================================================
 
-valkyrie,44,55,5	script	Sniper#Valkyrie	727,{
+valkyrie,44,55,5	script	Sniper#Valkyrie	4_F_JOB_HUNTER,{
 	if (ADVJOB == 0 || Upper != 1) {
 		set .@karma_d,rand(1,10);
 		if (.@karma_d > 4) {
diff --git a/npc/jobs/2-1a/WhiteSmith.txt b/npc/jobs/2-1a/WhiteSmith.txt
index 174fb2582..d917d3988 100644
--- a/npc/jobs/2-1a/WhiteSmith.txt
+++ b/npc/jobs/2-1a/WhiteSmith.txt
@@ -13,7 +13,7 @@
 //= 1.3 Now saves/restores all the quest skills [Lupus]
 //============================================================
 
-valkyrie,44,50,5	script	MasterSmith#Valkyrie	731,{
+valkyrie,44,50,5	script	MasterSmith#Valkyrie	4_M_JOB_BLACKSMITH,{
 	if (ADVJOB == 0 || Upper != 1) {
 		set .@karma_d,rand(1,10);
 		if (.@karma_d > 4) {
diff --git a/npc/jobs/2-1e/StarGladiator.txt b/npc/jobs/2-1e/StarGladiator.txt
index d5797edd3..ca04c46c9 100644
--- a/npc/jobs/2-1e/StarGladiator.txt
+++ b/npc/jobs/2-1e/StarGladiator.txt
@@ -17,7 +17,7 @@
 //= 1.3 Added Quest Log commands. [Kisuka]
 //============================================================
 
-payon,215,102,3	script	Moohyun#job_star	828,3,3,{
+payon,215,102,3	script	Moohyun#job_star	4_M_ROGUE,3,3,{
 	if (Class == Job_Taekwon) {
 		if (STGL_Q == 0) {
 			mes "[Moohyun]";
@@ -353,7 +353,7 @@ OnTouch:
 	close;
 }
 	
-comodo,172,230,3	script	Wandering Master#job_sta	730,{
+comodo,172,230,3	script	Wandering Master#job_sta	4_M_JOB_ASSASSIN,{
 	if (Class == Job_Taekwon) {
 		if (STGL_Q == 1) {
 			mes "[Moogang]";
@@ -816,7 +816,7 @@ comodo,172,230,3	script	Wandering Master#job_sta	730,{
 	close;
 }
 
-job_star,29,33,0	script	Daru#job_star	59,{
+job_star,29,33,0	script	Daru#job_star	1_M_ORIENT01,{
 	if (Class == Job_Taekwon) {
 		if (STGL_Q == 3) {
 			mes "[Daru]";
@@ -1101,7 +1101,7 @@ job_star,29,33,0	script	Daru#job_star	59,{
 	close;
 }
 
-job_star,95,33,0	script	Beeryu#job_star	106,{
+job_star,95,33,0	script	Beeryu#job_star	1_M_MOC_LORD,{
 	if (Class == Job_Taekwon) {
 		if (STGL_Q == 4) {
 			mes "[Beeryu]";
@@ -1413,7 +1413,7 @@ job_star,95,33,0	script	Beeryu#job_star	106,{
 	close;
 }
 
-job_star,161,33,0	script	Cheehee#job_star	77,{
+job_star,161,33,0	script	Cheehee#job_star	1_F_ORIENT_03,{
 	if (Class == Job_Taekwon) {
 		if (STGL_Q == 6) {
 			mes "[Cheehee]";
diff --git a/npc/jobs/2-2/alchemist.txt b/npc/jobs/2-2/alchemist.txt
index e0ea187ea..59504aadd 100644
--- a/npc/jobs/2-2/alchemist.txt
+++ b/npc/jobs/2-2/alchemist.txt
@@ -17,7 +17,7 @@
 //= 3.0 Removed the need for use of 'goto.' [L0ne_W0lf]
 //============================================================
 
-alde_alche,27,185,5	script	Alchemist Guildsman#am	744,{
+alde_alche,27,185,5	script	Alchemist Guildsman#am	4_F_ALCHE,{
 	mes "[Parmy Gianino]";
 	if (Upper == 1) {
 		mes "Welcome to the";
@@ -320,7 +320,7 @@ alde_alche,27,185,5	script	Alchemist Guildsman#am	744,{
 	}
 }
 
-alde_alche,175,107,3	script	Fastidious Alchemist#am	749,{
+alde_alche,175,107,3	script	Fastidious Alchemist#am	4_M_ALCHE_B,{
 	mes "[Raspuchin Gregory]";
 	if (BaseJob != Job_Merchant) {
 		if (BaseJob == Job_Alchemist) {
@@ -789,7 +789,7 @@ alde_alche,175,107,3	script	Fastidious Alchemist#am	749,{
 	close;
 }
 
-alde_alche,13,15,7	script	Studying Man#am	750,{
+alde_alche,13,15,7	script	Studying Man#am	4_M_ALCHE_C,{
 	if (checkweight(1201,1) == 0) {
 		mes "- Wait a minute! -";
 		mes "- Currently you are carrying -";
@@ -1333,7 +1333,7 @@ alde_alche,13,15,7	script	Studying Man#am	750,{
 	}
 }
 
-alde_alche,79,19,5	script	Experiment Expert#am	748,{
+alde_alche,79,19,5	script	Experiment Expert#am	4_M_ALCHE_A,{
 	mes "[Van Helmont]";
 	if (BaseJob != Job_Merchant) {
 		if (BaseJob == Job_Alchemist) {
@@ -1585,7 +1585,7 @@ alde_alche,79,19,5	script	Experiment Expert#am	748,{
 	}
 }
 
-alde_alche,101,184,4	script	Master Alchemist#am	122,{
+alde_alche,101,184,4	script	Master Alchemist#am	2_M_DYEINGER,{
 	cutin "job_alche_vincent",2;
 	mes "[Vincent Carsciallo]";
 	if (Upper == 1) {
@@ -1767,7 +1767,7 @@ alde_alche,101,184,4	script	Master Alchemist#am	122,{
 	}
 }
 
-alde_alche,145,19,1	script	Chief Researcher#am	57,{
+alde_alche,145,19,1	script	Chief Researcher#am	1_M_LIBRARYMASTER,{
 	if (checkweight(1201,1) == 0) {
 		mes "- Wait a minute! -";
 		mes "- Currently you are carrying -";
diff --git a/npc/jobs/2-2/bard.txt b/npc/jobs/2-2/bard.txt
index 3b7c5d509..6bb4945a6 100644
--- a/npc/jobs/2-2/bard.txt
+++ b/npc/jobs/2-2/bard.txt
@@ -25,7 +25,7 @@
 
 // Ayealo
 //============================================================
-comodo,226,123,5	script	Wandering Bard	741,{
+comodo,226,123,5	script	Wandering Bard	2_M_BARD_ORIENT,{
 	if(Upper == 1) {
 		mes "[Lalo]";
 		mes "Chosen ones who are destined to become Gods";
diff --git a/npc/jobs/2-2/crusader.txt b/npc/jobs/2-2/crusader.txt
index e11a45382..ba841ea5e 100644
--- a/npc/jobs/2-2/crusader.txt
+++ b/npc/jobs/2-2/crusader.txt
@@ -34,7 +34,7 @@
 
 // Senior Crusader: 1st Collect Items Test
 //============================================================
-prt_castle,45,169,5	script	Senior Crusader	752,{
+prt_castle,45,169,5	script	Senior Crusader	4_M_CRU_OLD,{
 	mes "[Michael Halig]";
 	if (Upper == 1) { //the baby classes were totally blocked... due to missing == 1
 		mes "Go and train yourself in preparation for the holy war that is coming. Victory will be in the hands of those who are most ready to receive it.";
@@ -314,7 +314,7 @@ prt_castle,45,169,5	script	Senior Crusader	752,{
 
 // Suffering Man: 2nd Endurance Test
 //============================================================
-prt_castle,164,32,1	script	Man in Anguish	733,{
+prt_castle,164,32,1	script	Man in Anguish	4_M_JOB_KNIGHT1,{
 	mes "[Murnak Mijoul]";
 	if(BaseJob != Job_Swordman) {
 		if (BaseJob == Job_Crusader) {
@@ -448,7 +448,7 @@ prt_castle,164,32,1	script	Man in Anguish	733,{
 
 // Gabriel Valentine: 3rd Knowledge Test
 //============================================================
-prt_church,95,127,3	script	Crusader	745,{
+prt_church,95,127,3	script	Crusader	4_F_CRU,{
 	mes "[Gabriel Valentine]";
 	if(BaseJob != Job_Swordman) {
 		if (BaseJob == Job_Crusader) {
@@ -797,7 +797,7 @@ prt_church,95,127,3	script	Crusader	745,{
 
 // Crusader: 4th Purification Test
 //============================================================
-prt_castle,35,151,5	script	Patron Knight	751,{
+prt_castle,35,151,5	script	Patron Knight	4_M_CRU,{
 	mes "[Bliant Piyord]";
 	mes "Welcome.";
 	if(BaseJob != Job_Swordman) {
@@ -1202,7 +1202,7 @@ OnDead:
 }
 
 
-job_cru,98,105,4	script	 Summoner#cr5	45,3,3,{
+job_cru,98,105,4	script	 Summoner#cr5	WARPNPC,3,3,{
 OnTouch:
 	set CRUS_Q,6;
 	changequest 3010,3011;
@@ -1213,7 +1213,7 @@ OnTouch:
 //----------------------------------------------------------------------------
 // Purification Test
 //----------------------------------------------------------------------------
-job_cru,24,187,4	script	Patron Knight#2	751,{
+job_cru,24,187,4	script	Patron Knight#2	4_M_CRU,{
 	mes "[Bliant Piyord]";
 	mes "Welcome.";
 	mes "You will take";
@@ -1230,7 +1230,7 @@ job_cru,24,187,4	script	Patron Knight#2	751,{
 	close;
 }
 
-job_cru,24,187,2	script	Waiting Room#cr1	700,{
+job_cru,24,187,2	script	Waiting Room#cr1	8_F_GIRL,{
 	end;
 
 OnInit:
@@ -1408,7 +1408,7 @@ OnDead:
 	end;
 }
 
-job_cru,168,180,4	script	Monster Summon#cr5	45,3,3,{
+job_cru,168,180,4	script	Monster Summon#cr5	WARPNPC,3,3,{
 OnInit:
 	disablenpc "Monster Summon#cr5";
 	end;
diff --git a/npc/jobs/2-2/dancer.txt b/npc/jobs/2-2/dancer.txt
index 88157d40b..4075ce51f 100644
--- a/npc/jobs/2-2/dancer.txt
+++ b/npc/jobs/2-2/dancer.txt
@@ -21,7 +21,7 @@
 //= 3.7a Fixed a label execution. [Euphy]
 //============================================================
 
-comodo,180,153,4	script	Sonotora#1	90,{
+comodo,180,153,4	script	Sonotora#1	4_F_01,{
 	mes "[Athena Sonotora]";
 	mes "They say the";
 	mes "famous dance school";
@@ -41,7 +41,7 @@ comodo,180,153,4	script	Sonotora#1	90,{
 	close;
 }
 
-comodo,193,151,4	script	Bor Robin#1	86,{
+comodo,193,151,4	script	Bor Robin#1	4_M_04,{
 	mes "[Bor Robin]";
 	mes "Aah....";
 	mes "A prima donna";
@@ -74,7 +74,7 @@ comodo,193,151,4	script	Bor Robin#1	86,{
 	close;
 }
 
-job_duncer,43,93,4	script	Aile#da	724,{
+job_duncer,43,93,4	script	Aile#da	4_F_07,{
 	if (Upper == 1) {
 		mes "[Aile]";
 		mes "One two three four,";
@@ -408,7 +408,7 @@ job_duncer,43,93,4	script	Aile#da	724,{
 	}
 }
 
-job_duncer,95,93,4	script	Bijou#da	101,{
+job_duncer,95,93,4	script	Bijou#da	4W_F_01,{
 	if (SkillPoint) {
 		mes "[Bijou]";
 		mes "You can't change jobs";
@@ -893,7 +893,7 @@ job_duncer,95,93,4	script	Bijou#da	101,{
 
 // Waiting Room
 //============================================================
-job_duncer,32,154,1	script	Waiting Room#dance	66,{
+job_duncer,32,154,1	script	Waiting Room#dance	1_F_01,{
 	end;
 
 OnInit:
@@ -918,7 +918,7 @@ OnEnable:
 	end;
 }
 
-job_duncer,32,154,1	script	Waiting Room#click	66,{
+job_duncer,32,154,1	script	Waiting Room#click	1_F_01,{
 	mes "[Pyorgin]";
 	mes "Please wait in";
 	mes "the waiting room.";
@@ -1322,7 +1322,7 @@ OnDisable:
 
 // Backup Dancers
 //============================================================
-job_duncer,63,110,4	script	Backdancer#1	724,{
+job_duncer,63,110,4	script	Backdancer#1	4_F_07,{
 	end;
 
 OnSmile:
@@ -1340,7 +1340,7 @@ OnOmg:
 	end;
 }
 
-job_duncer,66,113,4	script	Backdancer#2	724,{
+job_duncer,66,113,4	script	Backdancer#2	4_F_07,{
 	end;
 
 OnSmile:
@@ -1352,7 +1352,7 @@ OnOmg:
 	end;
 }
 
-job_duncer,72,113,4	script	Backdancer#3	724,{
+job_duncer,72,113,4	script	Backdancer#3	4_F_07,{
 	end;
 
 OnSmile:
@@ -1364,7 +1364,7 @@ OnOmg:
 	end;
 }
 
-job_duncer,75,110,4	script	Backdancer#4	724,{
+job_duncer,75,110,4	script	Backdancer#4	4_F_07,{
 	end;
 
 OnSmile:
diff --git a/npc/jobs/2-2/monk.txt b/npc/jobs/2-2/monk.txt
index ddcce606c..221828908 100644
--- a/npc/jobs/2-2/monk.txt
+++ b/npc/jobs/2-2/monk.txt
@@ -16,7 +16,7 @@
 //= 2.5 Removed the need for use of 'goto.' [L0ne_W0lf]
 //============================================================
 
-prt_monk,59,247,1	script	Guarding Monk#mk	120,6,2,{
+prt_monk,59,247,1	script	Guarding Monk#mk	2_M_PHARMACIST,6,2,{
 	if (Upper == 1) {
 		mes "[Tohobu]";
 		mes "Hmm? What business do you have here?";
@@ -321,7 +321,7 @@ OnTouch:
 	end;
 }
 
-monk_in,99,58,1	script	Sensei Moohae#mk	60,{
+monk_in,99,58,1	script	Sensei Moohae#mk	1_M_PASTOR,{
 	mes "[Sensei Moohae]";
 	mes "Greetings, you seem to be on a pure path.";
 	mes "Come in, come in, what can I do for you today?";
@@ -901,7 +901,7 @@ monk_in,99,58,1	script	Sensei Moohae#mk	60,{
 	}
 }
 
-prt_monk,251,255,1	script	Touha#mk	79,{
+prt_monk,251,255,1	script	Touha#mk	1_F_PRIEST,{
 	if (MONK_Q >= 10 && MONK_Q < 14) {
 		if (MONK_Q == 10) {
 			mes "[Touha]";
@@ -1680,7 +1680,7 @@ prt_monk,251,255,1	script	Touha#mk	79,{
 	}
 }
 
-prt_monk,57,179,1	script	Boohae#mk	110,{
+prt_monk,57,179,1	script	Boohae#mk	4_M_MINISTER,{
 	if (MONK_Q == 14 && BaseJob == Job_Acolyte) {
 		mes "[Boohae]";
 		mes "...";
@@ -1846,7 +1846,7 @@ prt_monk,57,179,1	script	Boohae#mk	110,{
 	}
 }
 
-prt_monk,199,169,3	script	Door Keeper#mk	746,{
+prt_monk,199,169,3	script	Door Keeper#mk	4_F_MONK,{
 	mes "[Keeper Chorip]";
 	mes "....this place is for those";
 	mes " in testing for becoming a monk.";
@@ -1879,7 +1879,7 @@ prt_monk,199,169,3	script	Door Keeper#mk	746,{
 	}
 }
 
-monk_test,329,61,3	script	Bashu#mk	753,{
+monk_test,329,61,3	script	Bashu#mk	4_M_MONK,{
 	if (MONK_Q > 14 && MONK_Q < 25) {
 		if (MONK_Q == 15) {
 			mes "[Bashu]";
@@ -1930,7 +1930,7 @@ monk_test,329,61,3	script	Bashu#mk	753,{
 	}
 }
 
-monk_test,386,388,4	script	Apprentice Monk#mk	110,{
+monk_test,386,388,4	script	Apprentice Monk#mk	4_M_MINISTER,{
 	mes "[Monk Apprentice]";
 	mes "W... welcome!";
 	mes "Th... this place is for testing the tolerance of monk candidates!";
@@ -1965,7 +1965,7 @@ monk_test,386,388,4	script	Apprentice Monk#mk	110,{
 	close;
 }
 
-monk_test,387,350,0	script	Supervisor#race_monk	45,2,2,{
+monk_test,387,350,0	script	Supervisor#race_monk	WARPNPC,2,2,{
 OnTouch:
 	if (MONK_Q >= 15 && MONK_Q <= 23) {
 		set MONK_Q,MONK_Q+1;
@@ -2023,7 +2023,7 @@ monk_test,387,42,0	duplicate(MonkTrap)	Trap#t_monk7_2	-1,1,0
 monk_test,389,43,0	duplicate(MonkTrap)	Trap#t_monk7_3	-1
 monk_test,389,42,0	duplicate(MonkTrap)	Trap#t_monk7_4	-1
 
-job_monk,225,180,1	script	Hyunmoo#mk	89,{
+job_monk,225,180,1	script	Hyunmoo#mk	4_M_ORIENT02,{
 	if ((countitem(1069) > 0 || countitem(1070) > 0) && (countitem(1069) < 30 || countitem(1070) < 30)) {
 		mes "[Hyunmoo]";
 		mes "You didn't bring enough mushrooms... go get some more.";
@@ -2115,7 +2115,7 @@ job_monk,225,180,1	script	Hyunmoo#mk	89,{
 	}
 }
 
-prt_monk,225,180,1	script	Hyunmoo#mk2	89,{
+prt_monk,225,180,1	script	Hyunmoo#mk2	4_M_ORIENT02,{
 	if (MONK_Q < 25) {
 		mes "[Hyunmoo]";
 		mes "As I see vegetables growing, I feel myself growing within.";
@@ -2156,7 +2156,7 @@ prt_monk,225,180,1	script	Hyunmoo#mk2	89,{
 	}
 }
 
-monk_test,319,139,1	script	Tomoon#mk	52,{
+monk_test,319,139,1	script	Tomoon#mk	1_M_HOF,{
 	if (MONK_Q == 25) {
 		mes "[Tomoon]";
 		mes "Welcome young one.";
@@ -2227,7 +2227,7 @@ monk_test,319,139,1	script	Tomoon#mk	52,{
 	}
 }
 
-monk_test,82,85,1	script	Proctor#mk	95,{
+monk_test,82,85,1	script	Proctor#mk	4_F_SISTER,{
 	mes "[Proctor]";
 	mes "So, are you ready to undergo the spiritual training?";
 	next;
@@ -2319,7 +2319,7 @@ OnDisable:
 	end;
 }
 
-monk_test,166,278,0	script	exit_monk#1	45,1,1,{
+monk_test,166,278,0	script	exit_monk#1	WARPNPC,1,1,{
 OnTouch:
 	mes "[Proctor]";
 	mes "You did well. Please return to Tomoon, he's waiting for you.";
@@ -2334,7 +2334,7 @@ OnTouch:
 	end;
 }
 
-monk_test,88,91,1	script	Proctor#mk2	52,{
+monk_test,88,91,1	script	Proctor#mk2	1_M_HOF,{
 	mes "[Proctor]";
 	mes "So, are you ready to undergo this spiritual training?";
 	next;
@@ -2426,7 +2426,7 @@ OnDisable:
 	end;
 }
 
-monk_test,166,178,0	script	exit_monk#2	45,1,1,{
+monk_test,166,178,0	script	exit_monk#2	WARPNPC,1,1,{
 OnTouch:
 	mes "[Proctor]";
 	mes "You did well. Please return to Tomoon, he's waiting for you.";
@@ -2441,7 +2441,7 @@ OnTouch:
 	end;
 }
 
-monk_test,95,85,1	script	Proctor#btl#3	79,{
+monk_test,95,85,1	script	Proctor#btl#3	1_F_PRIEST,{
 	mes "[Proctor]";
 	mes "So, are you ready to undergo this spiritual training?";
 	next;
@@ -2533,7 +2533,7 @@ OnDisable:
 	end;
 }
 
-monk_test,270,278,0	script	exit_monk#3	45,1,1,{
+monk_test,270,278,0	script	exit_monk#3	WARPNPC,1,1,{
 OnTouch:
 	mes "[Proctor]";
 	mes "You did well. Please return to Tomoon, he's waiting for you.";
@@ -2575,7 +2575,7 @@ OnEnable:
 	end;
 }
 
-monk_test,137,338,1	script	switchreset#monkmonk	79,{
+monk_test,137,338,1	script	switchreset#monkmonk	1_F_PRIEST,{
 	mes "Grrrr...";
 	mes "All monsters in the monk job chance place have been reset.";
 	mes "Timer's activated.";
diff --git a/npc/jobs/2-2/rogue.txt b/npc/jobs/2-2/rogue.txt
index 4c7b5ac4f..4ce7fe424 100644
--- a/npc/jobs/2-2/rogue.txt
+++ b/npc/jobs/2-2/rogue.txt
@@ -21,7 +21,7 @@
 //= 2.9 Added Quest Log commands. [Kisuka]
 //============================================================
 
-moc_ruins,86,103,1	script	Thug#rg	118,{
+moc_ruins,86,103,1	script	Thug#rg	2_M_THIEFMASTER,{
 	mes "[Thug]";
 	mes "*Sigh...*";
 	mes "What is life?";
@@ -52,7 +52,7 @@ moc_ruins,86,103,1	script	Thug#rg	118,{
 	close;
 }
 
-in_rogue,363,122,4	script	Rogue Guildsman#rg	747,{
+in_rogue,363,122,4	script	Rogue Guildsman#rg	4_F_ROGUE,{
 	if (Upper == 1) {
 		mes "[Markie]";
 		mes "Eh? You...you...?!";
@@ -487,7 +487,7 @@ in_rogue,363,122,4	script	Rogue Guildsman#rg	747,{
 	}
 }
 
-in_rogue,376,23,1	script	Mr. Smith#rg	57,{
+in_rogue,376,23,1	script	Mr. Smith#rg	1_M_LIBRARYMASTER,{
 	if (ROGUE_Q == 2) {
 		mes "[Mr. Smith]";
 		mes "Welcome to";
@@ -1009,7 +1009,7 @@ S_CheckItems:
 	close;
 }
 
-cmd_fild09,106,195,0	script	Warp#1	45,1,1,{
+cmd_fild09,106,195,0	script	Warp#1	WARPNPC,1,1,{
 OnTouch:
 	mes "[???]";
 	mes "Who's there?!";
@@ -1079,7 +1079,7 @@ OnTouch:
 	}
 }
 
-cmd_fild09,335,143,0	script	Warp#2	45,1,1,{
+cmd_fild09,335,143,0	script	Warp#2	WARPNPC,1,1,{
 OnTouch:
 	mes "[???]";
 	mes "Who's there?!";
@@ -1149,7 +1149,7 @@ OnTouch:
 	}
 }
 
-cmd_fild04,304,180,0	script	Warp#3	45,1,1,{
+cmd_fild04,304,180,0	script	Warp#3	WARPNPC,1,1,{
 OnTouch:
 	mes "[???]";
 	mes "Who's there?!";
@@ -1219,7 +1219,7 @@ OnTouch:
 	}
 }
 
-in_rogue,272,135,1	script	Hermanthorn Jr#rg	85,{
+in_rogue,272,135,1	script	Hermanthorn Jr#rg	4_M_03,{
 	if (ROGUE_Q == 8) {
 		mes "[HermanthornJr.]";
 		mes "I see...";
@@ -1269,7 +1269,7 @@ in_rogue,272,135,1	script	Hermanthorn Jr#rg	85,{
 	}
 }
 
-in_rogue,270,130,0	script	he_to_rogue#rg	45,1,1,{
+in_rogue,270,130,0	script	he_to_rogue#rg	WARPNPC,1,1,{
 OnTouch:
 	mes "^3355FFThe door is locked. You'll need to enter the four number combination to open it.^000000";
 	next;
@@ -1382,7 +1382,7 @@ OnMyMobDead:
 	end;
 }
 
-in_rogue,9,389,0	script	oneway_to_gu	45,1,1,{
+in_rogue,9,389,0	script	oneway_to_gu	WARPNPC,1,1,{
 OnTouch:
 	donpcevent "gen_ro#4::OnDisable";
 	set ROGUE_Q,17;
@@ -1390,7 +1390,7 @@ OnTouch:
 	end;
 }
 
-in_rogue,244,39,1	script	Aragham Junior#rg	99,{
+in_rogue,244,39,1	script	Aragham Junior#rg	4W_M_03,{
 	if (ROGUE_Q == 9) {
 		mes "[Aragham Jr.]";
 		mes "Oh, you must be";
@@ -1476,7 +1476,7 @@ in_rogue,244,39,1	script	Aragham Junior#rg	99,{
 	}
 }
 
-in_rogue,160,34,1	script	Hollgrehenn junior#rg	85,{
+in_rogue,160,34,1	script	Hollgrehenn junior#rg	4_M_03,{
 	if (ROGUE_Q == 11) {
 		mes "[Hollgrehenn Jr.]";
 		mes "Huh...";
@@ -1562,7 +1562,7 @@ in_rogue,160,34,1	script	Hollgrehenn junior#rg	85,{
 	}
 }
 
-in_rogue,177,109,1	script	Antonio junior#rg	88,{
+in_rogue,177,109,1	script	Antonio junior#rg	4_M_ORIENT01,{
 	if (ROGUE_Q == 10) {
 		mes "[Antonio Jr.]";
 		mes "You're from";
@@ -1647,7 +1647,7 @@ in_rogue,177,109,1	script	Antonio junior#rg	88,{
 	}
 }
 
-in_rogue,370,320,0	script	quest_out	45,1,1,{
+in_rogue,370,320,0	script	quest_out	WARPNPC,1,1,{
 OnTouch:
 	set ROGUE_Q,16;
 	warp "in_rogue",378,113;
@@ -1988,7 +1988,7 @@ OnInit:
 	end;
 }
 
-in_rogue,399,286,1	script	switch#rogreset	88,{
+in_rogue,399,286,1	script	switch#rogreset	4_M_ORIENT01,{
 	mes "^F08080Tah dah~";
 	mes "Monsters for the";
 	mes "Rogue Job Change";
diff --git a/npc/jobs/2-2/sage.txt b/npc/jobs/2-2/sage.txt
index a425495b3..4f93ba7db 100644
--- a/npc/jobs/2-2/sage.txt
+++ b/npc/jobs/2-2/sage.txt
@@ -27,7 +27,7 @@
 //= 2.8 Removed the need for use of 'goto.' [L0ne_W0lf]
 //============================================================
 
-yuno_in02,38,61,5	script	Dean of the Academy#sa	743,{
+yuno_in02,38,61,5	script	Dean of the Academy#sa	2_M_SAGE_OLD,{
 	cutin "job_sage_kayron",2;
 	mes "[Kayron Grik]";
 	if (Upper == 1) {
@@ -193,7 +193,7 @@ yuno_in02,38,61,5	script	Dean of the Academy#sa	743,{
 	end;
 }
 
-yuno_in03,154,35,4	script	Staff of the Academy#a	742,{
+yuno_in03,154,35,4	script	Staff of the Academy#a	2_M_SAGE_B,{
 	mes "[Metheus Sylphe]";
 	if (Upper == 1) {
 		mes "Welcome to the";
@@ -634,7 +634,7 @@ yuno_in03,154,35,4	script	Staff of the Academy#a	742,{
 	}
 }
 
-yuno_in03,105,177,5	script	Written Test Professor#s	754,{
+yuno_in03,105,177,5	script	Written Test Professor#s	4_M_SAGE_A,{
 	mes "[Claytos Verdo]";
 	if (BaseJob != Job_Mage) {
 		if (BaseJob == Job_Sage) {
@@ -1054,7 +1054,7 @@ L_AskQuestions:
 }
 
 //Practical Examination Professer
-yuno_in03,169,180,3	script	Practical Examination P	755,{
+yuno_in03,169,180,3	script	Practical Examination P	4_M_SAGE_C,{
 	mes "[Hermes Tris]";
 	if (BaseJob != Job_Mage) {
 		if (BaseJob == Job_Sage) {
@@ -1255,7 +1255,7 @@ yuno_in03,169,180,3	script	Practical Examination P	755,{
 	}
 }
 
-yuno_in03,62,176,2	script	History Professor#sa	109,{
+yuno_in03,62,176,2	script	History Professor#sa	4_M_MANAGER,{
 	mes "[Saphien Layless]";
 	if (BaseJob != Job_Mage) {
 		if (BaseJob == Job_Sage) {
@@ -1696,7 +1696,7 @@ yuno_in03,62,176,2	script	History Professor#sa	109,{
 	}
 }
 
-yuno_in03,32,102,1	script	Biology Professor#sa	755,{
+yuno_in03,32,102,1	script	Biology Professor#sa	4_M_SAGE_C,{
 	mes "[Lucius Celsus]";
 	if (BaseJob != Job_Mage) {
 		if (BaseJob == Job_Sage) {
@@ -2123,7 +2123,7 @@ yuno_in03,32,102,1	script	Biology Professor#sa	755,{
 	}
 }
 
-yuno_in03,244,31,3	script	Physics Professor#sa	120,{
+yuno_in03,244,31,3	script	Physics Professor#sa	2_M_PHARMACIST,{
 	mes "[Aebecee George]";
 	if (BaseJob != Job_Mage) {
 		if (BaseJob == Job_Sage) {
@@ -2542,7 +2542,7 @@ yuno_in03,244,31,3	script	Physics Professor#sa	120,{
 	}
 }
 
-job_sage,50,165,4	script	Test Helper#talk	700,{
+job_sage,50,165,4	script	Test Helper#talk	8_F_GIRL,{
 	mes "[Test Helper]";
 	mes "Welcome to the Sage practical examination hall.";
 	mes "If you wish to take the test right now, please enter the waiting room.";
@@ -2557,7 +2557,7 @@ job_sage,50,165,4	script	Test Helper#talk	700,{
 	close;
 }
 
-job_sage,50,165,4	script	Waiting Room#sg	700,{
+job_sage,50,165,4	script	Waiting Room#sg	8_F_GIRL,{
 	end;
 
 OnInit:
@@ -2577,7 +2577,7 @@ OnEnable:
 	end;
 }
 
--	script	Arena#1	66,{
+-	script	Arena#1	1_F_01,{
 OnInit:
 	disablenpc "Arena#1";
 	end;
diff --git a/npc/jobs/2-2a/Champion.txt b/npc/jobs/2-2a/Champion.txt
index 706722504..7f0f743cd 100644
--- a/npc/jobs/2-2a/Champion.txt
+++ b/npc/jobs/2-2a/Champion.txt
@@ -13,7 +13,7 @@
 //= 1.3 Now saves/restores all the quest skills [Lupus]
 //============================================================
 
-valkyrie,53,42,3	script	Champion#Valkyrie	52,{
+valkyrie,53,42,3	script	Champion#Valkyrie	1_M_HOF,{
 	if (ADVJOB == 0 || Upper != 1) {
 		set .@karma_d,rand(1,10);
 		if (.@karma_d > 4) {
diff --git a/npc/jobs/2-2a/Clown.txt b/npc/jobs/2-2a/Clown.txt
index 3c007abe7..1d9b200bf 100644
--- a/npc/jobs/2-2a/Clown.txt
+++ b/npc/jobs/2-2a/Clown.txt
@@ -15,7 +15,7 @@
 //=     Thanks to Myllena.
 //============================================================
 
-valkyrie,53,54,3	script	Minstrel#Valkyrie	741,{
+valkyrie,53,54,3	script	Minstrel#Valkyrie	2_M_BARD_ORIENT,{
 	if (ADVJOB == 0 || Upper != 1) {
 		set .@karma_d,rand(1,10);
 		if (.@karma_d > 4) {
diff --git a/npc/jobs/2-2a/Creator.txt b/npc/jobs/2-2a/Creator.txt
index 0c93c49b2..a8a81f0c9 100644
--- a/npc/jobs/2-2a/Creator.txt
+++ b/npc/jobs/2-2a/Creator.txt
@@ -13,7 +13,7 @@
 //= 1.3 Now saves/restores all the quest skills [Lupus]
 //============================================================
 
-valkyrie,53,50,3	script	Biochemist#Valkyrie	122,{
+valkyrie,53,50,3	script	Biochemist#Valkyrie	2_M_DYEINGER,{
 	if (ADVJOB == 0 || Upper != 1) {
 		set .@karma_d,rand(1,10);
 		if (.@karma_d > 4) {
diff --git a/npc/jobs/2-2a/Gypsy.txt b/npc/jobs/2-2a/Gypsy.txt
index f0a2c2c18..f8d80cc29 100644
--- a/npc/jobs/2-2a/Gypsy.txt
+++ b/npc/jobs/2-2a/Gypsy.txt
@@ -13,7 +13,7 @@
 //= 1.3 Now saves/restores all the quest skills [Lupus]
 //============================================================
 
-valkyrie,53,56,3	script	Gypsy#Valkyrie	101,{
+valkyrie,53,56,3	script	Gypsy#Valkyrie	4W_F_01,{
 	if (ADVJOB == 0 || Upper != 1) {
 		set .@karma_d,rand(1,10);
 		if (.@karma_d > 4) {
diff --git a/npc/jobs/2-2a/Paladin.txt b/npc/jobs/2-2a/Paladin.txt
index ea240bba2..9bd6a46f0 100644
--- a/npc/jobs/2-2a/Paladin.txt
+++ b/npc/jobs/2-2a/Paladin.txt
@@ -13,7 +13,7 @@
 //= 1.3 Now saves/restores all the quest skills [Lupus]
 //============================================================
 
-valkyrie,53,39,3	script	Paladin#Valkyrie	752,{
+valkyrie,53,39,3	script	Paladin#Valkyrie	4_M_CRU_OLD,{
 	if (ADVJOB == 0 || Upper != 1) {
 		set .@karma_d,rand(1,10);
 		if (.@karma_d > 4) {
diff --git a/npc/jobs/2-2a/Professor.txt b/npc/jobs/2-2a/Professor.txt
index cffe3c0e4..b42e1627a 100644
--- a/npc/jobs/2-2a/Professor.txt
+++ b/npc/jobs/2-2a/Professor.txt
@@ -13,7 +13,7 @@
 //= 1.3 Now saves/restores all the quest skills [Lupus]
 //============================================================
 
-valkyrie,53,47,3	script	Scholar#Valkyrie	743,{
+valkyrie,53,47,3	script	Scholar#Valkyrie	2_M_SAGE_OLD,{
 	if (ADVJOB == 0 || Upper != 1) {
 		set .@karma_d,rand(1,10);
 		if (.@karma_d > 4) {
diff --git a/npc/jobs/2-2a/Stalker.txt b/npc/jobs/2-2a/Stalker.txt
index 6f6f86235..fbc1e060c 100644
--- a/npc/jobs/2-2a/Stalker.txt
+++ b/npc/jobs/2-2a/Stalker.txt
@@ -13,7 +13,7 @@
 //= 1.3 Now saves/restores all the quest skills [Lupus]
 //============================================================
 
-valkyrie,53,58,3	script	Stalker#Valkyrie	747,{
+valkyrie,53,58,3	script	Stalker#Valkyrie	4_F_ROGUE,{
 	if (ADVJOB == 0 || Upper != 1) {
 		set .@karma_d,rand(1,10);
 		if (.@karma_d > 4) {
diff --git a/npc/jobs/2-2e/SoulLinker.txt b/npc/jobs/2-2e/SoulLinker.txt
index 98e8084c1..225b4ee7b 100644
--- a/npc/jobs/2-2e/SoulLinker.txt
+++ b/npc/jobs/2-2e/SoulLinker.txt
@@ -21,7 +21,7 @@
 //= 1.6 Updated to match the latest official script. [Euphy]
 //============================================================
 
-morocc_in,174,30,6	script	Kid#link1	716,{
+morocc_in,174,30,6	script	Kid#link1	4_M_KID2,{
 	if (Class == Job_Soul_Linker) {
 		mes "[Maia]";
 		mes "Best of luck in your";
@@ -489,9 +489,9 @@ OnTouch:
 	end;
 }
 
-job_soul,35,30,6	duplicate(SLTester)	Maia#link6	716
+job_soul,35,30,6	duplicate(SLTester)	Maia#link6	4_M_KID2
 
-job_soul,30,35,6	script	Monk Spirit#link4	827,{
+job_soul,30,35,6	script	Monk Spirit#link4	4_M_GRANDMONK,{
 	if (SOUL_Q == 2) {
 		mes "[Monk Spirit]";
 		mes "Who am I...?";
@@ -536,7 +536,7 @@ job_soul,30,35,6	script	Monk Spirit#link4	827,{
 	close;
 }
 
-job_soul,30,25,7	script	Sage Spirit#link5	754,{
+job_soul,30,25,7	script	Sage Spirit#link5	4_M_SAGE_A,{
 	if (SOUL_Q == 2) {
 		mes "[Sage Spirit]";
 		mes "Speak to Maia.";
@@ -585,7 +585,7 @@ job_soul,30,25,7	script	Sage Spirit#link5	754,{
 	close;
 }
 
-job_soul,25,30,5	script	Alchemist Spirit#link7	744,{
+job_soul,25,30,5	script	Alchemist Spirit#link7	4_F_ALCHE,{
 	if (SOUL_Q == 2) {
 		mes "[Alchemist Spirit]";
 		mes "Oh! I really want to";
@@ -631,7 +631,7 @@ job_soul,25,30,5	script	Alchemist Spirit#link7	744,{
 	close;
 }
 
-job_soul,1,5,0	script	Timer#link3	111,{
+job_soul,1,5,0	script	Timer#link3	HIDDEN_NPC,{
 	end;
 
 OnEnable:
@@ -663,7 +663,7 @@ OnTimer183000:
 	stopnpctimer;
 }
 
-sec_in02,35,153,0	script	Soul Linker Var	871,{
+sec_in02,35,153,0	script	Soul Linker Var	4_M_OPERATION,{
 	callfunc "F_GM_NPC";
 	mes "[Soul Linker Var]";
 	mes "I can reset the Soul Linker";
diff --git a/npc/jobs/novice/supernovice.txt b/npc/jobs/novice/supernovice.txt
index 434ead038..cf9ea7b87 100644
--- a/npc/jobs/novice/supernovice.txt
+++ b/npc/jobs/novice/supernovice.txt
@@ -18,7 +18,7 @@
 //= 2.4 Added an Ex. Super Novice dialog check. [Euphy]
 //============================================================
 
-aldeba_in,223,167,3	script	Tzerero#sn	709,{
+aldeba_in,223,167,3	script	Tzerero#sn	4_M_SEAMAN,{
 	if (BaseJob == Job_SuperNovice) {
 		mes "[Tzerero]";
 		mes "I trust that you are enjoying";
@@ -326,7 +326,7 @@ aldeba_in,223,167,3	script	Tzerero#sn	709,{
 	}
 }
 
-aldeba_in,216,169,5	script	Esseray#sn	86,{
+aldeba_in,216,169,5	script	Esseray#sn	4_M_04,{
 	if (Class == Job_Super_Novice_E || Class == Job_Super_Baby_E) {
 		mes "[Esseray]";
 		mes "You! Stronger than before.";
@@ -382,7 +382,7 @@ aldeba_in,216,169,5	script	Esseray#sn	86,{
 	}
 }
 
-aldebaran,54,238,5	script	Kafra Employee#sn	117,{
+aldebaran,54,238,5	script	Kafra Employee#sn	4_F_KAFRA1,{
 	if (BaseJob == Job_SuperNovice) {
 		mes "[Kafra Employee]";
 		if (Sex )
diff --git a/npc/jobs/valkyrie.txt b/npc/jobs/valkyrie.txt
index 8b44c6d34..e105c2e4b 100644
--- a/npc/jobs/valkyrie.txt
+++ b/npc/jobs/valkyrie.txt
@@ -38,7 +38,7 @@
 //= 3.1 Added Izlude Renewal coordinates.
 //============================================================
 
-valkyrie,48,86,4	script	Valkyrie#	811,{
+valkyrie,48,86,4	script	Valkyrie#	4_F_VALKYRIE,{
 	if (ADVJOB != 0 || Upper == 1) {
 		mes "[Valkyrie]";
 		mes "Welcome";
@@ -210,7 +210,7 @@ valkyrie,48,86,4	script	Valkyrie#	811,{
 	}
 }
 
-yuno_in02,88,164,5	script	Metheus Sylphe#Library	742,{
+yuno_in02,88,164,5	script	Metheus Sylphe#Library	2_M_SAGE_B,{
 	if (BaseLevel > 98 && JobLevel > 49 && Class >= Job_Knight && Class <= Job_Crusader2) {
 		if (valkyrie_Q == 0) {
 			mes "[Metheus Sylphe]";
@@ -257,7 +257,7 @@ yuno_in02,88,164,5	script	Metheus Sylphe#Library	742,{
 	close;
 }
 
-yuno_in02,93,207,1	script	Book of Ymir	111,{
+yuno_in02,93,207,1	script	Book of Ymir	HIDDEN_NPC,{
 	if (ADVJOB != 0 || Upper == 1) {
 		mes "[The Book of Ymir]";
 		mes "...The entrance to the Hall of Honor is open to anyone who has moved forward into their next life. It is there to help heroes decide what they want to do, and can lead them to anywhere in this world.";
@@ -343,14 +343,14 @@ yuno_in02,93,207,1	script	Book of Ymir	111,{
 	close;
 }
 
-yuno_in05,49,43,1	script	Heart of Ymir	111,{
+yuno_in05,49,43,1	script	Heart of Ymir	HIDDEN_NPC,{
 	if (BaseLevel > 98 && JobLevel > 49 && Class >= Job_Knight && Class <= Job_Crusader2) {
 		if (valkyrie_Q == 2) warp "valkyrie",48,8;
 	}
 	end;
 }
 
-valkyrie,44,33,5	script	Teleporter	124,{
+valkyrie,44,33,5	script	Teleporter	4_F_TELEPORTER,{
 	if (Upper != 1) {
 		set .@karma_d,rand(1,10);
 		if (.@karma_d > 4) {