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

6 files changed, 70 insertions, 70 deletions

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]";