ItemID to Constant: re Folder

6 files changed, 144 insertions, 144 deletions

diff --git a/npc/re/jobs/3-1/archbishop.txt b/npc/re/jobs/3-1/archbishop.txt
index 05a21985a..2bb13bac5 100644
--- a/npc/re/jobs/3-1/archbishop.txt
+++ b/npc/re/jobs/3-1/archbishop.txt
@@ -517,7 +517,7 @@ OnTouch:
 		mes "^3131FF[Priest Dayan]^000000";
 		mes "^3131FFYou're drinking the Holy Water.^000000";
 		next;
-		if (countitem(523) == 0) {
+		if (countitem(Holy_Water) == 0) {
 			mes "[" + strcharinfo(0) + "]";
 			mes "Oh no! I forgot to bring a Holy Water!";
 			close;
@@ -767,7 +767,7 @@ OnInit:
 }
 
 job3_arch01,29,34,3	script	Valkyrie#arch	4_F_VALKYRIE2,{
-	if (checkweight(1201,1) == 0 || (MaxWeight - Weight) < 2000) {
+	if (checkweight(Knife,1) == 0 || (MaxWeight - Weight) < 2000) {
 		mes "- Wait a Sec !! -";
 		mes "- You are carrying too many items, -";
 		mes "- you won't be able to obtain any new items. -";
@@ -934,8 +934,8 @@ job3_arch01,29,34,3	script	Valkyrie#arch	4_F_VALKYRIE2,{
 				$@archbs = 0;
 				close2;
 				nude;
-				if (countitem(2798))
-					delitem 2798,countitem(2798); //Will_Of_Exhausted_Angel
+				if (countitem(Will_Of_Exhausted_Angel))
+					delitem Will_Of_Exhausted_Angel,countitem(Will_Of_Exhausted_Angel);
 				donpcevent "start#arch::OnEnable";
 				job_arch = 7;
 				changequest 2190,2191;
@@ -947,8 +947,8 @@ job3_arch01,29,34,3	script	Valkyrie#arch	4_F_VALKYRIE2,{
 			mes "I'm talking with another person now, so give me a second.";
 			close;
 		} else if (job_arch == 7) {
-			if (countitem(12381)) delitem 12381,countitem(12381); //ValkyrieA_Scroll
-			if (countitem(12382)) delitem 12382,countitem(12382); //ValkyrieB_Scroll
+			if (countitem(ValkyrieA_Scroll)) delitem ValkyrieA_Scroll,countitem(ValkyrieA_Scroll);
+			if (countitem(ValkyrieB_Scroll)) delitem ValkyrieB_Scroll,countitem(ValkyrieB_Scroll);
 			if ($@archbs == 0) {
 				$@archbs = 1;
 				mes "[Valkyrie Anguhilde]";
@@ -971,8 +971,8 @@ job3_arch01,29,34,3	script	Valkyrie#arch	4_F_VALKYRIE2,{
 				mes "But you have to be careful if an impersonation falls down.";
 				close2;
 				nude;
-				if (countitem(2798))
-					delitem 2798,countitem(2798); //Will_Of_Exhausted_Angel
+				if (countitem(Will_Of_Exhausted_Angel))
+					delitem Will_Of_Exhausted_Angel,countitem(Will_Of_Exhausted_Angel);
 				donpcevent "start#arch::OnEnable";
 				job_arch = 7;
 				warp "job3_arch02",119,49;
@@ -994,8 +994,8 @@ OnBc:
 
 job3_arch02,119,49,0	script	#arch_1_start	HIDDEN_WARP_NPC,6,6,{
 OnTouch:
-	if (countitem(12381) == 0)
-		getitem 12381,1; //ValkyrieA_Scroll
+	if (countitem(ValkyrieA_Scroll) == 0)
+		getitem ValkyrieA_Scroll,1;
 	mapannounce "job3_arch02","Whispering of an impersonation: I feel heavy! Set me free!",bc_map,"0xFFCE00";
 	disablenpc "#arch_1_start";
 	end;
@@ -1003,8 +1003,8 @@ OnTouch:
 
 -	script	#arch_1_01_0::archbjcq	-1,{
 OnTouch:
-	if (countitem(12381)) {
-		delitem 12381,1; //ValkyrieA_Scroll
+	if (countitem(ValkyrieA_Scroll)) {
+		delitem ValkyrieA_Scroll,1;
 		// fall through
 	} else if (getmercinfo(1) == 2037) {
 		if (strnpcinfo(0) == "#arch_1_10")
@@ -1035,8 +1035,8 @@ job3_arch02,245,289,0	duplicate(archbjcq)	#arch_1_12	HIDDEN_WARP_NPC,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
+	if (countitem(ValkyrieA_Scroll)) {
+		delitem ValkyrieA_Scroll,1;
 		// fall through
 	} else if (getmercinfo(1) == 2037) {
 		mapannounce "job3_arch02","Valkyrie's Nightmare: An incompetent illusion of Valkyrie came here with the assistance of humans. You wanna have that nightmare?",bc_map,"0xFF0000";
@@ -1140,7 +1140,7 @@ job3_arch02,113,327,5	script	Valkyrie#arch_01	4_F_VALKYRIE2,{
 	mes "[Valkyrie Anguhilde]";
 	mes "Then I look forward a good news.";
 	close2;
-	getitem 12382,1; //ValkyrieB_Scroll
+	getitem ValkyrieB_Scroll,1;
 	viewpoint 1,244,46,1,0xFFFF99;
 	hideonnpc "Valkyrie#arch_01";
 	donpcevent "#arch_2_start::OnEnable";
@@ -1151,11 +1151,11 @@ 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;
-	if (countitem(6154) < 2) {
+	if (countitem(Broken_Horn_Pipe) < 2) {
 		mes "[Valkyrie Anguhilde]";
 		mes "Hum?";
 		mes "I can see this one beside you.";
-		getitem 6154,2; //Broken_Horn_Pipe
+		getitem Broken_Horn_Pipe,2;
 		next;
 	}
 	mes "[Valkyrie Anguhilde]";
@@ -1178,7 +1178,7 @@ job3_arch02,244,46,5	script	Valkyrie#arch_02	4_F_VALKYRIE2,{
 	mes "Take care.";
 	mes "Please, hurry up!";
 	close2;
-	getitem 2798,1; //Will_Of_Exhausted_Angel
+	getitem Will_Of_Exhausted_Angel,1;
 	hideonnpc "Valkyrie#arch_02";
 	donpcevent "#arch_3_start::OnEnable";
 	end;
@@ -1192,7 +1192,7 @@ OnTouch:
 	donpcevent "#arch_3_03::OnKill";
 	donpcevent "mob#arch_2::OnKill";
 	hideoffnpc "Valkyrie Anguhilde#end";
-	if (checkweight(1201,1) == 0 || (MaxWeight - Weight) < 2000) {
+	if (checkweight(Knife,1) == 0 || (MaxWeight - Weight) < 2000) {
 		mes "- Wait a Sec !! -";
 		mes "- You are carrying too many items, -";
 		mes "- you won't be able to obtain any new items. -";
@@ -1206,7 +1206,7 @@ OnTouch:
 		mes "Please unequip your riding pet and try again!";
 		close;
 	}
-	if (countitem(6154) < 2) {
+	if (countitem(Broken_Horn_Pipe) < 2) {
 		mes "[Valkyrie Anguhilde]";
 		mes "Did you collect all of the pieces of my horn pipe?";
 		next;
@@ -1217,9 +1217,9 @@ OnTouch:
 		mes "It can be dangerous, so let's go back.";
 		close2;
 		nude;
-		if (countitem(2798))
-			delitem 2798,(2798); //Will_Of_Exhausted_Angel
-		delitem 6154,countitem(6154); //Broken_Horn_Pipe
+		if (countitem(Will_Of_Exhausted_Angel))
+			delitem Will_Of_Exhausted_Angel,(2798);
+		delitem Broken_Horn_Pipe,countitem(Broken_Horn_Pipe);
 		mapwarp "job3_arch02","job3_arch01",29,29;
 		end;
 	}
@@ -1302,13 +1302,13 @@ OnTouch:
 	mes "Don't forget an altruistic minister's spirit like today forever.";
 	mes "I hope we see each other in Valhalla sometime.";
 	nude;
-	if (countitem(2798))
-		delitem 2798,countitem(2798); //Will_Of_Exhausted_Angel
-	delitem 6154,countitem(6154); //Broken_Horn_Pipe
+	if (countitem(Will_Of_Exhausted_Angel))
+		delitem Will_Of_Exhausted_Angel,countitem(Will_Of_Exhausted_Angel);
+	delitem Broken_Horn_Pipe,countitem(Broken_Horn_Pipe);
 	job_arch = 100;
 	completequest 2191;
-	getitem 5747,1; //Mitra
-	getitem 2795,1; //Green_Apple_Ring
+	getitem Mitra,1;
+	getitem Green_Apple_Ring,1;
 	jobchange roclass(eaclass()|EAJL_THIRD);
 	close;
 OnInit:
@@ -1345,15 +1345,15 @@ OnInit:
 job3_arch02,132,323,0	script	#arch_2_01	HIDDEN_WARP_NPC,5,5,{
 	end;
 OnTouch:
-	if (countitem(12382))
+	if (countitem(ValkyrieB_Scroll))
 		mapannounce "job3_arch02","Whispering of Valkyrie: I see a new ancient scroll!",bc_map;
 	end;
 }
 
 -	script	#arch_2_02_0::archbjcq2	-1,{
 OnTouch:
-	if (countitem(12382)) {
-		delitem 12382,1; //ValkyrieB_Scroll
+	if (countitem(ValkyrieB_Scroll)) {
+		delitem ValkyrieB_Scroll,1;
 		// fall through
 	} else if (getmercinfo(1) == 2038) {
 		.@randht = rand(1,10);
@@ -1397,8 +1397,8 @@ OnTouch:
 
 job3_arch02,206,113,0	script	#arch_2_boss	HIDDEN_WARP_NPC,5,5,{
 OnTouch:
-	if (countitem(12382)) {
-		delitem 12382,1; //ValkyrieB_Scroll
+	if (countitem(ValkyrieB_Scroll)) {
+		delitem ValkyrieB_Scroll,1;
 		// fall through
 	} else if (getmercinfo(1) == 2038) {
 		mapannounce "job3_arch02","A shout of devil: You are so childish. I invite you a party of devil. I'll make you have a fun!",bc_map,"0xFF0000";
@@ -1647,10 +1647,10 @@ OnTouch:
 /*
 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
-	if (countitem(12382)) delitem 12382, countitem(12382); //ValkyrieB_Scroll
-	if (countitem(2798)) delitem 2798, countitem(2798); //Will_Of_Exhausted_Angel
+	if (countitem(Broken_Horn_Pipe)) delitem Broken_Horn_Pipe, countitem(Broken_Horn_Pipe);
+	if (countitem(ValkyrieA_Scroll)) delitem ValkyrieA_Scroll, countitem(ValkyrieA_Scroll);
+	if (countitem(ValkyrieB_Scroll)) delitem ValkyrieB_Scroll, countitem(ValkyrieB_Scroll);
+	if (countitem(Will_Of_Exhausted_Angel)) delitem Will_Of_Exhausted_Angel, countitem(Will_Of_Exhausted_Angel);
 	end;
 }
 */
diff --git a/npc/re/jobs/3-1/guillotine_cross.txt b/npc/re/jobs/3-1/guillotine_cross.txt
index 40903e32f..3d2996a28 100644
--- a/npc/re/jobs/3-1/guillotine_cross.txt
+++ b/npc/re/jobs/3-1/guillotine_cross.txt
@@ -275,7 +275,7 @@ job3_guil01,82,95,3	script	Daora#3rdgc02	4_F_DESERT,{
 				if (Zeny > 799) {
 					mes "Here you are, take it.";
 					Zeny -= 800;
-					getitem 12112,1; //Tropical_Sograt
+					getitem Tropical_Sograt,1;
 					close;
 				}
 				mes "It's 800 zeny per glass of Tropical Sograt.";
@@ -285,7 +285,7 @@ job3_guil01,82,95,3	script	Daora#3rdgc02	4_F_DESERT,{
 				if (Zeny > 799) {
 					mes "Here you are, take it.";
 					Zeny -= 800;
-					getitem 12113,1; //Vermilion_The_Beach
+					getitem Vermilion_The_Beach,1;
 					close;
 				}
 				mes "It's 800 zeny per glass of Vermilion on the Beach.";
@@ -730,7 +730,7 @@ job3_guil01,82,95,3	script	Daora#3rdgc02	4_F_DESERT,{
 						mes "Here you are. Milk.";
 						mes "Then take a rest.";
 						Zeny -= 500;
-						getitem 519,1; //Milk
+						getitem Milk,1;
 						close;
 					}
 					mes "I told you, it's 500 zeny.";
@@ -770,7 +770,7 @@ job3_guil01,82,95,3	script	Daora#3rdgc02	4_F_DESERT,{
 			if (Zeny > 799) {
 				mes "Here you are, take it.";
 				Zeny -= 800;
-				getitem 12112,1; //Tropical_Sograt
+				getitem Tropical_Sograt,1;
 				close;
 			}
 			mes "It's 800 zeny per 1 glass of Tropical Sograt.";
@@ -780,7 +780,7 @@ job3_guil01,82,95,3	script	Daora#3rdgc02	4_F_DESERT,{
 			if (Zeny > 799) {
 				mes "Here you are, take it.";
 				Zeny -= 800;
-				getitem 12113,1; //Vermilion_The_Beach
+				getitem Vermilion_The_Beach,1;
 				close;
 			}
 			mes "[Daora]";
@@ -797,7 +797,7 @@ job3_guil01,82,95,3	script	Daora#3rdgc02	4_F_DESERT,{
 					mes "I feel sorry to take 500 zeny per bottle, but I have to.";
 					mes "It's very hard to get milk in Veins.";
 					Zeny -= 500;
-					getitem 519,1; //Milk
+					getitem Milk,1;
 					close;
 				}
 				mes "Umm... I think I can't help you.";
@@ -832,7 +832,7 @@ job3_guil01,82,95,3	script	Daora#3rdgc02	4_F_DESERT,{
 			if (Zeny > 999) {
 				mes "Here you are, take it.";
 				Zeny -= 1000;
-				getitem 12112,1; //Tropical_Sograt
+				getitem Tropical_Sograt,1;
 				close;
 			}
 			mes "It's 1000 zeny per glass of Tropical Sograt.";
@@ -842,7 +842,7 @@ job3_guil01,82,95,3	script	Daora#3rdgc02	4_F_DESERT,{
 			if (Zeny > 999) {
 				mes "Here you are, take it.";
 				Zeny -= 1000;
-				getitem 12113,1; //Vermilion_The_Beach
+				getitem Vermilion_The_Beach,1;
 				close;
 			}
 			mes "It's 1000 zeny per glass of Vermilion on the Beach.";
@@ -858,7 +858,7 @@ job3_guil01,82,95,3	script	Daora#3rdgc02	4_F_DESERT,{
 }
 
 job3_guil01,16,20,4	script	Mayshell#3rdgc03	4_F_KHELLISIA,{
-	if (!checkweight(1201,2)) {
+	if (!checkweight(Knife,2)) {
 		mes "- You can't continue this quest because you have too many items. -";
 		close;
 	}
@@ -945,7 +945,7 @@ job3_guil01,16,20,4	script	Mayshell#3rdgc03	4_F_KHELLISIA,{
 		next;
 		select("Give a key to him.");
 		mes "[Mayshell]";
-		if (countitem(6150) == 0) {
+		if (countitem(Key_Of_The_Mansion) == 0) {
 			mes "You didn't bring a key?";
 			mes "I'll be in lots of trouble.";
 			close;
@@ -967,7 +967,7 @@ job3_guil01,16,20,4	script	Mayshell#3rdgc03	4_F_KHELLISIA,{
 		mes "[Mayshell]";
 		mes "This is the last step.";
 		mes "Don't make any mistakes.";
-		delitem 6150,1; //Key_Of_The_Mansion
+		delitem Key_Of_The_Mansion,1;
 		job_3rd_gc = 15;
 		changequest 7108,7109;
 		close;
@@ -1067,7 +1067,7 @@ job3_guil01,16,20,4	script	Mayshell#3rdgc03	4_F_KHELLISIA,{
 		mes "I reward you for your labor, and I'm going to give you a present.";
 		mes "I got this one from guild, I hope it's helpful to you.";
 		job_3rd_gc = 20;
-		getitem 12106,1; //Accessory_Box
+		getitem Accessory_Box,1;
 		erasequest 7091;
 		erasequest 7092;
 		erasequest 7093;
@@ -2507,7 +2507,7 @@ OnTimer61000:
 }
 
 job3_guil02,49,43,5	script	Dandelion#3rdgc12	4_M_DSTMANDEAD,{
-	if (!checkweight(1201,2)) {
+	if (!checkweight(Knife,2)) {
 		mes "- You can't continue this quest because you have too many items. -";
 		close;
 	}
@@ -2529,7 +2529,7 @@ job3_guil02,49,43,5	script	Dandelion#3rdgc12	4_M_DSTMANDEAD,{
 		mes "He passed away.";
 		mes "You find a key with a fancy decoration around his neck.";
 		job_3rd_gc = 13;
-		getitem 6150,1; //Key_Of_The_Mansion
+		getitem Key_Of_The_Mansion,1;
 		changequest 7107,7108;
 		close;
 	} else {
@@ -3610,7 +3610,7 @@ OnDisable:
 }
 
 job3_guil01,148,53,3	script	Bercasell#3rdgc16	4_M_GUILLOTINE,{
-	if (!checkweight(1201,2)) {
+	if (!checkweight(Knife,2)) {
 		mes "- You can't continue this quest because you have too many items. -";
 		close;
 	}
@@ -3700,8 +3700,8 @@ job3_guil01,148,53,3	script	Bercasell#3rdgc16	4_M_GUILLOTINE,{
 									job_3rd_gc = 28;
 									erasequest 7099;
 								}
-								getitem 2795,1; //Green_Apple_Ring
-								getitem 5755,1; //Silent_Executer
+								getitem Green_Apple_Ring,1;
+								getitem Silent_Executer,1;
 								next;
 								mes "[Bercasell]";
 								mes "And... these are presents to celebrate your becoming a Guillotine Cross.";
diff --git a/npc/re/jobs/3-1/mechanic.txt b/npc/re/jobs/3-1/mechanic.txt
index 84fb0cd08..4f74cb051 100644
--- a/npc/re/jobs/3-1/mechanic.txt
+++ b/npc/re/jobs/3-1/mechanic.txt
@@ -96,10 +96,10 @@ yuno,129,156,3	script	Chainheart	4_M_DOCTOR,{
 			job__mechanic = 12;
 			completequest 10101;
 			if (Sex)
-				getitem 5749,1; //Driver_Band
+				getitem Driver_Band,1;
 			else
-				getitem 5760,1; //Driver_Band_
-			getitem 2795,1; //Green_Apple_Ring
+				getitem Driver_Band_,1;
+			getitem Green_Apple_Ring,1;
 			jobchange roclass(eaclass()|EAJL_THIRD);
 			mes "[Chainheart]";
 			mes "This is a gift that I give to you.";
@@ -316,7 +316,7 @@ yuno,129,156,3	script	Chainheart	4_M_DOCTOR,{
 }
 
 jupe_cave,37,55,5	script	Scholar#Mechanic	4_M_ALCHE_D,{
-	if (checkweight(1201,1) == 0 || MaxWeight - Weight < 300) {
+	if (checkweight(Knife,1) == 0 || MaxWeight - Weight < 300) {
 		mes "- Your pack is too heavy. -";
 		mes "- Lighten your body first -";
 		mes "- and please try again. -";
diff --git a/npc/re/jobs/3-1/ranger.txt b/npc/re/jobs/3-1/ranger.txt
index c9943f541..35a2683ed 100644
--- a/npc/re/jobs/3-1/ranger.txt
+++ b/npc/re/jobs/3-1/ranger.txt
@@ -209,9 +209,9 @@ tur_dun01,156,36,5	script	Survival Instructor#jr01	1_M_ORIENT01,{
 				mes "Do your best.";
 				job_ranger01 = 3;
 				changequest 8255,8256;
-				getitem 1703,1; //Bow__
-				getitem 12323,10; //N_Fly_Wing
-				getitem 1750,500; //Arrow
+				getitem Bow__,1;
+				getitem N_Fly_Wing,10;
+				getitem Arrow,500;
 				close;
 			}
 			mes "I knew it.";
@@ -399,7 +399,7 @@ tur_dun01,91,169,3	script	Test Instructor#jr02	4_M_JOB_HUNTER,{
 			close;
 		} else if (job_ranger01 == 4) {
 			if (questprogress(8257,HUNTING) == 2) {
-				if (countitem(7064) > 0) {
+				if (countitem(Dragon_Fly_Wing) > 0) {
 					mes "Oh! Oh! Woooooow!";
 					mes "You've brought it! Let me see...";
 					next;
@@ -413,7 +413,7 @@ tur_dun01,91,169,3	script	Test Instructor#jr02	4_M_JOB_HUNTER,{
 					mes "[Test Instructor, Teardrop]";
 					mes "Well, before I explain, could you please give me that Dragonfly wing?";
 					mes "You've heard the saying, 'in any situation, eating comes first'?";
-					delitem 7064,1; //Dragon_Fly_Wing
+					delitem Dragon_Fly_Wing,1;
 					job_ranger01 = 5;
 					changequest 8257,8258;
 					close;
@@ -558,11 +558,11 @@ tur_dun01,91,169,3	script	Test Instructor#jr02	4_M_JOB_HUNTER,{
 					mes "You don't have as many guts as I thought.";
 					nude;
 					next;
-					if (countitem(1703) > 0) {
+					if (countitem(Bow__) > 0) {
 						mes "[Test Instructor, Teardrop]";
 						mes "Okay. I'll respect your opinion.";
 						mes "I'll cancel the job change request from "+strcharinfo(0)+".";
-						delitem 1703,1; //Bow__
+						delitem Bow__,1;
 						job_ranger01 = 0;
 						for(.@i = 8254; .@i <= 8262; ++.@i)
 							if (questprogress(.@i))
@@ -625,28 +625,28 @@ L_Start:
 		close;
 	}
 	if (getarg(0) == 1) {
-		if (countitem(12380)) {
+		if (countitem(Desert_Wolf_Babe_Scroll)) {
 			mes "[Test Instructor, Teardrop]";
 			mes "What, what is this?";
 			mes "You shouldn't keep this around!";
-			delitem 12380,countitem(12380); //Desert_Wolf_Babe_Scroll
+			delitem Desert_Wolf_Babe_Scroll,countitem(Desert_Wolf_Babe_Scroll);
 			next;
 		}
-		if (countitem(12258)) {
+		if (countitem(Bombring_Box)) {
 			mes "[Test Instructor, Teardrop]";
 			mes "What, what is this, a Bombring Capsule.";
 			mes "You shouldn't keep such a dangerous thing!";
-			delitem 12258,countitem(12258); //Bombring_Box
+			delitem Bombring_Box,countitem(Bombring_Box);
 			next;
 		}
-		if (countitem(6156)) {
+		if (countitem(Approval_Report)) {
 			mes "[Test Instructor, Teardrop]";
 			mes "What, what are all these Documents?";
 			mes "I think I know. You were going to send this to Caution, right?";
 			next;
 			mes "[Test Instructor, Teardrop]";
 			mes "If you hold such thing it would disturb your practical test so I'll take this.";
-			delitem 6156,countitem(6156); //Approval_Report
+			delitem Approval_Report,countitem(Approval_Report);
 			next;
 		}
 	}
@@ -665,7 +665,7 @@ L_Start:
 	mes "[Test Instructor, Teardrop]";
 	mes "See, for the last time, I warn you that cheating is strictly banned.";
 	next;
-	if (countitem(1750) < 100) {
+	if (countitem(Arrow) < 100) {
 		mes "[Test Instructor, Teardrop]";
 		mes "Okay, once again I'll provide you with arrows, then I'll let you in.";
 		.@arrow = 1;
@@ -681,7 +681,7 @@ L_Start:
 		erasequest 8260;
 		erasequest 8261;
 	}
-	if (.@arrow) getitem 1750,100; //Arrow
+	if (.@arrow) getitem Arrow,100;
 	close2;
 	warp "job3_rang01",30,36;
 	end;
@@ -720,11 +720,11 @@ job3_rang01,30,44,3	script	Test Waiting Room#jr_03	4_M_ORIENT01,{
 			mes "You don't have as many guts as I thought.";
 			nude;
 			next;
-			if (countitem(1703) > 0) {
+			if (countitem(Bow__) > 0) {
 				mes "[Staff DTS]";
 				mes "Okay. I'll respect your opinion.";
 				mes "I'll cancel the job change request from "+strcharinfo(0)+".";
-				delitem 1703,1; //Bow__
+				delitem Bow__,1;
 				job_ranger01 = 0;
 				for(.@i = 8254; .@i <= 8262; ++.@i)
 					if (questprogress(.@i))
@@ -1184,14 +1184,14 @@ OnTimer223000:
 
 job3_rang02,111,56,3	script	Staff Rust#jr_09	4_M_ORIENT02,{
 	if (job_ranger01 == 6) {
-		if (countitem(12258) < 1) {
+		if (countitem(Bombring_Box) < 1) {
 			percentheal 100,0;
 			specialeffect2 EF_ABSORBSPIRITS;
 			mes "[Staff Rust]";
 			mes "I'll give you the 'Bombring Capsules.";
 			mes "The 'Bombring Capsules' can be given again only for the one who used it all, so please keep that in mind.";
-			if (countitem(6156)) {
-				getitem 12258,5; //Bombring_Box
+			if (countitem(Approval_Report)) {
+				getitem Bombring_Box,5;
 				close;
 			}
 			next;
@@ -1199,9 +1199,9 @@ job3_rang02,111,56,3	script	Staff Rust#jr_09	4_M_ORIENT02,{
 			mes "[Staff Rust]";
 			mes "And the mission is.... to deliver these documents to the supervisor, Caution. He won't take what I give...";
 			setquest 8260;
-			getitem 6156, (MaxWeight-Weight-2000)/10; //Approval_Report
-			getitem 12258,10; //Bombring_Box
-			getitem 569,100; //Novice_Potion
+			getitem Approval_Report, (MaxWeight-Weight-2000)/10;
+			getitem Bombring_Box,10;
+			getitem Novice_Potion,100;
 			close;
 		}
 		mes "[Staff Rust]";
@@ -1292,7 +1292,7 @@ OnDisable:
 	end;
 OnTouch:
 	if (job_ranger01 == 6) {
-		if (countitem(12258)) {
+		if (countitem(Bombring_Box)) {
 			mes "[Test Supervisor, Caution]";
 			mes "No, no!";
 			mes "You need to use all the 'Bombring Capsules'?!";
@@ -1302,7 +1302,7 @@ OnTouch:
 			mes "Time is ticking so you'd better hurry.";
 			close;
 		}
-		if (countitem(6156) > 0) {
+		if (countitem(Approval_Report) > 0) {
 			mes "[Test Supervisor, Caution]";
 			mes "You've arrived safely!!!";
 			donpcevent "Second Test Timer#jr_08::OnDisable";
@@ -1318,7 +1318,7 @@ OnTouch:
 			mes "[Test Supervisor, Caution]";
 			mes "Haaaaaaaah!!";
 			mes "I've been avoiding him so much!!";
-			delitem 6156,countitem(6156); //Approval_Report
+			delitem Approval_Report,countitem(Approval_Report);
 			erasequest 8260;
 			next;
 			mes "[Test Supervisor, Caution]";
@@ -1487,7 +1487,7 @@ job3_rang02,251,49,3	script	Test Supervisor#jr_13	4_M_JOB_HUNTER,{
 			next;
 			mes "[Test Supervisor, Freeze]";
 			mes "Well, then first get this Wolf' flutes and after summoning the wolf, talk to me!";
-			getitem 12380,1; //Desert_Wolf_Babe_Scroll
+			getitem Desert_Wolf_Babe_Scroll,1;
 			setquest 8261;
 			close;
 		}
@@ -1506,7 +1506,7 @@ job3_rang02,251,49,3	script	Test Supervisor#jr_13	4_M_JOB_HUNTER,{
 			donpcevent "Third Test Timer#jr_12::OnEnable";
 			end;
 		}
-		if (countitem(12380) < 1) {
+		if (countitem(Desert_Wolf_Babe_Scroll) < 1) {
 			mes "Huh?! There's no wolf, no Test Flute, where did you get rid of them?!";
 			next;
 			mes "[Test Supervisor, Freeze]";
@@ -1514,7 +1514,7 @@ job3_rang02,251,49,3	script	Test Supervisor#jr_13	4_M_JOB_HUNTER,{
 			next;
 			mes "[Test Supervisor, Freeze]";
 			mes "Summon the wolf quickly, and talk to me again!";
-			getitem 12380,1; //Desert_Wolf_Babe_Scroll
+			getitem Desert_Wolf_Babe_Scroll,1;
 			close;
 		}
 		mes "Ha? What are you doing?";
@@ -1732,7 +1732,7 @@ job3_rang01,90,43,3	script	Ranger Master#jr_29	4_M_REIDIN_KURS,{
 		mes "Your firm answer seems very trustworthy!";
 		next;
 		nude;
-		if (countitem(1703) < 1) {
+		if (countitem(Bow__) < 1) {
 			mes "[Ranger Master, Neveragain]";
 			mes "Umm?";
 			mes "You need to return the borrowed stuff.";
@@ -1742,13 +1742,13 @@ job3_rang01,90,43,3	script	Ranger Master#jr_29	4_M_REIDIN_KURS,{
 		mes "[Ranger Master, Neveragain]";
 		mes "From now on be active as a splendid Ranger!";
 		mes "I wish you luck in your future!";
-		delitem 1703,1; //Bow__
+		delitem Bow__,1;
 		job_ranger01 = 8;
 		completequest 8262;
 		jobchange roclass(eaclass()|EAJL_THIRD);
-		getitem 5748,1; //Sniper_Goggle
-		getitem 2795,1; //Green_Apple_Ring
-		getitem 6124,1; //Wolf's_Flute
+		getitem Sniper_Goggle,1;
+		getitem Green_Apple_Ring,1;
+		getitem Wolf's_Flute,1;
 		close;
 	}
 	mes "Hey, you look great.";
diff --git a/npc/re/jobs/3-1/rune_knight.txt b/npc/re/jobs/3-1/rune_knight.txt
index d88519385..288f5f340 100644
--- a/npc/re/jobs/3-1/rune_knight.txt
+++ b/npc/re/jobs/3-1/rune_knight.txt
@@ -315,7 +315,7 @@ gl_knt02,150,55,3	script	Rune Knight Staff	4_M_01,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) {
+	if (checkweight(Knife,1) == 0 || MaxWeight - Weight < 1000) {
 		mes "You've got too many things. You cannot proceed anymore. Please try again after losing some weight.";
 		close;
 	}
@@ -547,8 +547,8 @@ job3_rune01,80,60,3	script	Rune Knight Captain	4_M_KNIGHT_SILVER,2,2,{
 				mes "[Captain Tigris]";
 				mes "This Knight is going to walk the way of the Rune Knights with us, so please give your blessing.";
 				next;
-				getitem 5746,1; //Rune_Circlet
-				getitem 2795,1; //Green_Apple_Ring
+				getitem Rune_Circlet,1;
+				getitem Green_Apple_Ring,1;
 				job_rune_edq = 23;
 				completequest 3219;
 				jobchange roclass(eaclass()|EAJL_THIRD);
@@ -1487,7 +1487,7 @@ job3_rune01,114,50,3	script	Rune Knight Velpino	4_M_KNIGHT_BLACK,{
 			changequest 3216,3217;
 			close;
 		} else if (job_rune_edq > 17 && job_rune_edq < 21) {
-			if (countitem(12388)+countitem(12389)+countitem(12390) == 0) {
+			if (countitem(Runstone_Crush)+countitem(Runstone_Storm)+countitem(Runstone_Millennium) == 0) {
 				mes "[Rune Knight Velpino]";
 				mes "If all of your preparations are done, I'll send you to the final test field.";
 				job_rune_edq = 18;
@@ -1511,8 +1511,8 @@ job3_rune01,114,50,3	script	Rune Knight Velpino	4_M_KNIGHT_BLACK,{
 					if (Weight < 4001) {
 						$@job_rune_test1 = 1;
 						sc_start SC_INCINT,300000,40;
-						getitem 12389,30; //Runstone_Storm
-						getitem 12390,30; //Runstone_Millennium
+						getitem Runstone_Storm,30;
+						getitem Runstone_Millennium,30;
 						if (questprogress(3220)) erasequest 3220;
 						setquest 3220;
 						warp "job3_rune02",38,40;
@@ -1535,9 +1535,9 @@ job3_rune01,114,50,3	script	Rune Knight Velpino	4_M_KNIGHT_BLACK,{
 			}
 			mes "[Rune Knight Velpino]";
 			mes "Wait, I'll collect all the rune stones provided before. There's a certain limit on using the rune stones that's made for the test.";
-			if (countitem(12388)) delitem 12388,countitem(12388); //Runstone_Crush
-			if (countitem(12389)) delitem 12389,countitem(12389); //Runstone_Storm
-			if (countitem(12390)) delitem 12390,countitem(12390); //Runstone_Millennium
+			if (countitem(Runstone_Crush)) delitem Runstone_Crush,countitem(Runstone_Crush);
+			if (countitem(Runstone_Storm)) delitem Runstone_Storm,countitem(Runstone_Storm);
+			if (countitem(Runstone_Millennium)) delitem Runstone_Millennium,countitem(Runstone_Millennium);
 			next;
 			mes "[Rune Knight Velpino]";
 			mes "I'll get new rune stones so if your preparation is all done, please talk to me again.";
@@ -1546,7 +1546,7 @@ job3_rune01,114,50,3	script	Rune Knight Velpino	4_M_KNIGHT_BLACK,{
 			mes "[Rune Knight Velpino]";
 			mes "You've been very successful up to the last test.";
 			next;
-			if (countitem(12388)+countitem(12389)+countitem(12390) == 0) {
+			if (countitem(Runstone_Crush)+countitem(Runstone_Storm)+countitem(Runstone_Millennium) == 0) {
 				mes "[Rune Knight Velpino]";
 				mes "Now all the tests you need to take are over. Go back to Captain Tigris and inform him of this test result, and then feel the deep emotion of being born again as a Rune Knight.";
 				next;
@@ -1559,9 +1559,9 @@ job3_rune01,114,50,3	script	Rune Knight Velpino	4_M_KNIGHT_BLACK,{
 			}
 			mes "[Rune Knight Velpino]";
 			mes "Wait, I'll collect all the rune stones provided before. There's a certain limit on using the rune stones that's made for the test.";
-			if (countitem(12388)) delitem 12388,countitem(12388); //Runstone_Crush
-			if (countitem(12389)) delitem 12389,countitem(12389); //Runstone_Storm
-			if (countitem(12390)) delitem 12390,countitem(12390); //Runstone_Millennium
+			if (countitem(Runstone_Crush)) delitem Runstone_Crush,countitem(Runstone_Crush);
+			if (countitem(Runstone_Storm)) delitem Runstone_Storm,countitem(Runstone_Storm);
+			if (countitem(Runstone_Millennium)) delitem Runstone_Millennium,countitem(Runstone_Millennium);
 			next;
 			mes "[Rune Knight Velpino]";
 			mes "I'll need to re-use these unused rune stones. Talk to me again once I have taken all the test rune stones.";
diff --git a/npc/re/jobs/3-1/warlock.txt b/npc/re/jobs/3-1/warlock.txt
index 5abb39f0d..981503f84 100644
--- a/npc/re/jobs/3-1/warlock.txt
+++ b/npc/re/jobs/3-1/warlock.txt
@@ -42,7 +42,7 @@ OnTouch:
 		mes " - There is a strange distortion here - ";
 		if (strnpcinfo(0) == "#distorted_space_1" && (Class == Job_Warlock || Class == Job_Warlock_T || Class == Job_Baby_Warlock)) {
 			close2;
-			if (countitem(6153) > 0)
+			if (countitem(Special_Exchange_Coupon) > 0)
 				warp "spl_in02",79,102;
 			end;
 		}
@@ -282,7 +282,7 @@ spl_in02,77,107,5	script	Assistant#Warlock1	4_M_FAIRYKID5,{
 		callsub L_Quest,1;
 		close;
 	} else if (job_wl == 4) {
-		if (countitem(6152) == 0 || countitem(6151) == 0)
+		if (countitem(Glittering_Crystal) == 0 || countitem(Peice_Of_Great_Bradium) == 0)
 			callsub L_Quest,0;
 		else {
 			mes "[Yoop]";
@@ -320,8 +320,8 @@ L_Quest:
 		mes "[Yoop]";
 		mes "Show us how strong you are. And don't forget to wear this.";
 		job_wl = 4;
-		getitem 2796,1; //Magical_Stone
-		getitem 2797,1; //Magical_Stone_
+		getitem Magical_Stone,1;
+		getitem Magical_Stone_,1;
 		changequest 11106,11107;
 		next;
 	}
@@ -349,7 +349,7 @@ spl_in02,60,231,5	script	Yoop#Warlock	4_M_FAIRYKID5,{
 		switch(select("I brought the materials.:I've lost the Magical Stones.:Nothing.")) {
 		case 1:
 			mes "[Yoop]";
-			if (countitem(6152) == 0 || countitem(6151) == 0) {
+			if (countitem(Glittering_Crystal) == 0 || countitem(Peice_Of_Great_Bradium) == 0) {
 				mes "......";
 				mes "......Where?";
 				mes "Don't bother me!";
@@ -369,12 +369,12 @@ spl_in02,60,231,5	script	Yoop#Warlock	4_M_FAIRYKID5,{
 				mes "Bring these stones with you or else you won't be able to return!";
 				mes "Be careful!";
 				close;
-			} else if (countitem(6152) && countitem(6151)) {
+			} else if (countitem(Glittering_Crystal) && countitem(Peice_Of_Great_Bradium)) {
 				if (isequipped(2796) || isequipped(2797)) {
 					mes "Bring me back the magical stones.";
 					close;
 				}
-				if (countitem(2796) == 0 || countitem(2797) == 0) {
+				if (countitem(Magical_Stone) == 0 || countitem(Magical_Stone_) == 0) {
 					mes "It seems that you don't have it?";
 					mes "You lost it?";
 					next;
@@ -385,10 +385,10 @@ spl_in02,60,231,5	script	Yoop#Warlock	4_M_FAIRYKID5,{
 				mes "Alright! All the materials are ready!";
 				mes "While I am concentrating on working on this stone. Can you go back to my master?";
 				mes "I will follow up once it's done.";
-				delitem 2796,countitem(2796); //Magical_Stone
-				delitem 2797,countitem(2797); //Magical_Stone_
-				delitem 6152,countitem(6152); //Glittering_Crystal
-				delitem 6151,countitem(6151); //Peice_Of_Great_Bradium
+				delitem Magical_Stone,countitem(Magical_Stone);
+				delitem Magical_Stone_,countitem(Magical_Stone_);
+				delitem Glittering_Crystal,countitem(Glittering_Crystal);
+				delitem Peice_Of_Great_Bradium,countitem(Peice_Of_Great_Bradium);
 				job_wl = 5;
 				changequest 11107,11108;
 				close;
@@ -408,18 +408,18 @@ spl_in02,60,231,5	script	Yoop#Warlock	4_M_FAIRYKID5,{
 				mes "It's not hard to tell if you have it or not!";
 				close;
 			case 2:
-				if ((isequipped(2796) == 0 && countitem(2796) == 0) || (isequipped(2797) == 0 && countitem(2797) == 0)) {
-					if (countitem(732) > 0) {
+				if ((isequipped(2796) == 0 && countitem(Magical_Stone) == 0) || (isequipped(2797) == 0 && countitem(Magical_Stone_) == 0)) {
+					if (countitem(Crystal_Jewel__) > 0) {
 						switch(select("Give 3 carat diamond.:Just quit it.")) {
 						case 1:
 							mes "[Yoop]";
 							mes "I will overlook your fault.";
 							mes "Please be careful with it.";
-							delitem 732,1; //Crystal_Jewel__
-							if (isequipped(2796) == 0 && countitem(2796) == 0)
-								getitem 2796,1; //Magical_Stone
-							if (isequipped(2797) == 0 && countitem(2797) == 0)
-								getitem 2797,1; //Magical_Stone_
+							delitem Crystal_Jewel__,1;
+							if (isequipped(2796) == 0 && countitem(Magical_Stone) == 0)
+								getitem Magical_Stone,1;
+							if (isequipped(2797) == 0 && countitem(Magical_Stone_) == 0)
+								getitem Magical_Stone_,1;
 							close;
 						case 2:
 							mes "[Yoop]";
@@ -479,7 +479,7 @@ spl_in02,84,103,3	script	Assistant#Warlock2	4_F_FAIRYKID4,{
 		mes "It's not me you are looking for currently.";
 		close;
 	} else if (job_wl == 6) {
-		if (checkweight(1201,1) == 0 || MaxWeight - Weight < 3500) {
+		if (checkweight(Knife,1) == 0 || MaxWeight - Weight < 3500) {
 			mes "You're carring out too many items.";
 			mes "You'd better minimize your weight.";
 			close;
@@ -497,15 +497,15 @@ spl_in02,84,103,3	script	Assistant#Warlock2	4_F_FAIRYKID4,{
 		mes "I will guide you into the magic room.";
 		job_wl = 7;
 		changequest 11109,11110;
-		getitem 12384,5; //Rainbow_Ruby_Water
-		getitem 12386,5; //Rainbow_Ruby_Wind
-		getitem 12387,5; //Rainbow_Ruby_Earth
-		getitem 12385,5; //Rainbow_Ruby_Fire
+		getitem Rainbow_Ruby_Water,5;
+		getitem Rainbow_Ruby_Wind,5;
+		getitem Rainbow_Ruby_Earth,5;
+		getitem Rainbow_Ruby_Fire,5;
 		close2;
 		warp "job3_war01",23,20;
 		end;
 	} else if (job_wl == 7) {
-		if (checkweight(1201,1) == 0 || MaxWeight - Weight < 3500) {
+		if (checkweight(Knife,1) == 0 || MaxWeight - Weight < 3500) {
 			mes "You're carring out too many items.";
 			mes "You'd better minimize your weight.";
 			close;
@@ -514,14 +514,14 @@ spl_in02,84,103,3	script	Assistant#Warlock2	4_F_FAIRYKID4,{
 		mes "Would you like to try it again?";
 		mes "Let me give you more rubies.";
 		next;
-		if (countitem(12384)) delitem 12384,countitem(12384); //Rainbow_Ruby_Water
-		if (countitem(12386)) delitem 12386,countitem(12386); //Rainbow_Ruby_Wind
-		if (countitem(12387)) delitem 12387,countitem(12387); //Rainbow_Ruby_Earth
-		if (countitem(12385)) delitem 12385,countitem(12385); //Rainbow_Ruby_Fire
-		getitem 12384,5; //Rainbow_Ruby_Water
-		getitem 12386,5; //Rainbow_Ruby_Wind
-		getitem 12387,5; //Rainbow_Ruby_Earth
-		getitem 12385,5; //Rainbow_Ruby_Fire
+		if (countitem(Rainbow_Ruby_Water)) delitem Rainbow_Ruby_Water,countitem(Rainbow_Ruby_Water);
+		if (countitem(Rainbow_Ruby_Wind)) delitem Rainbow_Ruby_Wind,countitem(Rainbow_Ruby_Wind);
+		if (countitem(Rainbow_Ruby_Earth)) delitem Rainbow_Ruby_Earth,countitem(Rainbow_Ruby_Earth);
+		if (countitem(Rainbow_Ruby_Fire)) delitem Rainbow_Ruby_Fire,countitem(Rainbow_Ruby_Fire);
+		getitem Rainbow_Ruby_Water,5;
+		getitem Rainbow_Ruby_Wind,5;
+		getitem Rainbow_Ruby_Earth,5;
+		getitem Rainbow_Ruby_Fire,5;
 		close2;
 		warp "job3_war01",23,20;
 		end;
@@ -529,10 +529,10 @@ spl_in02,84,103,3	script	Assistant#Warlock2	4_F_FAIRYKID4,{
 		mes "[Yoop]";
 		mes "You have successfully crystallized the Hollow Stone.";
 		mes "I'm sorry that I've doubted you.";
-		if (countitem(12384)) delitem 12384,countitem(12384); //Rainbow_Ruby_Water
-		if (countitem(12386)) delitem 12386,countitem(12386); //Rainbow_Ruby_Wind
-		if (countitem(12387)) delitem 12387,countitem(12387); //Rainbow_Ruby_Earth
-		if (countitem(12385)) delitem 12385,countitem(12385); //Rainbow_Ruby_Fire
+		if (countitem(Rainbow_Ruby_Water)) delitem Rainbow_Ruby_Water,countitem(Rainbow_Ruby_Water);
+		if (countitem(Rainbow_Ruby_Wind)) delitem Rainbow_Ruby_Wind,countitem(Rainbow_Ruby_Wind);
+		if (countitem(Rainbow_Ruby_Earth)) delitem Rainbow_Ruby_Earth,countitem(Rainbow_Ruby_Earth);
+		if (countitem(Rainbow_Ruby_Fire)) delitem Rainbow_Ruby_Fire,countitem(Rainbow_Ruby_Fire);
 		next;
 		mes "[Yoop]";
 		mes "All of the tests are done. Now talk to Master Engoloria.";
@@ -678,7 +678,7 @@ spl_in02,80,108,5	script	Guild Master#Warlock	4_F_FAIRY1,{
 			mes "How did you come this far...";
 			close;
 		}
-		if (checkweight(1201,1) == 0 || MaxWeight - Weight < 3500) {
+		if (checkweight(Knife,1) == 0 || MaxWeight - Weight < 3500) {
 			mes "You've got too many items.";
 			mes "Please come back after reducing the number of items you have.";
 			close;
@@ -715,8 +715,8 @@ spl_in02,80,108,5	script	Guild Master#Warlock	4_F_FAIRY1,{
 		else job_wl = 10;
 		jobchange roclass(eaclass()|EAJL_THIRD);
 		completequest 11112;
-		getitem 5753,1; //Magic_Stone_Hat
-		getitem 2795,1; //Green_Apple_Ring
+		getitem Magic_Stone_Hat,1;
+		getitem Green_Apple_Ring,1;
 		close;
 	} else if (job_wl > 9) {
 		mes "[Master Egnoloria]";