ItemID to Constant: instances/jobs Folder

23 files changed, 312 insertions, 312 deletions

diff --git a/npc/instances/EndlessTower.txt b/npc/instances/EndlessTower.txt
index 2f58b6276..b1126c0bc 100644
--- a/npc/instances/EndlessTower.txt
+++ b/npc/instances/EndlessTower.txt
@@ -44,7 +44,7 @@
 6@tower	mapflag	src4instance
 
 alberta,214,77,6	script	Captain Janssen	4_M_SEAMAN,{
-	if (checkweight(1201,1) == 0) {
+	if (checkweight(Knife,1) == 0) {
 		mes "^008800Wait here!!";
 		mes "You're carrying too much stuff. Why don't you put some of it away, and then come back.^000000";
 		close;
@@ -1203,12 +1203,12 @@ function	script	F_Tower_Warp	{
 	setarray .@map$[1],"2@tower","3@tower","4@tower";
 	.@i = select("26th Level:51st Level:76th Level");
 
-	if (countitem(6000) < .@i) {
+	if (countitem(Dark_Ashes) < .@i) {
 		mes "-Warning-";
 		mes "To warp to the "+.@level$[.@i]+" Level, you need "+.@i+" Ashes of the Darkness.";
 		close;
 	}
-	delitem 6000,.@i; //Dark_Ashes
+	delitem Dark_Ashes,.@i;
 	mapannounce instance_mapname("1@tower"), strcharinfo(0)+". You will be warped to the "+.@level$[.@i]+" Level.",bc_map,"0x00ff99";
 	warp instance_mapname(.@map$[.@i]),52,354;
 	close;
@@ -1334,7 +1334,7 @@ OnEnable:
 	end;
 
 OnTouch_:
-	getitem 6000,1; //Dark_Ashes
+	getitem Dark_Ashes,1;
 	warp instance_mapname("2@tower"),52,354;
 	end;
 
@@ -1466,7 +1466,7 @@ OnEnable:
 	end;
 
 OnTouch_:
-	getitem 6000,1; //Dark_Ashes
+	getitem Dark_Ashes,1;
 	warp instance_mapname("3@tower"),52,354;
 	end;
 
@@ -1581,7 +1581,7 @@ OnEnable:
 	end;
 
 OnTouch_:
-	getitem 6000,1; //Dark_Ashes
+	getitem Dark_Ashes,1;
 	warp instance_mapname("4@tower"),52,354;
 	end;
 
@@ -1695,7 +1695,7 @@ OnEnable:
 	end;
 
 OnTouch_:
-	getitem 6000,1; //Dark_Ashes
+	getitem Dark_Ashes,1;
 	warp instance_mapname("5@tower"),101,72;
 	end;
 
@@ -2124,7 +2124,7 @@ OnMyMobDead:
 }
 
 6@tower,169,127,2	script	Lost Soul#102	4_M_NFDEADSWDMAN,{
-	if (checkweight(1201,1) == 0) {
+	if (checkweight(Knife,1) == 0) {
 		mes "You're carrying too much stuff. Why don't you put some of it away, and then come back?";
 		close;
 	}
@@ -2134,7 +2134,7 @@ OnMyMobDead:
 	mes "[Lost Souls]";
 	mes "Thank you so much. Now we can escape from this cold and dark place... to heaven.";
 	next;
-	if ((countitem(13412) > 0) && (countitem(13413) > 0)) {
+	if ((countitem(Twin_Edge_B) > 0) && (countitem(Twin_Edge_R) > 0)) {
 		mes "[Lost Souls]";
 		mes "Hey, you have the remnants of Nacht Sieger with you.";
 		next;
@@ -2151,9 +2151,9 @@ OnMyMobDead:
 				mes "[Lost Souls]";
 				mes "Good, then I'll combine these to create a two-handed sword.";
 				next;
-				delitem 13412,1; //Twin_Edge_B
-				delitem 13413,1; //Twin_Edge_R
-				getitem 1185,1; //Violet_Fear
+				delitem Twin_Edge_B,1;
+				delitem Twin_Edge_R,1;
+				getitem Violet_Fear,1;
 				break;
 			case 2:
 				mes "[Lost Souls]";
diff --git a/npc/instances/NydhoggsNest.txt b/npc/instances/NydhoggsNest.txt
index 58351581f..a1d9de802 100644
--- a/npc/instances/NydhoggsNest.txt
+++ b/npc/instances/NydhoggsNest.txt
@@ -1053,7 +1053,7 @@ spl_in01,104,56,3	script	Aide Arioss#edq	4_F_FAIRYKID2,3,3,{
 			mes "[Aide Arioss]";
 			mes "It can't compare with the effort you have put in for us... but please accept our token of friendship.";
 			getexp 1500000,350000;
-			getitem 6081,10; //Splendide_Coin
+			getitem Splendide_Coin,10;
 			ins_nyd = 131;
 			mes "[Aide Arioss]";
 			mes "If we can help you with anything in the future, we will do all we can to assist you. Once again, thank you.";
@@ -1289,7 +1289,7 @@ man_in01,311,57,3	script	Neat Etorr#edq	4_MAN_NITT,3,3,{
 			mes "[Neat Etorr]";
 			mes "It's not a lot, but please this as a token of our appreciation.";
 			getexp 1500000,350000;
-			getitem 6080,10; //Manuk_Coin
+			getitem Manuk_Coin,10;
 			ins_nyd = 132;
 			close;
 		} else if (ins_nyd == 132) {
diff --git a/npc/instances/SealedShrine.txt b/npc/instances/SealedShrine.txt
index 9f8dc6620..89b9a6f98 100644
--- a/npc/instances/SealedShrine.txt
+++ b/npc/instances/SealedShrine.txt
@@ -47,7 +47,7 @@ monk_test,309,146,3	script	Friar Patrick#edq	4_M_OLDFRIAR,{
 	mes "[Friar Patrick]";
 	mes "What brought you to this place?";
 	next;
-	if (countitem(6004) > 0) {
+	if (countitem(Bapho_Doll) > 0) {
 		.@doll = 1;
 		.@selection = select("What is this place?:I want to enter.:About the Cursed Baphomet Doll.:Cancel.");
 	}
@@ -222,7 +222,7 @@ monk_test,309,146,3	script	Friar Patrick#edq	4_M_OLDFRIAR,{
 }
 
 monk_test,306,151,3	script	Grave of Baphomet#edq	HIDDEN_NPC,{
-	if (countitem(6002)) delitem 6002,countitem(6002); //Token_Of_Apostle
+	if (countitem(Token_Of_Apostle)) delitem Token_Of_Apostle,countitem(Token_Of_Apostle);
 	mes "This gravestone has a carving of a wicked devil with large horns. It arouses an ominous feeling.";
 	next;
 	if(select("Touch the stone.:Step back.") == 2)
@@ -277,7 +277,7 @@ prt_monk,261,91,3	script	Rust Blackhand#edq	4_M_DWARF,{
 		mes "[Rust Blackhand]";
 		mes "Did you bring all of the ingredients?";
 		next;
-		if (countitem(6004) && countitem(2256) && (countitem(7799) > 29) && (countitem(7798) > 49) && (Zeny >= 990000)) {
+		if (countitem(Bapho_Doll) && countitem(Magestic_Goat) && (countitem(Dark_Crystal) > 29) && (countitem(Dark_Debris) > 49) && (Zeny >= 990000)) {
 			mes "[Rust Blackhand]";
 			mes "kkk... You prepared the ingredients well. Why don't you leave it there and wait?";
 			next;
@@ -290,13 +290,13 @@ prt_monk,261,91,3	script	Rust Blackhand#edq	4_M_DWARF,{
 			next;
 			mes "... ... ...";
 			next;
-			delitem 6004,1; //Bapho_Doll
-			delitem 2256,1; //Magestic_Goat
-			delitem 7799,30; //Dark_Crystal
-			delitem 7798,50; //Dark_Debris
+			delitem Bapho_Doll,1;
+			delitem Magestic_Goat,1;
+			delitem Dark_Crystal,30;
+			delitem Dark_Debris,50;
 			Zeny -= 990000;
 			completequest 3043;
-			getitem 5374,1; //L_Magestic_Goat
+			getitem L_Magestic_Goat,1;
 			mes "[Rust Blackhand]";
 			mes "It's done. You may be excited, of course. I understand...";
 			next;
@@ -316,7 +316,7 @@ prt_monk,261,91,3	script	Rust Blackhand#edq	4_M_DWARF,{
 			close;
 		}
 	}
-	else if (!.@new_maje && countitem(6004) > 0) {
+	else if (!.@new_maje && countitem(Bapho_Doll) > 0) {
 		switch(select("About the Cursed Baphomet Doll:Stop talking.")) {
 		case 1:
 			mes "[Rust Blackhand]";
@@ -371,12 +371,12 @@ prt_monk,261,91,3	script	Rust Blackhand#edq	4_M_DWARF,{
 			close;
 		}
 	}
-	else if (!.@new_maje && !countitem(6004)) {
+	else if (!.@new_maje && !countitem(Bapho_Doll)) {
 		mes "[Rust Blackhand]";
 		mes "If you don't have business with me, go away! As you see, I make equipment for the Brothers at the monastery, not for adventurers like you. Do you understand?";
 		close;
 	}
-	else if (.@new_maje == 2 && countitem(6004)) {
+	else if (.@new_maje == 2 && countitem(Bapho_Doll)) {
 		switch(select("About the Cursed Baphomet Doll:Stop talking.")) {
 		case 1:
 			mes "[Rust Blackhand]";
@@ -429,7 +429,7 @@ prt_monk,261,91,3	script	Rust Blackhand#edq	4_M_DWARF,{
 			close;
 		}
 	}
-	else if (.@new_maje == 2 && !countitem(6004)) {
+	else if (.@new_maje == 2 && !countitem(Bapho_Doll)) {
 		mes "[Rust Blackhand]";
 		mes "Why are you hanging around here? If you don't want a ^4d4dffGigantic Magestic Goat^000000, go away.";
 		close;
@@ -485,7 +485,7 @@ OnMyMobDead:
 	if (mobcount(.@map$,instance_npcname("ins_baphomet_lotto3")+"::OnMyMobDead") < 1) {
 		mapannounce .@map$, "All apostles of Baphomet are dead!",bc_map,"0x00ff99";
 	}
-	getitem 6002,1; //Token_Of_Apostle
+	getitem Token_Of_Apostle,1;
 	end;
 }
 
@@ -552,12 +552,12 @@ OnMyMobDead:
 		mes "[Voice of the Gravestone]";
 		mes "Did you find the pendant?";
 		next;
-		if (countitem(6003) > 0) {
+		if (countitem(Soul_Pendant) > 0) {
 			specialeffect EF_MAPPILLAR;
 			mes "[Voice of the Gravestone]";
 			mes "Yes... This is... My pendant...";
 			next;
-			delitem 6003,1; //Soul_Pendant
+			delitem Soul_Pendant,1;
 			enablenpc instance_npcname("Ancient Hero's Soul#1F");
 			disablenpc instance_npcname("Gravestone#");
 			mes "[Voice of the Gravestone]";
@@ -734,8 +734,8 @@ OnInstanceInit: // Temporary fix for @reloadscript.
 		mes "[Ancient Hero's Soul]";
 		mes "Did you get 10 ^0000FFEssence of Fire^000000 and ^0000FFToken of Apostle^000000?";
 		next;
-		if ((countitem(6001) > 9) && (countitem(6002) > 0)) {
-			delitem 6001,countitem(6001); //Essence_Of_Fire
+		if ((countitem(Essence_Of_Fire) > 9) && (countitem(Token_Of_Apostle) > 0)) {
+			delitem Essence_Of_Fire,countitem(Essence_Of_Fire);
 			'ins_baphomet = 4;
 			mes "[Ancient Hero's Soul]";
 			mes "Okay. You've done your work. Now check your companions and tell me when everyone has finished their work.";
@@ -753,7 +753,7 @@ OnInstanceInit: // Temporary fix for @reloadscript.
 		mes "[Ancient Hero's Soul]";
 		mes "Do you have a ^0000FFToken of Apostle^000000?";
 		next;
-		if (countitem(6002) > 0) {
+		if (countitem(Token_Of_Apostle) > 0) {
 			'ins_baphomet = 4;
 			mes "[Ancient Hero's Soul]";
 			mes "Okay. You've done your work. Tell your representative to check your companions and come to me when everyone has finished their work.";
@@ -819,8 +819,8 @@ OnInstanceInit:
 //== To 2F Warp ============================================
 1@cata,281,12,0	script	ins_bapho_to_2f	WARPNPC,1,1,{
 OnTouch:
-	if (countitem(6002) > 0) {
-		delitem 6002,countitem(6002); //Token_Of_Apostle
+	if (countitem(Token_Of_Apostle) > 0) {
+		delitem Token_Of_Apostle,countitem(Token_Of_Apostle);
 		'ins_baphomet = 5;
 		warp instance_mapname("2@cata"),80,144;
 		end;
@@ -839,7 +839,7 @@ OnInstanceInit:
 //== Gravestones ===========================================
 -	script	Gravestone#SS1	-1,{
 	if ('ins_baphomet == 1) {
-		getitem 6003,1; //Soul_Pendant
+		getitem Soul_Pendant,1;
 		'ins_baphomet = 2;
 		mes "A small object is shining under a leaning grave.";
 		next;
@@ -888,18 +888,18 @@ OnInstanceInit:
 -	script	Bobbing Torch#SS	-1,{
 	.@party_id = getcharid(1);
 	if (getpartyleader(.@party_id,2) == getcharid(0)) {
-		if (('ins_baphomet == 3) && (countitem(6001) < 11)) {
+		if (('ins_baphomet == 3) && (countitem(Essence_Of_Fire) < 11)) {
 			mes "A huge torch appearing as if it can burn everything is bobbing up and down in front of me.";
 			next;
 			mes "The grand appearance and heat of the fire makes me step back... But I pluck up my courage and reach out to pick up the torch.";
 			next;
 			specialeffect2 EF_HOLYHIT;
-			getitem 6001,1; //Essence_Of_Fire
+			getitem Essence_Of_Fire,1;
 			mes "The symbol of inheritor shines. Then a small crystal falls into my hand from the torch.";
 			disablenpc instance_npcname(strnpcinfo(0));
 			close;
 		}
-		else if (('ins_baphomet == 3) && (countitem(6001) > 10)) {
+		else if (('ins_baphomet == 3) && (countitem(Essence_Of_Fire) > 10)) {
 			mes "You have 10 Essence of Fire already, so you don't need to collect any more.";
 			close;
 		}
diff --git a/npc/jobs/1-1e/gunslinger.txt b/npc/jobs/1-1e/gunslinger.txt
index c17e83cb8..3f02f7808 100644
--- a/npc/jobs/1-1e/gunslinger.txt
+++ b/npc/jobs/1-1e/gunslinger.txt
@@ -198,9 +198,9 @@ que_ng,152,167,3	script	Master Miller	4_M_HUOLDARMY,{
 			GUNS_Q = 6;
 			completequest 6024;
 			if (rand(1,2) == 1) {
-				getitem 13100,1; // Six_Shooter
+				getitem Six_Shooter,1; // Six_Shooter
 			} else {
-				getitem 13150,1; // Branch
+				getitem Branch,1; // Branch
 			}
 			close;
 		}
@@ -281,7 +281,7 @@ payon,184,65,3	script	Wise Bull Horn	4_M_LGTGRAND,{
 		close;
 	}
 	else if (GUNS_Q == 2) {
-		if (countitem(912) < 3 || countitem(914) < 3 || countitem(1019) < 1 || countitem(935) < 10 || countitem(511) < 3 || countitem(1013) < 3) {
+		if (countitem(Zargon) < 3 || countitem(Fluff) < 3 || countitem(Wooden_Block) < 1 || countitem(Shell) < 10 || countitem(Green_Herb) < 3 || countitem(Colorful_Shell) < 3) {
 			mes "[Wise Bull Horn]";
 			mes "I can make a voucher that";
 			mes "will demonstrate your desire";
@@ -307,12 +307,12 @@ payon,184,65,3	script	Wise Bull Horn	4_M_LGTGRAND,{
 			mes "a Gunslinger.";
 			close;
 		}
-		delitem 912,3; // Zargon
-		delitem 914,3; // Fluff
-		delitem 1019,1; // Wooden_Block
-		delitem 935,10; // Shell
-		delitem 511,3; // Green_Herb
-		delitem 1013,3; // Colorful_Shell
+		delitem Zargon,3; // Zargon
+		delitem Fluff,3; // Fluff
+		delitem Wooden_Block,1; // Wooden_Block
+		delitem Shell,10; // Shell
+		delitem Green_Herb,3; // Green_Herb
+		delitem Colorful_Shell,3; // Colorful_Shell
 		GUNS_Q = 3;
 		changequest 6021,6022;
 		mes "[Wise Bull Horn]";
@@ -365,7 +365,7 @@ payon,184,65,3	script	Wise Bull Horn	4_M_LGTGRAND,{
 		close;
 	}
 	else if (GUNS_Q == 4) {
-		if (countitem(519) < 1) {
+		if (countitem(Milk) < 1) {
 			mes "[Wise Bull Horn]";
 			mes "I'm an old man that will";
 			mes "soon be reunited with mother";
@@ -374,7 +374,7 @@ payon,184,65,3	script	Wise Bull Horn	4_M_LGTGRAND,{
 			mes "a cold glass of Milk, please?";
 			close;
 		}
-		delitem 519,1; // Milk
+		delitem Milk,1; // Milk
 		GUNS_Q = 5;
 		changequest 6023,6024;
 		mes "[Wise Bull Horn]";
diff --git a/npc/jobs/1-1e/ninja.txt b/npc/jobs/1-1e/ninja.txt
index 9eb760c15..a8348a9b9 100644
--- a/npc/jobs/1-1e/ninja.txt
+++ b/npc/jobs/1-1e/ninja.txt
@@ -280,7 +280,7 @@ que_ng,30,65,3	script	Cougar#nq	4_M_JOB_ASSASSIN,{
 			close;
 		}
 		else if (NINJ_Q == 4) {
-			if (countitem(7053) < 5 || countitem(1010) < 1) {
+			if (countitem(Cyfar) < 5 || countitem(Phracon) < 1) {
 				mes "[Cougar]";
 				mes "Hurry and bring";
 				mes "^3355FF5 Cyfars^000000 and";
@@ -354,9 +354,9 @@ que_ng,30,65,3	script	Cougar#nq	4_M_JOB_ASSASSIN,{
 			mes "quiet as the falling shadows.";
 			callfunc "Job_Change",Job_Ninja;
 			NINJ_Q = 5;
-			delitem 7053,5; // Cyfar
-			delitem 1010,1; // Phracon
-			getitem 13010,1;	// Asura
+			delitem Cyfar,5; // Cyfar
+			delitem Phracon,1; // Phracon
+			getitem Asura,1;	// Asura
 			completequest 6018;
 			close;
 		}
@@ -457,7 +457,7 @@ einbroch,184,194,3	script	Suspicious Man#nq	4_M_SITDOWN,{
 		close;
 	}
 	else if (NINJ_Q == 2) {
-		if (countitem(7053) < 5 || countitem(1010) < 1) {
+		if (countitem(Cyfar) < 5 || countitem(Phracon) < 1) {
 			mes "[Suspicious Man]";
 			mes "Please bring";
 			mes "^3355FF5 Cyfars^000000 and";
@@ -544,8 +544,8 @@ einbroch,184,194,3	script	Suspicious Man#nq	4_M_SITDOWN,{
 		mes "It'll take a while to";
 		mes "return to Amatsu, so let";
 		mes "me send you there directly...";
-		delitem 1010,1;	// Phracon
-		delitem 7053,5;	// Cyfar
+		delitem Phracon,1;	// Phracon
+		delitem Cyfar,5;	// Cyfar
 		NINJ_Q = 3;
 		changequest 6016,6017;
 		close2;
diff --git a/npc/jobs/1-1e/taekwon.txt b/npc/jobs/1-1e/taekwon.txt
index b242af416..b3d610c6d 100644
--- a/npc/jobs/1-1e/taekwon.txt
+++ b/npc/jobs/1-1e/taekwon.txt
@@ -395,7 +395,7 @@ payon,157,141,5	script	Phoenix#TKJobChange	4_M_MONK,{
 			completequest 6002;
 			callfunc "Job_Change",Job_Taekwon;
 			callfunc "F_ClearJobVar";
-			getitem 2101,1; // Guard[0]
+			getitem Guard,1; // Guard[0]
 			mes "[Phoenix]";
 			mes "You are still young, so";
 			mes "I assume you'll want a job";
diff --git a/npc/jobs/2-1/assassin.txt b/npc/jobs/2-1/assassin.txt
index fe74e5d04..c994fe5d6 100644
--- a/npc/jobs/2-1/assassin.txt
+++ b/npc/jobs/2-1/assassin.txt
@@ -95,7 +95,7 @@ in_moc_16,19,33,1	script	Guildsman#asn	1_M_JOBTESTER,{
 		warp "in_moc_16",18,14;
 		end;
 	}
-	if (BaseJob == Job_Thief && countitem(1008) == 0 && ASSIN_Q > 7) {
+	if (BaseJob == Job_Thief && countitem(Frozen_Heart) == 0 && ASSIN_Q > 7) {
 		mes "[Assassin Expert 'Huey']";
 		mes "Hey, what happened...? How come you didn't bring the ^006699Necklace of Oblivion^000000? You're supposed to carry that with you, so where is it?";
 		next;
@@ -106,7 +106,7 @@ in_moc_16,19,33,1	script	Guildsman#asn	1_M_JOBTESTER,{
 		mes "When you finally succeed in getting it, bring it to me! ^666666*Sigh...*^000000";
 		close;
 	}
-	if (BaseJob == Job_Thief && countitem(1008) > 0 && ASSIN_Q > 7) {
+	if (BaseJob == Job_Thief && countitem(Frozen_Heart) > 0 && ASSIN_Q > 7) {
 		mes "[Assassin Expert 'Huey']";
 		mes "Well well well, you got it. Congratulations! But since it's been clearly scratched, I can't accept it. You'll never become an Assassin!";
 		next;
@@ -120,7 +120,7 @@ in_moc_16,19,33,1	script	Guildsman#asn	1_M_JOBTESTER,{
 		mes "...";
 		mes "......";
 		next;
-		delitem 1008,1; //Frozen_Heart
+		delitem Frozen_Heart,1;
 		changequest 8007,8008;
 		mes "[Assassin Expert 'Huey']";
 		mes "Alright!";
@@ -133,7 +133,7 @@ in_moc_16,19,33,1	script	Guildsman#asn	1_M_JOBTESTER,{
 		mes "Now! Do your best to be a great Assassin! Travel with faith and kill with dignity. Come by anytime and pay us a visit. Once again, congratulations.";
 		close;
 	}
-	else if (countitem(1008) > 0 && BaseJob == Job_Thief && ASSIN_Q < 7) {
+	else if (countitem(Frozen_Heart) > 0 && BaseJob == Job_Thief && ASSIN_Q < 7) {
 		mes "[Ferocious-looking guy]";
 		mes "Eh?";
 		mes "What do you want?";
@@ -2063,7 +2063,7 @@ OnTouch:
 				mes "[Guildmaster]";
 				mes "A Jur...";
 				mes "Good choice. There you are. I hope it will serve you well.";
-				getitem 1251,1; //Jur_
+				getitem Jur_,1;
 				break;
 			case 2:
 				mes "[Guildmaster]";
@@ -2072,18 +2072,18 @@ OnTouch:
 				mes "Although it's used,";
 				mes "I know it will";
 				mes "serve you well.";
-				getitem 1253,1; //Katar_
+				getitem Katar_,1;
 				break;
 			case 3:
 				mes "[Guildmaster]";
 				mes "I see. You want to use both hands. Here, take your Main Gauche.";
-				getitem 1208,1; //Main_Gauche_
+				getitem Main_Gauche_,1;
 				break;
 			case 4:
 				mes "[Guildmaster]";
 				mes "A Gladius...";
 				mes "It used to rule over the Assassin weapon market. Please take care of my gladius.";
-				getitem 1220,1; //Gladius_
+				getitem Gladius_,1;
 			}
 			next;
 		}
@@ -2095,19 +2095,19 @@ OnTouch:
 			next;
 			switch(rand(1,5)) {
 			case 1:
-				getitem 1207,1; //Main_Gauche
+				getitem Main_Gauche,1;
 				break;
 			case 2:
-				getitem 1250,1; //Jur
+				getitem Jur,1;
 				break;
 			case 3:
-				getitem 1216,1; //Stiletto
+				getitem Stiletto,1;
 				break;
 			case 4:
-				getitem 1201,1; //Knife
+				getitem Knife,1;
 				break;
 			case 5:
-				getitem 1252,1; //Katar
+				getitem Katar,1;
 			}
 		}
 		mes "[Guildmaster]";
@@ -2119,7 +2119,7 @@ OnTouch:
 		mes "[Guildmaster]";
 		mes "You, " + strcharinfo(0) + ", have chosen to live as an Assassin. May you learn our ways and be an honorable example to others.";
 		savepoint "morocc",100,100;
-		getitem 1008,1; //Frozen_Heart
+		getitem Frozen_Heart,1;
 		changequest 8006,8007;
 		next;
 		mes "[Guildmaster]";
diff --git a/npc/jobs/2-1/blacksmith.txt b/npc/jobs/2-1/blacksmith.txt
index 1aa337057..2f49a8b5a 100644
--- a/npc/jobs/2-1/blacksmith.txt
+++ b/npc/jobs/2-1/blacksmith.txt
@@ -256,7 +256,7 @@ ein_in01,18,28,4	script	Guildsman#BLS	4_M_JOB_BLACKSMITH,{
 			mes "If you haven't, I suggest you to do so as soon as possible.";
 			close;
 		}
-		else if (BSMITH_Q == 17 && countitem(1005) > 0 && JobLevel > 39) {
+		else if (BSMITH_Q == 17 && countitem(Hammer_Of_Blacksmith) > 0 && JobLevel > 39) {
 			mes "[Altiregen]";
 			if (checkmount() || hascashmount()) {
 				mes "You are on a riding pet, so you cannot change your job.";
@@ -275,7 +275,7 @@ ein_in01,18,28,4	script	Guildsman#BLS	4_M_JOB_BLACKSMITH,{
 			mes "Always remember that we are creators, and artists over metals. Be wary that you do not fall into the pitfalls of selfishness";
 			mes "and greed.";
 			next;
-			delitem 1005,1; //Hammer_Of_Blacksmith
+			delitem Hammer_Of_Blacksmith,1;
 			completequest 2016;
 			mes "[Altiregen]";
 			mes "Here is a little";
@@ -284,9 +284,9 @@ ein_in01,18,28,4	script	Guildsman#BLS	4_M_JOB_BLACKSMITH,{
 			mes "life as a Blacksmith.";
 			mes "Congratulations!!!";
 			if (.@joblvl > 48)
-				getitem 999,30; //Steel
+				getitem Steel,30;
 			else
-				getitem 999,5; //Steel
+				getitem Steel,5;
 			close;
 		}
 	}
@@ -668,7 +668,7 @@ ein_in01,201,27,3	script	Guildsman#alberta	1_M_SMITH,{
 				switch(BSMITH_Q) {
 				case 9:
 					mes "Okay, now take this to ^8E6B23Baisulist^000000 in Geffen of Rune-Midgarts Kingdom. Simply deliver it and bring me the receipt.";
-					getitem 1610,1; //Arc_Wand
+					getitem Arc_Wand,1;
 					if (questprogress(2003)) {
 						changequest 2003,2008;
 					}
@@ -693,7 +693,7 @@ ein_in01,201,27,3	script	Guildsman#alberta	1_M_SMITH,{
 					break;
 				case 10:
 					mes "Okay, now take this to ^8E6B23Wickebine^000000 in Morroc of Rune-Midgarts Kingdom. Simply deliver it and bring me the receipt.";
-					getitem 1219,1; //Gladius
+					getitem Gladius,1;
 					if (questprogress(2004)) {
 						changequest 2004,2009;
 					}
@@ -718,7 +718,7 @@ ein_in01,201,27,3	script	Guildsman#alberta	1_M_SMITH,{
 					break;
 				case 11:
 					mes "Okay, now take this to ^8E6B23Krongast^000000 in Lighthalzen. Simply deliver it and bring me the receipt.";
-					getitem 1119,1; //Tsurugi
+					getitem Tsurugi,1;
 					if (questprogress(2005)) {
 						changequest 2005,2010;
 					}
@@ -744,7 +744,7 @@ ein_in01,201,27,3	script	Guildsman#alberta	1_M_SMITH,{
 					break;
 				case 12:
 					mes "Okay, now take this to ^8E6B23Talpiz^000000 in Payon of Rune-Midgarts Kingdom. Simply deliver this and bring me the receipt.";
-					getitem 1713,1; //Arbalest
+					getitem Arbalest,1;
 					if (questprogress(2006)) {
 						changequest 2006,2011;
 					}
@@ -768,7 +768,7 @@ ein_in01,201,27,3	script	Guildsman#alberta	1_M_SMITH,{
 					break;
 				case 13:
 					mes "Okay, now take this to ^8E6B23Bismarc^000000 in Hugel. Simply deliver this and bring back the receipt.";
-					getitem 1122,1; //Ring_Pommel_Saber
+					getitem Ring_Pommel_Saber,1;
 					if (questprogress(2007)) {
 						changequest 2007,2012;
 					}
@@ -863,9 +863,9 @@ ein_in01,201,27,3	script	Guildsman#alberta	1_M_SMITH,{
 			mes "Let's see that receipt~";
 			next;
 			if (select("Yes sir, here it is.:Receipt? I, uh, have it somewhere.") == 1) {
-				if (countitem(1073) > 0) {
+				if (countitem(Merchant_Voucher_1) > 0) {
 					BSMITH_Q = 15;
-					delitem 1073,1; //Merchant_Voucher_1
+					delitem Merchant_Voucher_1,1;
 					if (questprogress(2008)) {
 						changequest 2008,2013;
 					}
@@ -948,7 +948,7 @@ ein_in01,201,27,3	script	Guildsman#alberta	1_M_SMITH,{
 }
 
 geffen,46,164,1	script	Baisulist#BLS	1_F_04,{
-	if (BSMITH_Q == 9 && countitem(1610) > 0) {
+	if (BSMITH_Q == 9 && countitem(Arc_Wand) > 0) {
 		mes "[Baisulist]";
 		mes "Oh, hello!";
 		mes "Have you come";
@@ -972,7 +972,7 @@ geffen,46,164,1	script	Baisulist#BLS	1_F_04,{
 		mes "You're";
 		mes "absolutely sure?";
 		BSMITH_Q = 14;
-		delitem 1610,1; //Arc_Wand
+		delitem Arc_Wand,1;
 		next;
 		mes "[Baisulist]";
 		mes "Thank you so much for traveling all the way here. That Geschupenschte, please smack him for me when you meet him for being so late on this order...";
@@ -982,7 +982,7 @@ geffen,46,164,1	script	Baisulist#BLS	1_F_04,{
 		mes "a second, let";
 		mes "me give you a receipt~";
 		next;
-		getitem 1073,1; //Merchant_Voucher_1
+		getitem Merchant_Voucher_1,1;
 		mes "[Baisulist]";
 		mes "Here it is.";
 		mes "Thank you so much!";
@@ -1023,7 +1023,7 @@ geffen,46,164,1	script	Baisulist#BLS	1_F_04,{
 }
 
 morocc,27,112,4	script	Wickebine#BLS	4_F_JOB_ASSASSIN,{
-	if (BSMITH_Q == 10 && countitem(1219) > 0) {
+	if (BSMITH_Q == 10 && countitem(Gladius) > 0) {
 		cutin "Job_Black_hucke01",2;
 		mes "[Wickebine]";
 		mes "...!";
@@ -1055,7 +1055,7 @@ morocc,27,112,4	script	Wickebine#BLS	4_F_JOB_ASSASSIN,{
 		mes "- She looks very happy. -";
 		next;
 		BSMITH_Q = 14;
-		delitem 1219,1; //Gladius
+		delitem Gladius,1;
 		cutin "Job_Black_hucke01",2;
 		mes "[Wickebine]";
 		mes "Are you with the";
@@ -1074,7 +1074,7 @@ morocc,27,112,4	script	Wickebine#BLS	4_F_JOB_ASSASSIN,{
 		mes "a masterfully crafted item.";
 		mes "Tell him I'm satisfied with the quality of the workmanship.";
 		next;
-		getitem 1073,1; //Merchant_Voucher_1
+		getitem Merchant_Voucher_1,1;
 		emotion e_lv;
 		mes "[Wickebine]";
 		mes "Here's the receipt.";
@@ -1124,7 +1124,7 @@ morocc,27,112,4	script	Wickebine#BLS	4_F_JOB_ASSASSIN,{
 }
 
 lighthalzen,209,80,4	script	Krongast#BLS	4_M_JOB_KNIGHT2,{
-	if (BSMITH_Q == 11 && countitem(1119) > 0) {
+	if (BSMITH_Q == 11 && countitem(Tsurugi) > 0) {
 		mes "[Krongast]";
 		mes "Ohhhhhh~";
 		mes "Is it here?";
@@ -1149,7 +1149,7 @@ lighthalzen,209,80,4	script	Krongast#BLS	4_M_JOB_KNIGHT2,{
 		mes "Alright then, I'll take it!";
 		next;
 		BSMITH_Q = 14;
-		delitem 1119,1; //Tsurugi
+		delitem Tsurugi,1;
 		mes "[Krongast]";
 		mes "Oh ho...";
 		mes "This is good.";
@@ -1165,7 +1165,7 @@ lighthalzen,209,80,4	script	Krongast#BLS	4_M_JOB_KNIGHT2,{
 		mes "Let me give";
 		mes "you a receipt.";
 		next;
-		getitem 1073,1; //Merchant_Voucher_1
+		getitem Merchant_Voucher_1,1;
 		mes "[Krongast]";
 		mes "Here is";
 		mes "your receipt.";
@@ -1202,7 +1202,7 @@ lighthalzen,209,80,4	script	Krongast#BLS	4_M_JOB_KNIGHT2,{
 }
 
 payon,214,79,4	script	Talpiz#BLS	1_M_ORIENT01,{
-	if (BSMITH_Q == 12 && countitem(1713) > 0) {
+	if (BSMITH_Q == 12 && countitem(Arbalest) > 0) {
 		mes "[Talpiz]";
 		mes "Oh~";
 		mes "Is it finally here?";
@@ -1226,7 +1226,7 @@ payon,214,79,4	script	Talpiz#BLS	1_M_ORIENT01,{
 		mes "Let me take a look...";
 		next;
 		BSMITH_Q = 14;
-		delitem 1713,1; //Arbalest
+		delitem Arbalest,1;
 		mes "[Talpiz]";
 		mes "*wheet whoo*";
 		mes "Very nice!!";
@@ -1239,7 +1239,7 @@ payon,214,79,4	script	Talpiz#BLS	1_M_ORIENT01,{
 		mes "For something of this quality,";
 		mes "I can even sell it for a high price even after I've used it!";
 		next;
-		getitem 1073,1; //Merchant_Voucher_1
+		getitem Merchant_Voucher_1,1;
 		mes "[Talpiz]";
 		mes "Here!";
 		mes "Please take";
@@ -1276,7 +1276,7 @@ payon,214,79,4	script	Talpiz#BLS	1_M_ORIENT01,{
 }
 
 hugel,168,183,1	script	Bismarc#BLS	2_M_THIEFMASTER,{
-	if (BSMITH_Q == 13 && countitem(1122) > 0) {
+	if (BSMITH_Q == 13 && countitem(Ring_Pommel_Saber) > 0) {
 		mes "[Bismarc]";
 		mes "Sweet God...";
 		mes "Have you sent";
@@ -1307,7 +1307,7 @@ hugel,168,183,1	script	Bismarc#BLS	2_M_THIEFMASTER,{
 		mes "Pleeeease!";
 		next;
 		BSMITH_Q = 14;
-		delitem 1122,1; //Ring_Pommel_Saber
+		delitem Ring_Pommel_Saber,1;
 		mes "^3355FFBismarc stabs";
 		mes "himself, repeatedly,";
 		mes "with the Ring Pommel Saber";
@@ -1336,7 +1336,7 @@ hugel,168,183,1	script	Bismarc#BLS	2_M_THIEFMASTER,{
 		mes "antidote working now.";
 		mes "Just what I needed.";
 		next;
-		getitem 1073,1; //Merchant_Voucher_1
+		getitem Merchant_Voucher_1,1;
 		mes "[Bismarc]";
 		mes "Here is";
 		mes "your receipt.";
@@ -1540,7 +1540,7 @@ ein_in01,24,41,5	script	Blacksmith Guildsman#moc	4_F_JOB_BLACKSMITH,{
 				mes "[Mitehmaeeuh]";
 				mes "However, don't let your early success make you overconfident. A Blacksmith's life isn't a picnic. As proof that you have passed the test, I give you this Hammer of Blacksmith.";
 				BSMITH_Q = 17;
-				getitem 1005,1; //Hammer_Of_Blacksmith
+				getitem Hammer_Of_Blacksmith,1;
 				changequest 2014,2015;
 				next;
 				mes "[Mitehmaeeuh]";
diff --git a/npc/jobs/2-1/hunter.txt b/npc/jobs/2-1/hunter.txt
index ddbfbbf27..53d273deb 100644
--- a/npc/jobs/2-1/hunter.txt
+++ b/npc/jobs/2-1/hunter.txt
@@ -145,7 +145,7 @@ hu_in01,386,373,4	script	Hunter Guildsman#hnt	4_F_JOB_HUNTER,{
 			mes "You can't apply to change jobs if you still have unused skill points. Use your remaining skill points first.";
 			close;
 		}
-		else if (HNTR_Q == 17 && countitem(1007) == 0) {
+		else if (HNTR_Q == 17 && countitem(Penetration) == 0) {
 			mes "[Hunter Sherin]";
 			mes "Hmm... I've been informed that you passed the test. But you don't have the necessary 'Necklace of Wisdom (Penetration)' that proves your accomplishment.";
 			next;
@@ -153,7 +153,7 @@ hu_in01,386,373,4	script	Hunter Guildsman#hnt	4_F_JOB_HUNTER,{
 			mes "I'll let you change your job, but you must bring back a 'Necklace of Wisdom (Penetration),' no matter what it takes.";
 			close;
 		}
-		else if (HNTR_Q == 17 && countitem(1007) > 0 && JobLevel > 39) {
+		else if (HNTR_Q == 17 && countitem(Penetration) > 0 && JobLevel > 39) {
 			mes "[Hunter Sherin]";
 			mes "Oh...?";
 			mes "You passed";
@@ -165,7 +165,7 @@ hu_in01,386,373,4	script	Hunter Guildsman#hnt	4_F_JOB_HUNTER,{
 			mes "I will now change";
 			mes "your job to a Hunter~";
 			next;
-			delitem 1007,1; //Penetration
+			delitem Penetration,1;
 			mes "[Hunter Sherin]";
 			mes "Tada~ Congratulations!";
 			mes "You look great as a Hunter!!";
@@ -180,9 +180,9 @@ hu_in01,386,373,4	script	Hunter Guildsman#hnt	4_F_JOB_HUNTER,{
 			mes "[Hunter Sherin]";
 			mes "And also, here is a little reward for all the effort you put in. It's from me, of course~";
 			if (.@joblvl > 49)
-				getitem 1718,1; //Hunter_Bow
+				getitem Hunter_Bow,1;
 			else
-				getitem 1710,1; //CrossBow
+				getitem CrossBow,1;
 			close;
 		}
 		else if ((JobLevel > 39) && ((HNTR_Q == 0) || (HNTR_Q == 1))) {
@@ -644,7 +644,7 @@ payon_in03,131,7,3	script	Hunter#htnGM	1_M_ORIENT01,{
 		mes "Well, then. Your arrows are probably still being made, so you can use mine to take the test.";
 		HNTR_Q = 12;
 		changequest 4009,4011;
-		getitem 1751,200; //Silver_Arrow
+		getitem Silver_Arrow,200;
 		close2;
 		warp "job_hunte",176,22;
 		end;
@@ -729,7 +729,7 @@ payon_in03,131,7,3	script	Hunter#htnGM	1_M_ORIENT01,{
 		mes "I mean, good job. I'll give you the item which proves that you have passed the test.";
 		HNTR_Q = 17;
 		savepoint "payon",104,99;
-		getitem 1007,1; //Penetration
+		getitem Penetration,1;
 		changequest 4012,4013;
 		next;
 		mes "[Hunter Guildmaster]";
@@ -802,7 +802,7 @@ payon_in02,21,31,1	script	Hunter#htnGM2	1_M_ORIENT01,{
 		}
 		mes "[Hunter Guildmaster]";
 		mes "Well, your arrows are probably still being made, so you can use mine to take the test.";
-		getitem 1751,200; //Silver_Arrow
+		getitem Silver_Arrow,200;
 		next;
 		mes "[Hunter Guildmaster]";
 		mes "Good luck.";
@@ -921,7 +921,7 @@ payon_in02,21,31,1	script	Hunter#htnGM2	1_M_ORIENT01,{
 		mes "I mean, good job. Well then, I'll give you the item which serves as proof that you passed the test.";
 		HNTR_Q = 17;
 		savepoint "payon",104,99;
-		getitem 1007,1; //Penetration
+		getitem Penetration,1;
 		next;
 		mes "[Hunter Guildmaster]";
 		mes "Well...";
diff --git a/npc/jobs/2-1/knight.txt b/npc/jobs/2-1/knight.txt
index 7e62d4415..d0308d771 100644
--- a/npc/jobs/2-1/knight.txt
+++ b/npc/jobs/2-1/knight.txt
@@ -435,7 +435,7 @@ prt_in,88,101,4	script	Chivalry Captain#knt	1_M_KNIGHTMASTER,{
 		mes "Protect the weak and";
 		mes "live with honor.";
 		next;
-		getitem 656,7; //Awakening_Potion
+		getitem Awakening_Potion,7;
 		mes "[Captain Herman]";
 		mes "Oh...";
 		mes "We have prepared a small gift to congratulate you on your job change. Please use it when you are in battle as you honorably protect others.";
@@ -2032,7 +2032,7 @@ prt_in,87,92,4	script	Sir Gray#knt	2_M_SWORDMASTER,{
 					close;
 				}
 				else {
-					if ((Zeny > 73999) && (countitem(999) > 0) && (BaseJob == Job_Knight)) {
+					if ((Zeny > 73999) && (countitem(Steel) > 0) && (BaseJob == Job_Knight)) {
 						mes "[Sir Gray]";
 						mes "You are ready!";
 						mes "You must know the";
@@ -2055,9 +2055,9 @@ prt_in,87,92,4	script	Sir Gray#knt	2_M_SWORDMASTER,{
 						mes "a fine ^3355FFClaymore^000000.";
 						mes "You attained a reliable item.";
 						mes "It'll be a good companion on your adventures.";
-						delitem 999,1; //Steel
+						delitem Steel,1;
 						Zeny -= 74000;
-						getitem 1163,1; //Claymore
+						getitem Claymore,1;
 						close;
 					}
 					mes "[Sir Gray]";
diff --git a/npc/jobs/2-1/priest.txt b/npc/jobs/2-1/priest.txt
index ced397552..cb5cf7fe1 100644
--- a/npc/jobs/2-1/priest.txt
+++ b/npc/jobs/2-1/priest.txt
@@ -95,7 +95,7 @@ prt_church,16,41,4	script	High Bishop#prst	1_M_PASTOR,{
 				mes "Do you wish to help him out during the spiritual training?";
 				next;
 				if (select("Yes, I do.:Give me a second.") == 1) {
-					if (countitem(2608) > 0) {
+					if (countitem(Rosary) > 0) {
 						mes "[Bishop Paul]";
 						mes "I will now send you to the training place for Acolytes. Please send my regards to Brother Peter...";
 						next;
@@ -531,11 +531,11 @@ prt_church,16,41,4	script	High Bishop#prst	1_M_PASTOR,{
 		next;
 		mes "[Bishop Paul]";
 		if (.@joblvl < 50) {
-			getitem 1550,1; //Book
+			getitem Book,1;
 			mes "This book is for you. I hope it will aid you in spreading God's message on earth.";
 		}
 		else {
-			getitem 1551,1; //Bible
+			getitem Bible,1;
 			mes "In commemoration of your job change, I am giving you a bible. This will lighten your way to the path of righteousness.";
 		}
 		next;
diff --git a/npc/jobs/2-1/wizard.txt b/npc/jobs/2-1/wizard.txt
index 042aa8e1d..59b268ec4 100644
--- a/npc/jobs/2-1/wizard.txt
+++ b/npc/jobs/2-1/wizard.txt
@@ -208,14 +208,14 @@ gef_tower,111,37,4	script	Wizard Guildsman	1_F_GYPSY,{
 		mes "Let me see, did you get all the items?";
 		mes "Then let's check...";
 		next;
-		if (countitem(716) > 9 && countitem(717) > 9 && countitem(715) > 9) {
+		if (countitem(Red_Gemstone) > 9 && countitem(Blue_Gemstone) > 9 && countitem(Yellow_Gemstone) > 9) {
 			mes "[Catherine]";
 			mes "Perfect! You got all the items. I like!~";
 			mes "These items will be put to great use in our guild. ~Hehehee.";
 			next;
-			delitem 716,10; //Red_Gemstone
-			delitem 717,10; //Blue_Gemstone
-			delitem 715,10; //Yellow_Gemstone
+			delitem Red_Gemstone,10;
+			delitem Blue_Gemstone,10;
+			delitem Yellow_Gemstone,10;
 			WIZ_Q = 3;
 			changequest 9013,9015;
 			mes "[Catherine]";
@@ -246,15 +246,15 @@ gef_tower,111,37,4	script	Wizard Guildsman	1_F_GYPSY,{
 		mes "Did you get all the items?";
 		mes "Let's see... Do you have the right ones?...";
 		next;
-		if (countitem(991) > 4 && countitem(993) > 4 && countitem(990) > 4 && countitem(992) > 4) {
+		if (countitem(Crystal_Blue) > 4 && countitem(Yellow_Live) > 4 && countitem(Boody_Red) > 4 && countitem(Wind_Of_Verdure) > 4) {
 			mes "[Catherine]";
 			mes "Perfect! Good job...I'm satisfied! ~Hehe";
 			mes "Our guild greatly appreciates these items and will use them wisely.";
 			next;
-			delitem 991,5; //Crystal_Blue
-			delitem 993,5; //Yellow_Live
-			delitem 990,5; //Boody_Red
-			delitem 992,5; //Wind_Of_Verdure
+			delitem Crystal_Blue,5;
+			delitem Yellow_Live,5;
+			delitem Boody_Red,5;
+			delitem Wind_Of_Verdure,5;
 			WIZ_Q = 3;
 			changequest 9014,9015;
 			mes "[Catherine]";
@@ -302,8 +302,8 @@ gef_tower,111,37,4	script	Wizard Guildsman	1_F_GYPSY,{
 		next;
 		switch(select("Give me some hints, please.:I want to try again on my own!")) {
 		case 1:
-			if (countitem(531) > 0) {
-				delitem 531,1; //Apple_Juice
+			if (countitem(Apple_Juice) > 0) {
+				delitem Apple_Juice,1;
 				mes "[Catherine]";
 				mes "Yummers, Apple Juice is the best...";
 				mes "Gulp gulp gulp... Haaaaaah... ~Hehe";
@@ -451,7 +451,7 @@ gef_tower,111,37,4	script	Wizard Guildsman	1_F_GYPSY,{
 		mes "rummage rummage...";
 		mes "shuffle shuffle...";
 		next;
-		getitem 505,6; //Blue_Potion
+		getitem Blue_Potion,6;
 		mes "[Catherine]";
 		mes "Here you go. I hope you'll make good use of it when you need it. ~tehehe";
 		mes "I gave them to you as a present, so don't go out and sell it. Use it for yourself, ok?";
@@ -933,8 +933,8 @@ gef_tower,102,24,2	script	Gloomy Wizard	4_M_JOB_WIZARD,{
 				warp "job_wiz",57,154;
 				end;
 			}
-			if (countitem(618) > 0) {
-				delitem 618,1; //Worn_Out_Scroll
+			if (countitem(Worn_Out_Scroll) > 0) {
+				delitem Worn_Out_Scroll,1;
 				mes "[Raulel]";
 				mes "Hahahahahahahaha~ *Cough* *cough* So you ended up bringing one of these eh? Good job...";
 				mes "I think I can continue my research with this...";
diff --git a/npc/jobs/2-1e/StarGladiator.txt b/npc/jobs/2-1e/StarGladiator.txt
index 4a3171f0f..189852e48 100644
--- a/npc/jobs/2-1e/StarGladiator.txt
+++ b/npc/jobs/2-1e/StarGladiator.txt
@@ -453,7 +453,7 @@ comodo,172,230,3	script	Wandering Master#job_sta	4_M_JOB_ASSASSIN,{
 			close;
 		}
 		else if (STGL_Q == 2) {
-			if (countitem(996) > 0 && countitem(997) > 0 && countitem(995) > 0 && countitem(994) > 0) {
+			if (countitem(Rough_Wind) > 0 && countitem(Great_Nature) > 0 && countitem(Mistic_Frozen) > 0 && countitem(Flame_Heart) > 0) {
 				mes "[Moogang]";
 				mes "Ah, you've completed the";
 				mes "task I've set for you. Very";
@@ -500,10 +500,10 @@ comodo,172,230,3	script	Wandering Master#job_sta	4_M_JOB_ASSASSIN,{
 				mes "and all things. Now, when you";
 				mes "are ready for the next test, then";
 				mes "I shall guide you to the altar.";
-				delitem 996,1; //Rough_Wind
-				delitem 997,1; //Great_Nature
-				delitem 995,1; //Mistic_Frozen
-				delitem 994,1; //Flame_Heart
+				delitem Rough_Wind,1;
+				delitem Great_Nature,1;
+				delitem Mistic_Frozen,1;
+				delitem Flame_Heart,1;
 				STGL_Q = 3;
 				changequest 7008,7009;
 				close;
@@ -1466,7 +1466,7 @@ job_star,161,33,0	script	Cheehee#job_star	1_F_ORIENT_03,{
 			close;
 		}
 		else if (STGL_Q == 10) {
-			if (countitem(1000) > 0 && countitem(1001) > 0) {
+			if (countitem(Star_Crumb) > 0 && countitem(Sparkling_Dust) > 0) {
 				mes "[Cheehee]";
 				mes "Oh? You've brought exactly";
 				mes "what I've asked you to bring.";
@@ -1482,8 +1482,8 @@ job_star,161,33,0	script	Cheehee#job_star	1_F_ORIENT_03,{
 				mes "Occasionally, the stars can";
 				mes "be saddening, but it's a very";
 				mes "sweet kind of sadness...";
-				delitem 1000,1; //Star_Crumb
-				delitem 1001,1; //Sparkling_Dust
+				delitem Star_Crumb,1;
+				delitem Sparkling_Dust,1;
 				STGL_Q = 11;
 				close;
 			}
diff --git a/npc/jobs/2-2/alchemist.txt b/npc/jobs/2-2/alchemist.txt
index 85c1354a6..58a0a687b 100644
--- a/npc/jobs/2-2/alchemist.txt
+++ b/npc/jobs/2-2/alchemist.txt
@@ -240,7 +240,7 @@ alde_alche,27,185,5	script	Alchemist Guildsman#am	4_F_ALCHE,{
 		}
 	}
 	else if (ALCH_Q >= 1 && ALCH_Q <= 3) {
-		if (countitem(1006) > 0 && countitem(1005) > 0) {
+		if (countitem(Old_Magic_Book) > 0 && countitem(Hammer_Of_Blacksmith) > 0) {
 			mes "Well now~!";
 			mes "You've brought an";
 			mes "Old Magic Book and";
@@ -248,8 +248,8 @@ alde_alche,27,185,5	script	Alchemist Guildsman#am	4_F_ALCHE,{
 			mes "We'll put these items";
 			mes "to good use.";
 			next;
-			delitem 1006,1; //Old_Magic_Book
-			delitem 1005,1; //Hammer_Of_Blacksmith
+			delitem Old_Magic_Book,1;
+			delitem Hammer_Of_Blacksmith,1;
 			mes "[Parmy Gianino]";
 			mes "Okay, now you need to learn";
 			mes "the basics to being an Alchemist and learn the procedures for mixing chemicals and medicines.";
@@ -812,7 +812,7 @@ alde_alche,175,107,3	script	Fastidious Alchemist#am	4_M_ALCHE_B,{
 }
 
 alde_alche,13,15,7	script	Studying Man#am	4_M_ALCHE_C,{
-	if (checkweight(1201,1) == 0) {
+	if (checkweight(Knife,1) == 0) {
 		mes "- Wait a minute! -";
 		mes "- Currently you are carrying -";
 		mes "- too many items with you. -";
@@ -1010,7 +1010,7 @@ alde_alche,13,15,7	script	Studying Man#am	4_M_ALCHE_C,{
 		mes "wishes to learn Alchemy.";
 		mes "Have you prepared everything?";
 		next;
-		if (countitem(710) > 0) {
+		if (countitem(Illusion_Flower) > 0) {
 			mes "[Darwin]";
 			mes "Wait.";
 			mes "That Illusion Flower.";
@@ -1103,7 +1103,7 @@ alde_alche,13,15,7	script	Studying Man#am	4_M_ALCHE_C,{
 			mes "posuere cubilia Curae; Morbi";
 			mes "massa, fermentum vitae...";
 			next;
-			delitem 710,1; //Illusion_Flower
+			delitem Illusion_Flower,1;
 			mes "[Darwin]";
 			mes "^666666*Gasp...*^000000";
 			mes "You are now";
@@ -1115,7 +1115,7 @@ alde_alche,13,15,7	script	Studying Man#am	4_M_ALCHE_C,{
 			changequest 2033,2034;
 			close;
 		}
-		else if (countitem(7134) > 2 && countitem(713) > 2 && countitem(507) > 0 && countitem(508) > 0 && countitem(509) > 0) {
+		else if (countitem(Medicine_Bowl) > 2 && countitem(Empty_Bottle) > 2 && countitem(Red_Herb) > 0 && countitem(Yellow_Herb) > 0 && countitem(White_Herb) > 0) {
 			mes "[Darwin]";
 			mes "Seems like you have everything ready. As promised, I will teach you how to make simple medicine.";
 			next;
@@ -1130,11 +1130,11 @@ alde_alche,13,15,7	script	Studying Man#am	4_M_ALCHE_C,{
 			next;
 			mes "[Darwin]";
 			mes "That's how you make it. If you think you have enough, gently pour the mixture into an empty bottle.";
-			delitem 7134,3; //Medicine_Bowl
-			delitem 713,3; //Empty_Bottle
-			delitem 507,1; //Red_Herb
-			delitem 508,1; //Yellow_Herb
-			delitem 509,1; //White_Herb
+			delitem Medicine_Bowl,3;
+			delitem Empty_Bottle,3;
+			delitem Red_Herb,1;
+			delitem Yellow_Herb,1;
+			delitem White_Herb,1;
 			next;
 			mes "[Darwin]";
 			mes "There you go,";
@@ -1270,9 +1270,9 @@ alde_alche,13,15,7	script	Studying Man#am	4_M_ALCHE_C,{
 				mes "again until you get it right.";
 				close;
 			}
-			getitem 501,1; //Red_Potion
-			getitem 503,1; //Yellow_Potion
-			getitem 504,1; //White_Potion
+			getitem Red_Potion,1;
+			getitem Yellow_Potion,1;
+			getitem White_Potion,1;
 			mes "[Darwin]";
 			mes "Good job.";
 			mes "It came out pretty well considering it's your first time. Go ahead and keep the medicines that you've just made.";
@@ -1730,7 +1730,7 @@ alde_alche,101,184,4	script	Master Alchemist#am	2_M_DYEINGER,{
 		mes "I hope you learn a lot...";
 		next;
 		if (.@jlevel == 50) {
-			getitem 7133,1; //Slim_Potion_Create_Book
+			getitem Slim_Potion_Create_Book,1;
 			mes "[Vincent Carsciallo]";
 			mes "Let me give you";
 			mes "something special.";
@@ -1741,22 +1741,22 @@ alde_alche,101,184,4	script	Master Alchemist#am	2_M_DYEINGER,{
 		else {
 			switch(rand(1,6)) {
 			case 1:
-				getitem 7127,1; //Alcol_Create_Book
+				getitem Alcol_Create_Book,1;
 				break;
 			case 2:
-				getitem 7128,1; //FireBottle_Create_Book
+				getitem FireBottle_Create_Book,1;
 				break;
 			case 3:
-				getitem 7129,1; //Acid_Create_Book
+				getitem Acid_Create_Book,1;
 				break;
 			case 4:
-				getitem 7130,1; //Plant_Create_Book
+				getitem Plant_Create_Book,1;
 				break;
 			case 5:
-				getitem 7131,1; //Mine_Create_Book
+				getitem Mine_Create_Book,1;
 				break;
 			case 6:
-				getitem 7144,1; //Normal_Potion_Book
+				getitem Normal_Potion_Book,1;
 			}
 			mes "[Vincent Carsciallo]";
 			mes "And...";
@@ -1793,7 +1793,7 @@ alde_alche,101,184,4	script	Master Alchemist#am	2_M_DYEINGER,{
 }
 
 alde_alche,145,19,1	script	Chief Researcher#am	1_M_LIBRARYMASTER,{
-	if (checkweight(1201,1) == 0) {
+	if (checkweight(Knife,1) == 0) {
 		mes "- Wait a minute! -";
 		mes "- Currently you are carrying -";
 		mes "- too many items with you. -";
@@ -1941,11 +1941,11 @@ alde_alche,145,19,1	script	Chief Researcher#am	1_M_LIBRARYMASTER,{
 		mes "5 Fine Sand,";
 		mes "3 Rough Oridecon";
 		mes "and 3 Rough Elunium.";
-		getitem 974,1; //Mixture
-		getitem 7068,5; //Burn_Tree
-		getitem 7043,5; //Fine_Sand
-		getitem 756,3; //Oridecon_Stone
-		getitem 757,3; //Elunium_Stone
+		getitem Mixture,1;
+		getitem Burn_Tree,5;
+		getitem Fine_Sand,5;
+		getitem Oridecon_Stone,3;
+		getitem Elunium_Stone,3;
 		next;
 		mes "[Nicholas Flamel]";
 		mes "Alright.";
diff --git a/npc/jobs/2-2/bard.txt b/npc/jobs/2-2/bard.txt
index 0055cf924..1839e9fb4 100644
--- a/npc/jobs/2-2/bard.txt
+++ b/npc/jobs/2-2/bard.txt
@@ -267,80 +267,80 @@ comodo,226,123,5	script	Wandering Bard	2_M_BARD_ORIENT,{
 		next;
 		mes "[Lalo]";
 		//Good Flowers
-		if (countitem(629) > 0) {
+		if (countitem(Singing_Flower) > 0) {
 			mes "Ooh! It's a Singing Flower!";
 			mes "It's full of my memories...";
 			next;
-			delitem 629,1; //Singing Flower
+			delitem Singing_Flower,1; //Singing Flower
 			mes "[Lalo]";
 			mes "My friend Tchaikovsky used to like it.";
 			mes "I wonder what he's doing now...";
 		}
-		else if(countitem(703) > 0) {
+		else if(countitem(Hinalle) > 0) {
 			mes "Aah... the cute Hinelle...";
 			mes "It doesn't have a scent but it's a very moderate cute flower.";
 			next;
-			delitem 703,1; //Hinalle
+			delitem Hinalle,1;
 			mes "[Lalo]";
 			mes "The leaves gave me strength when I used to fall.";
 			mes "I really like this flower, thank you.";
 		}
-		else if(countitem(704) > 0) {
+		else if(countitem(Aloe) > 0) {
 			mes "Aloe... This is a rare flower.";
 			mes "How'd you get it? Rather skilled, eh?";
 			next;
-			delitem 704,1; //Aloe
+			delitem Aloe,1;
 			mes "[Lalo]";
 			mes "The leaves are good and Aloe Vera is delicious, too..";
 			mes "but it's defnitely the most beautiful when it's a flower.";
 		}
-		else if(countitem(708) > 0) {
+		else if(countitem(Ment) > 0) {
 			mes "Ment... You can forget about all your hardships with one of these.";
 			mes "Nice to see it in such a long time!";
 			next;
-			delitem 708,1; //Ment
+			delitem Ment,1;
 			mes "[Lalo]";
 			mes "I heard you can make Anodyne with it...";
 			mes "But that would be a slight waste.. thanks!";
 		}
-		else if(countitem(709) > 0) {
+		else if(countitem(Izidor) > 0) {
 			mes "Ooh, isn't this an Izidor?";
 			mes "It's a dangerous yet beautiful flower...";
 			next;
-			delitem 709,1; //Izidor
+			delitem Izidor,1;
 			mes "[Lalo]";
 			mes "The deep purple charms a person.. ";
 			mes "Thank you, I really like this flower.";
 		}
-		else if(countitem(748) > 0) {
+		else if(countitem(Witherless_Rose) > 0) {
 			mes "Ooh, a Witherless Rose. The strong flower that doesn't wither.";
 			mes "Great to give to a girlfriend.";
 			next;
-			delitem 748,1; //Witherless_Rose
+			delitem Witherless_Rose,1;
 			mes "[Lalo]";
 			mes "I wonder if it would be ok for a wanderer like me to accept it.";
 			mes "Haha, it should be ok.. right?";
 		}
-		else if(countitem(749) > 0 ) {
+		else if(countitem(Frozen_Rose) > 0 ) {
 			mes "Frozen Rose... you can't really call this a flower,";
 			mes "But it is still beautiful... a clear Rose.";
 			next;
-			delitem 749,1; //Frozen_Rose
+			delitem Frozen_Rose,1;
 			mes "[Lalo]";
 			mes "You can call it a flower even though it doesn't have a scent anymore.";
 			mes "Then I'll greatly take this.";
 		}
-		else if(countitem(710) > 0) {
+		else if(countitem(Illusion_Flower) > 0) {
 			mes "Oh, isn't this an Illusion Flower!?";
 			mes "Wow, how did you obtain such a rare flower!!";
 			next;
-			delitem 710,1; //Illusion_Flower
+			delitem Illusion_Flower,1;
 			mes "[Lalo]";
 			mes "Than you very much, aah... I feel like heaven is in front of my eyes.";
 			mes "What a wonderful feeling! I'm really happy!";
 		}
 		//Bad Flowers
-		else if(countitem(712) > 0) {
+		else if(countitem(Flower) > 0) {
 			cutin "job_bard_aiolo02",2;
 			mes "Eh? This is just a normal flower.";
 			mes "I like it... but it's not enough.";
@@ -352,7 +352,7 @@ comodo,226,123,5	script	Wandering Bard	2_M_BARD_ORIENT,{
 			cutin "job_bard_aiolo02",255;
 			end;
 		}
-		else if(countitem(744) > 0) {
+		else if(countitem(Bunch_Of_Flowers) > 0) {
 			mes "Oh no, you brought a Bouquet?";
 			mes "You can't bring me something like this.";
 			next;
@@ -363,7 +363,7 @@ comodo,226,123,5	script	Wandering Bard	2_M_BARD_ORIENT,{
 			cutin "job_bard_aiolo01",255;
 			end;
 		}
-		else if(countitem(745) > 0) {
+		else if(countitem(Wedding_Bouquet) > 0) {
 			cutin "job_bard_aiolo02",2;
 			mes "Oy oy... did you go to a wedding or something?";
 			mes "What do you expect a guy to do with a Wedding Bouquet?";
@@ -375,7 +375,7 @@ comodo,226,123,5	script	Wandering Bard	2_M_BARD_ORIENT,{
 			cutin "job_bard_aiolo02",255;
 			end;
 		}
-		else if(countitem(2207) > 0) {
+		else if(countitem(Fancy_Flower) > 0) {
 			mes "Mmm... a Fancy Flower.";
 			mes "It's nice... but this isn't good enough.";
 			next;
@@ -386,7 +386,7 @@ comodo,226,123,5	script	Wandering Bard	2_M_BARD_ORIENT,{
 			cutin "job_bard_aiolo01",255;
 			end;
 		}
-		else if(countitem(1032) > 0) {
+		else if(countitem(Blossom_Of_Maneater) > 0) {
 			cutin "job_bard_aiolo02",2;
 			mes "...Agh, why'd you bring such a hideous thing?";
 			mes "Are you thinking at all?";
@@ -874,10 +874,10 @@ comodo,226,123,5	script	Wandering Bard	2_M_BARD_ORIENT,{
 			else {
 				switch(BARD_Q) {
 				case 5:
-					if(countitem(1019) > 59) callsub S_ChangeJob,1019,1901;
-					else if(countitem(1068) > 59) callsub S_ChangeJob,1068,1903;
-					else if(countitem(1067) > 59) callsub S_ChangeJob,1067,1903;
-					else if(countitem(1066) > 59) {
+					if(countitem(Wooden_Block) > 59) callsub S_ChangeJob,1019,1901;
+					else if(countitem(Tree_Of_Archer_3) > 59) callsub S_ChangeJob,1068,1903;
+					else if(countitem(Tree_Of_Archer_2) > 59) callsub S_ChangeJob,1067,1903;
+					else if(countitem(Tree_Of_Archer_1) > 59) {
 						if(JobLevel > 49) callsub S_ChangeJob,1066,1910;
 						else callsub S_ChangeJob,1066,1905;
 					}
diff --git a/npc/jobs/2-2/crusader.txt b/npc/jobs/2-2/crusader.txt
index a582aa6f9..fc97351d5 100644
--- a/npc/jobs/2-2/crusader.txt
+++ b/npc/jobs/2-2/crusader.txt
@@ -78,7 +78,7 @@ prt_castle,45,169,5	script	Senior Crusader	4_M_CRU_OLD,{
 		mes "As it happened one thousand years ago, evil forces will one day attack in droves in an attempt to take over the world once again.";
 		close;
 	}
-	else if(CRUS_Q <= 3 && countitem(1004) && countitem(1009)) {
+	else if(CRUS_Q <= 3 && countitem(Patriotism_Marks) && countitem(Sacred_Marks)) {
 		mes "Ah...";
 		mes "I see that you have been called to become a Crusader. We are assured of your will, but now we must test your capabilities.";
 		next;
@@ -148,7 +148,7 @@ prt_castle,45,169,5	script	Senior Crusader	4_M_CRU_OLD,{
 				mes "" + strcharinfo(0) + "...?";
 				mes "Let's see...";
 				next;
-				if (countitem(1004) && countitem(1009)) {
+				if (countitem(Patriotism_Marks) && countitem(Sacred_Marks)) {
 					mes "[Michael Halig]";
 					mes "Ah...";
 					mes "I see that you have been called to become a Crusader. We are assured of your will, but now we must test your capabilities.";
@@ -902,7 +902,7 @@ prt_castle,35,151,5	script	Patron Knight	4_M_CRU,{
 				mes "have a Rosary.";
 				close;
 			}
-			else if(countitem(523) < 1) {
+			else if(countitem(Holy_Water) < 1) {
 				mes "[Bliant Piyord]";
 				mes "For the battle test, please prepare one ^3355FFHoly water^000000.";
 				mes "I told you just to purify the candidates.";
@@ -912,7 +912,7 @@ prt_castle,35,151,5	script	Patron Knight	4_M_CRU,{
 				mes "I will wait for you.";
 				close;
 			}
-			delitem 523, 1; //Holy Water
+			delitem Holy_Water, 1; //Holy Water
 			mes "[Bliant Piyord]";
 			mes "Then, I'll start";
 			mes "the test. You will";
diff --git a/npc/jobs/2-2/dancer.txt b/npc/jobs/2-2/dancer.txt
index d1162ec41..4ceb4ca99 100644
--- a/npc/jobs/2-2/dancer.txt
+++ b/npc/jobs/2-2/dancer.txt
@@ -906,9 +906,9 @@ job_duncer,95,93,4	script	Bijou#da	4W_F_01,{
 		mes "Please take it.";
 		mes "May your performances always bring joy to your audience~";
 		if (.@jlevel == 50)
-			getitem 1953,1; //Line_
+			getitem Line_,1;
 		else
-			getitem 1950,1; //Rope
+			getitem Rope,1;
 		close;
 	}
 }
diff --git a/npc/jobs/2-2/monk.txt b/npc/jobs/2-2/monk.txt
index 410fbf79a..b7ec9ffaa 100644
--- a/npc/jobs/2-2/monk.txt
+++ b/npc/jobs/2-2/monk.txt
@@ -439,15 +439,15 @@ monk_in,99,58,1	script	Sensei Moohae#mk	1_M_PASTOR,{
 		mes "[Sensei Moohae]";
 		mes "You are back, did you bring what I asked?";
 		next;
-		if (countitem(938) > 4 && countitem(1055) > 9 && countitem(511) > 19) {
+		if (countitem(Sticky_Mucus) > 4 && countitem(Earthworm_Peeling) > 9 && countitem(Green_Herb) > 19) {
 			mes "[Sensei Moohae]";
 			mes "Well done, you found all the items.";
 			mes "I will tell this to the elders.";
 			MONK_Q = 10;
 			changequest 3017,3024;
-			delitem 938,5; //Sticky_Mucus
-			delitem 1055,10; //Earthworm_Peeling
-			delitem 511,20; //Green_Herb
+			delitem Sticky_Mucus,5;
+			delitem Earthworm_Peeling,10;
+			delitem Green_Herb,20;
 			next;
 			mes "[Sensei Moohae]";
 			mes "Let's see who is to see you next..";
@@ -470,15 +470,15 @@ monk_in,99,58,1	script	Sensei Moohae#mk	1_M_PASTOR,{
 		mes "[Sensei Moohae]";
 		mes "...eh?";
 		next;
-		if (countitem(942) > 19 && countitem(1002) > 4 && countitem(510) > 2) {
+		if (countitem(Yoyo_Tail) > 19 && countitem(Iron_Ore) > 4 && countitem(Blue_Herb) > 2) {
 			mes "[Sensei Moohae]";
 			mes "Very good, you found all the items.";
 			mes "I will tell this to the elders.";
 			MONK_Q = 10;
 			changequest 3018,3024;
-			delitem 942,20; //Yoyo_Tail
-			delitem 1002,5; //Iron_Ore
-			delitem 510,3; //Blue_Herb
+			delitem Yoyo_Tail,20;
+			delitem Iron_Ore,5;
+			delitem Blue_Herb,3;
 			next;
 			mes "[Sensei Moohae]";
 			mes "Let's see who is to see you next..";
@@ -501,15 +501,15 @@ monk_in,99,58,1	script	Sensei Moohae#mk	1_M_PASTOR,{
 		mes "[Sensei Moohae]";
 		mes "Hmm?";
 		next;
-		if (countitem(905) > 29 && countitem(909) > 4 && countitem(955) > 9) {
+		if (countitem(Stem) > 29 && countitem(Jellopy) > 4 && countitem(Worm_Peelings) > 9) {
 			mes "[Sensei Moohae]";
 			mes "See, that wasn't so bad you real found all the items.";
 			mes "I will tell this to the elders.";
 			MONK_Q = 10;
 			changequest 3019,3024;
-			delitem 905,30; //Stem
-			delitem 909,5; //Jellopy
-			delitem 955,10; //Worm_Peelings
+			delitem Stem,30;
+			delitem Jellopy,5;
+			delitem Worm_Peelings,10;
 			next;
 			mes "[Sensei Moohae]";
 			mes "The next step will be given";
@@ -532,15 +532,15 @@ monk_in,99,58,1	script	Sensei Moohae#mk	1_M_PASTOR,{
 		mes "[Sensei Moohae]";
 		mes "I have been waiting for you.";
 		next;
-		if (countitem(943) > 4 && countitem(935) > 19 && countitem(912) > 4) {
+		if (countitem(Solid_Shell) > 4 && countitem(Shell) > 19 && countitem(Zargon) > 4) {
 			mes "[Sensei Moohae]";
 			mes "Impressive, you really found all the items.";
 			mes "I will tell this to the elders.";
 			MONK_Q = 10;
 			changequest 3020,3024;
-			delitem 943,5; //Solid_Shell
-			delitem 935,20; //Shell
-			delitem 912,5; //Zargon
+			delitem Solid_Shell,5;
+			delitem Shell,20;
+			delitem Zargon,5;
 			next;
 			mes "[Sensei Moohae]";
 			mes "Your next step will be with..";
@@ -563,15 +563,15 @@ monk_in,99,58,1	script	Sensei Moohae#mk	1_M_PASTOR,{
 		mes "[Sensei Moohae]";
 		mes "Hello again. Back so soon?";
 		next;
-		if (countitem(7053) > 4 && countitem(509) > 9 && countitem(508) > 9) {
+		if (countitem(Cyfar) > 4 && countitem(White_Herb) > 9 && countitem(Yellow_Herb) > 9) {
 			mes "[Sensei Moohae]";
 			mes "Very nice, you found all the items.";
 			mes "I will tell this to the elders.";
 			MONK_Q = 10;
 			changequest 3021,3024;
-			delitem 7053,5; //Cyfar
-			delitem 509,10; //White_Herb
-			delitem 508,10; //Yellow_Herb
+			delitem Cyfar,5;
+			delitem White_Herb,10;
+			delitem Yellow_Herb,10;
 			next;
 			mes "[Sensei Moohae]";
 			mes "Let's see who is to see you next..";
@@ -594,15 +594,15 @@ monk_in,99,58,1	script	Sensei Moohae#mk	1_M_PASTOR,{
 		mes "[Sensei Moohae]";
 		mes "Hmm?";
 		next;
-		if (countitem(913) > 9 && countitem(948) > 4 && countitem(7033) > 19) {
+		if (countitem(Tooth_Of_Bat) > 9 && countitem(Bear's_Foot) > 4 && countitem(Poison_Spore) > 19) {
 			mes "[Sensei Moohae]";
 			mes "Excellent, all the items I asked for.";
 			mes "I will tell this to the elders.";
 			MONK_Q = 10;
 			changequest 3022,3024;
-			delitem 913,10; //Tooth_Of_Bat
-			delitem 948,5; //Bear's_Foot
-			delitem 7033,20; //Poison_Spore
+			delitem Tooth_Of_Bat,10;
+			delitem Bear's_Foot,5;
+			delitem Poison_Spore,20;
 			next;
 			mes "[Sensei Moohae]";
 			mes "Let's see who is to see you next..";
@@ -625,15 +625,15 @@ monk_in,99,58,1	script	Sensei Moohae#mk	1_M_PASTOR,{
 		mes "[Sensei Moohae]";
 		mes "Welcome back.";
 		next;
-		if (countitem(1027) > 4 && countitem(1025) > 19 && countitem(1042) > 9) {
+		if (countitem(Porcupine_Spike) > 4 && countitem(Spiderweb) > 19 && countitem(Short_Leg) > 9) {
 			mes "[Sensei Moohae]";
 			mes "Wow, you found all the items!!";
 			mes "I will tell this to the elders.";
 			MONK_Q = 10;
 			changequest 3023,3024;
-			delitem 1027,5; //Porcupine_Spike
-			delitem 1025,20; //Spiderweb
-			delitem 1042,10; //Short_Leg
+			delitem Porcupine_Spike,5;
+			delitem Spiderweb,20;
+			delitem Short_Leg,10;
 			next;
 			mes "[Sensei Moohae]";
 			mes "Let's see who is to see you next..";
@@ -678,12 +678,12 @@ monk_in,99,58,1	script	Sensei Moohae#mk	1_M_PASTOR,{
 		close;
 	}
 	else if (MONK_Q == 28 && BaseJob == Job_Acolyte) {
-		if (countitem(506) > 0) {
+		if (countitem(Green_Potion) > 0) {
 			mes "[Sensei Moohae]";
 			mes "Do you still have the medicine you were supposed to bring?";
 			mes "You must drink that green potion to strengthen yourself for becoming a monk.";
 		}
-		else if (countitem(506) == 0) {
+		else if (countitem(Green_Potion) == 0) {
 			mes "[Sensei Moohae]";
 			mes "Have you finished the task? Good, so you do have what it takes to become a monk.";
 			mes "You didn't throw away the precious potion did you?";
@@ -891,9 +891,9 @@ monk_in,99,58,1	script	Sensei Moohae#mk	1_M_PASTOR,{
 			mes "Now...you may leave where the wind may take you.";
 			mes "Oh and I have a gift for you before you leave.";
 			if (.@jlevel == 50)
-				getitem 1804,1; //Knuckle_Duster_
+				getitem Knuckle_Duster_,1;
 			else
-				getitem 1801,1; //Waghnakh
+				getitem Waghnakh,1;
 		}
 		close;
 	}
@@ -2049,7 +2049,7 @@ 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	4_M_ORIENT02,{
-	if ((countitem(1069) > 0 || countitem(1070) > 0) && (countitem(1069) < 30 || countitem(1070) < 30)) {
+	if ((countitem(Mushroom_Of_Thief_1) > 0 || countitem(Mushroom_Of_Thief_2) > 0) && (countitem(Mushroom_Of_Thief_1) < 30 || countitem(Mushroom_Of_Thief_2) < 30)) {
 		mes "[Hyunmoo]";
 		mes "You didn't bring enough mushrooms... go get some more.";
 		next;
@@ -2070,7 +2070,7 @@ job_monk,225,180,1	script	Hyunmoo#mk	4_M_ORIENT02,{
 		warp "prt_monk",194,168;
 		end;
 	}
-	else if (MONK_Q > 14 && MONK_Q < 25 && (countitem(1069) == 0 || countitem(1070)  == 0)) {
+	else if (MONK_Q > 14 && MONK_Q < 25 && (countitem(Mushroom_Of_Thief_1) == 0 || countitem(Mushroom_Of_Thief_2)  == 0)) {
 		mes "[Hyunmoo]";
 		mes "Nice to meet you. My name is Hyunmoo. I am in charge of the mushroom test.";
 		next;
@@ -2107,8 +2107,8 @@ job_monk,225,180,1	script	Hyunmoo#mk	4_M_ORIENT02,{
 		mes "[Hyunmoo]";
 		mes ".....yeah I thought as much....you don't have the spirit needed to become a monk.";
 		mapannounce "job_monk","" + strcharinfo(0) + ", has quit his testing to become a monk.",bc_map;
-		delitem 1069,countitem(1069); //Mushroom_Of_Thief_1
-		delitem 1070,countitem(1070); //Mushroom_Of_Thief_2
+		delitem Mushroom_Of_Thief_1,countitem(Mushroom_Of_Thief_1);
+		delitem Mushroom_Of_Thief_2,countitem(Mushroom_Of_Thief_2);
 		close2;
 		mapannounce "job_monk","" + strcharinfo(0) + ", has quit his training to become a monk.",bc_map;
 		warp "prt_monk",194,168;
@@ -2116,7 +2116,7 @@ job_monk,225,180,1	script	Hyunmoo#mk	4_M_ORIENT02,{
 		changequest 3027,3028;
 		end;
 	}
-	else if (MONK_Q > 14 && MONK_Q < 25 && (countitem(1069) > 29 || countitem(1070) > 29)) {
+	else if (MONK_Q > 14 && MONK_Q < 25 && (countitem(Mushroom_Of_Thief_1) > 29 || countitem(Mushroom_Of_Thief_2) > 29)) {
 		mes "[Hyunmoo]";
 		mes "...hmm... not bad.";
 		mes "Ok, you passed.";
@@ -2126,8 +2126,8 @@ job_monk,225,180,1	script	Hyunmoo#mk	4_M_ORIENT02,{
 		mes "Tomoon is staying in the deepest room inside a building near this abbey.";
 		MONK_Q = 25;
 		changequest 3027,3029;
-		delitem 1069,countitem(1069); //Mushroom_Of_Thief_1
-		delitem 1070,countitem(1070); //Mushroom_Of_Thief_2
+		delitem Mushroom_Of_Thief_1,countitem(Mushroom_Of_Thief_1);
+		delitem Mushroom_Of_Thief_2,countitem(Mushroom_Of_Thief_2);
 		close2;
 		warp "prt_monk",194,168;
 		end;
@@ -2226,7 +2226,7 @@ monk_test,319,139,1	script	Tomoon#mk	1_M_HOF,{
 		mes "I knew you'd make it through!";
 		mes "Now...I will give you a secret potion which will double your physical strength.";
 		next;
-		getitem 506,1; //Green_Potion
+		getitem Green_Potion,1;
 		mes "Drink this potion and you will be able to become a monk!!!";
 		mes "... now go back to sensei Moohae!!!";
 		MONK_Q = 28;
diff --git a/npc/jobs/2-2/rogue.txt b/npc/jobs/2-2/rogue.txt
index ffd59ffe0..9181492cc 100644
--- a/npc/jobs/2-2/rogue.txt
+++ b/npc/jobs/2-2/rogue.txt
@@ -202,9 +202,9 @@ in_rogue,363,122,4	script	Rogue Guildsman#rg	4_F_ROGUE,{
 				mes "Enjoy your freedom as a Rogue. Just remember that you gotta be free and responsible at the same time. So treat other guys the way you wanna be treated, kay? Alright, seeya round.";
 				close2;
 				if (.@jlevel == 50) {
-					getitem 1220,1; //Gladius_
+					getitem Gladius_,1;
 				} else {
-					getitem 1219,1; //Gladius
+					getitem Gladius,1;
 				}
 				end;
 			}
@@ -673,31 +673,31 @@ in_rogue,376,23,1	script	Mr. Smith#rg	1_M_LIBRARYMASTER,{
 		else if (ROGUE_Q == 4) callsub S_CheckItems,511,10,910,10,926,10,964,10;
 		else if (ROGUE_Q == 5) callsub S_CheckItems,508,10,948,10,935,10,940,10;
 		else if (ROGUE_Q == 6) {
-			if (Zeny > 9999 && countitem(915) > 4 && countitem(713) > 4 && countitem(1002) > 4 &&
-			countitem(953) > 4 && countitem(507) > 4 && countitem(919) > 4 && countitem(715) > 4 &&
-			countitem(913) > 4 && countitem(904) > 4 && countitem(942) > 4 && countitem(528) > 4 &&
-			countitem(914) > 4 && countitem(705) > 4 && countitem(916) > 4 && countitem(917) > 4 &&
-			countitem(908) > 4 && countitem(945) > 4) {
+			if (Zeny > 9999 && countitem(Chrysalis) > 4 && countitem(Empty_Bottle) > 4 && countitem(Iron_Ore) > 4 &&
+			countitem(Stone_Heart) > 4 && countitem(Red_Herb) > 4 && countitem(Animal's_Skin) > 4 && countitem(Yellow_Gemstone) > 4 &&
+			countitem(Tooth_Of_Bat) > 4 && countitem(Scorpion's_Tail) > 4 && countitem(Yoyo_Tail) > 4 && countitem(Monster's_Feed) > 4 &&
+			countitem(Fluff) > 4 && countitem(Clover) > 4 && countitem(Feather_Of_Birds) > 4 && countitem(Talon) > 4 &&
+			countitem(Spawn) > 4 && countitem(Raccoon_Leaf) > 4) {
 				mes "[Mr. Smith]";
 				mes "Ummm...let's see...";
 				Zeny -= 10000;
-				delitem 915,5; //Chrysalis
-				delitem 713,5; //Empty_Bottle
-				delitem 1002,5; //Iron_Ore
-				delitem 953,5; //Stone_Heart
-				delitem 507,5; //Red_Herb
-				delitem 919,5; //Animal's_Skin
-				delitem 715,5; //Yellow_Gemstone
-				delitem 913,5; //Tooth_Of_Bat
-				delitem 904,5; //Scorpion's_Tail
-				delitem 942,5; //Yoyo_Tail
-				delitem 528,5; //Monster's_Feed
-				delitem 914,5; //Fluff
-				delitem 705,5; //Clover
-				delitem 916,5; //Feather_Of_Birds
-				delitem 917,5; //Talon
-				delitem 908,5; //Spawn
-				delitem 945,5; //Raccoon_Leaf
+				delitem Chrysalis,5;
+				delitem Empty_Bottle,5;
+				delitem Iron_Ore,5;
+				delitem Stone_Heart,5;
+				delitem Red_Herb,5;
+				delitem Animal's_Skin,5;
+				delitem Yellow_Gemstone,5;
+				delitem Tooth_Of_Bat,5;
+				delitem Scorpion's_Tail,5;
+				delitem Yoyo_Tail,5;
+				delitem Monster's_Feed,5;
+				delitem Fluff,5;
+				delitem Clover,5;
+				delitem Feather_Of_Birds,5;
+				delitem Talon,5;
+				delitem Spawn,5;
+				delitem Raccoon_Leaf,5;
 				ROGUE_Q = 8;
 				next;
 				mes "[Mr. Smith]";
@@ -713,7 +713,7 @@ in_rogue,376,23,1	script	Mr. Smith#rg	1_M_LIBRARYMASTER,{
 				next;
 				mes "[Mr. Smith]";
 				mes "But I'm sure you'll be a great asset to the Rogue Guild. Hmm, I don't have a blank piece of paper right now, so take this instead...";
-				getitem 1097,1; //Worn_Out_Page
+				getitem Worn_Out_Page,1;
 				next;
 				mes "[Mr. Smith]";
 				mes "*Sigh...*";
diff --git a/npc/jobs/2-2/sage.txt b/npc/jobs/2-2/sage.txt
index ab873f6f0..b3a7ac4b7 100644
--- a/npc/jobs/2-2/sage.txt
+++ b/npc/jobs/2-2/sage.txt
@@ -137,7 +137,7 @@ yuno_in02,38,61,5	script	Dean of the Academy#sa	2_M_SAGE_OLD,{
 		end;
 	}
 	else if (SAGE_Q == 15) {
-		if (countitem(1550) > 0) {
+		if (countitem(Book) > 0) {
 			if (JobLevel < 40) {
 				SAGE_Q = 0;
 				mes "You don't seem to be qualified yet.";
@@ -373,9 +373,9 @@ yuno_in03,154,35,4	script	Staff of the Academy#a	2_M_SAGE_B,{
 					mes "Please make sure you have at least 70,000 zeny to enroll in classes.";
 					close;
 				}
-				if (countitem(1006) > 0 && countitem(1007) > 0) {
-					delitem 1006,1; //Old_Magic_Book
-					delitem 1007,1; //Penetration
+				if (countitem(Old_Magic_Book) > 0 && countitem(Penetration) > 0) {
+					delitem Old_Magic_Book,1;
+					delitem Penetration,1;
 					mes "[Metheus Sylphe]";
 					mes "Thank you, your application has been accepted.";
 					mes "Next, you will take the entrance test.";
@@ -519,9 +519,9 @@ yuno_in03,154,35,4	script	Staff of the Academy#a	2_M_SAGE_B,{
 	else if (SAGE_Q >= 1 && SAGE_Q <= 3) {
 		mes "Welcome, once again.";
 		next;
-		if (countitem(1006) > 0 && countitem(1007) > 0) {
-			delitem 1006,1; //Old_Magic_Book
-			delitem 1007,1; //Penetration
+		if (countitem(Old_Magic_Book) > 0 && countitem(Penetration) > 0) {
+			delitem Old_Magic_Book,1;
+			delitem Penetration,1;
 			mes "[Metheus Sylphe]";
 			mes "Well done. Let me proceed with your application request.";
 			SAGE_Q = 4;
@@ -1367,7 +1367,7 @@ yuno_in03,62,176,2	script	History Professor#sa	4_M_MANAGER,{
 			close;
 		}
 		else {
-			if (countitem(607) > 0) {
+			if (countitem(Yggdrasilberry) > 0) {
 				mes "[Saphien Layless]";
 				mes "Oh, did you bring them with you? Excellent!";
 				mes "You brought Yggdrasilberry!";
@@ -1377,7 +1377,7 @@ yuno_in03,62,176,2	script	History Professor#sa	4_M_MANAGER,{
 				mes "Listen carefully, I will not accept dozing off in the middle of class.";
 				next;
 			}
-			else if (countitem(608) > 0) {
+			else if (countitem(Seed_Of_Yggdrasil) > 0) {
 				mes "[Saphien Layless]";
 				mes "Hmm, did you prepare for class? Let's see...";
 				mes "Oh! So you brought me the Yggdrasil Seed?";
@@ -1387,7 +1387,7 @@ yuno_in03,62,176,2	script	History Professor#sa	4_M_MANAGER,{
 				mes "Listen carefully, I will not accept dozing off in the middle of class.";
 				next;
 			}
-			else if (countitem(610) > 0) {
+			else if (countitem(Leaf_Of_Yggdrasil) > 0) {
 				mes "[Saphien Layless]";
 				mes "Hmm, did you prepare for class? Let's see...";
 				mes "Yggdrasil Leaf...";
@@ -1494,12 +1494,12 @@ yuno_in03,62,176,2	script	History Professor#sa	4_M_MANAGER,{
 		}
 	}
 	else if (SAGE_Q == 10) {
-		if (countitem(916) > 0 && countitem(919) > 0 && countitem(1019) > 0 && countitem(1024) > 0 && countitem(713) > 0) {
-			delitem 916,1; //Feather_Of_Birds
-			delitem 919,1; //Animal's_Skin
-			delitem 1019,1; //Wooden_Block
-			delitem 1024,1; //Chinese_Ink
-			delitem 713,1; //Empty_Bottle
+		if (countitem(Feather_Of_Birds) > 0 && countitem(Animal's_Skin) > 0 && countitem(Wooden_Block) > 0 && countitem(Chinese_Ink) > 0 && countitem(Empty_Bottle) > 0) {
+			delitem Feather_Of_Birds,1;
+			delitem Animal's_Skin,1;
+			delitem Wooden_Block,1;
+			delitem Chinese_Ink,1;
+			delitem Empty_Bottle,1;
 			mes "Now, you're writing your thesis.";
 			mes "I will assist you with your writing.";
 			next;
@@ -1669,7 +1669,7 @@ yuno_in03,62,176,2	script	History Professor#sa	4_M_MANAGER,{
 			mes "[Saphien Layless]";
 			mes "Oh, did you finish already? Well done.";
 			mes "Please handle this with care, because you won't be able to do this ever again.";
-			getitem 1550,1; //Book
+			getitem Book,1;
 			next;
 			mes "[Saphien Layless]";
 			mes "I assume you're ready to submit your work to the dean.";
@@ -2045,12 +2045,12 @@ yuno_in03,32,102,1	script	Biology Professor#sa	4_M_SAGE_C,{
 		close;
 	}
 	else if (SAGE_Q == 12) {
-		if (countitem(916) > 0 && countitem(919) > 0 && countitem(1019) > 0 && countitem(1024) > 0 && countitem(713) > 0) {
-			delitem 916,1; //Feather_Of_Birds
-			delitem 919,1; //Animal's_Skin
-			delitem 1019,1; //Wooden_Block
-			delitem 1024,1; //Chinese_Ink
-			delitem 713,1; //Empty_Bottle
+		if (countitem(Feather_Of_Birds) > 0 && countitem(Animal's_Skin) > 0 && countitem(Wooden_Block) > 0 && countitem(Chinese_Ink) > 0 && countitem(Empty_Bottle) > 0) {
+			delitem Feather_Of_Birds,1;
+			delitem Animal's_Skin,1;
+			delitem Wooden_Block,1;
+			delitem Chinese_Ink,1;
+			delitem Empty_Bottle,1;
 			mes "Hmph. Lucky brat brought all of the items.";
 			mes "Well, I don't expect you to write an outrageously great thesis though...";
 			next;
@@ -2092,7 +2092,7 @@ yuno_in03,32,102,1	script	Biology Professor#sa	4_M_SAGE_C,{
 			mes "[Lucius Celsus]";
 			mes "Are you done? Okay, then it's over.";
 			mes "You won't be able to write another thesis again, handle this with care.";
-			getitem 1550,1; //Book
+			getitem Book,1;
 			next;
 			mes "[Lucius Celsus]";
 			mes "Show this masterpiece to the dean.";
@@ -2200,7 +2200,7 @@ yuno_in03,244,31,3	script	Physics Professor#sa	2_M_PHARMACIST,{
 			close;
 		}
 		else if (SAGE_Q2 == 1) {
-			if (countitem(7049) > 29) {
+			if (countitem(Stone) > 29) {
 				mes "Oh~ how sweet! You brought them all~ thank you~";
 				mes "Oh, can you wait a little bit? I need to do something before we start. Tee hee~";
 				next;
@@ -2213,7 +2213,7 @@ yuno_in03,244,31,3	script	Physics Professor#sa	2_M_PHARMACIST,{
 				mes "[Aebecee George]";
 				mes "Ho~cus~fo~cus!!";
 				next;
-				delitem 7049,30; //Stone
+				delitem Stone,30;
 				mes "[Aebecee George]";
 				mes "Tee hee, you naughty stone~";
 				mes "Only 3 of them worked for me. Tee hee~";
@@ -2222,9 +2222,9 @@ yuno_in03,244,31,3	script	Physics Professor#sa	2_M_PHARMACIST,{
 				mes "Here's my other favor to ask of you. Oh, are those tears of...joy?";
 				mes "Oh, I'm sooo excited too! Tee hee~";
 				next;
-				getitem 991,1; //Crystal_Blue
-				getitem 993,1; //Yellow_Live
-				getitem 992,1; //Wind_Of_Verdure
+				getitem Crystal_Blue,1;
+				getitem Yellow_Live,1;
+				getitem Wind_Of_Verdure,1;
 				mes "[Aebecee George]";
 				mes "I will give you these elemental ores...but...they are not for free.";
 				mes "Whoa there cowboy! Don't pull out so soon~ Listen, tee hee~";
@@ -2253,7 +2253,7 @@ yuno_in03,244,31,3	script	Physics Professor#sa	2_M_PHARMACIST,{
 			}
 		}
 		else if (SAGE_Q2 == 2) {
-			if (countitem(1754) > 49 && countitem(1756) > 49 && countitem(1755) > 49) {
+			if (countitem(Crystal_Arrow) > 49 && countitem(Stone_Arrow) > 49 && countitem(Arrow_Of_Wind) > 49) {
 				mes "Oh~ how sweet! You brought them all~ Oh thank you~";
 				mes "Well now, let's get down to business. Tee hee~";
 				next;
@@ -2281,9 +2281,9 @@ yuno_in03,244,31,3	script	Physics Professor#sa	2_M_PHARMACIST,{
 				mes "...Oh my gosh! Time flies sooo fast!";
 				mes "Let's call it a day, dear, tee hee~";
 				next;
-				delitem 1754,50; //Crystal_Arrow
-				delitem 1756,50; //Stone_Arrow
-				delitem 1755,50; //Arrow_Of_Wind
+				delitem Crystal_Arrow,50;
+				delitem Stone_Arrow,50;
+				delitem Arrow_Of_Wind,50;
 				mes "[Aebecee George]";
 				mes "When you come to the next class, bring ^3355FF1 Holy Water^000000~";
 				mes "I hope you have at least one Priest friend. Oh, you don't? Well, it couldn't hurt to get friendly with one.";
@@ -2304,7 +2304,7 @@ yuno_in03,244,31,3	script	Physics Professor#sa	2_M_PHARMACIST,{
 			}
 		}
 		else if (SAGE_Q2 == 3) {
-			if (countitem(523) > 0) {
+			if (countitem(Holy_Water) > 0) {
 				mes "Oh~ how sweet! You brought some Holy Water~ thanks honey~";
 				mes "Oh righty, we should start class. Tee hee~";
 				next;
@@ -2332,7 +2332,7 @@ yuno_in03,244,31,3	script	Physics Professor#sa	2_M_PHARMACIST,{
 				mes "Oh, it's the end of the class~ tee hee.";
 				mes "So? Do you think you've learned a lot? You can thank me, honey!";
 				next;
-				delitem 523,1; //Holy_Water
+				delitem Holy_Water,1;
 				mes "[Aebecee George]";
 				mes "Well, that's it. You can write your thesis with what I've taught you!";
 				mes "Tee hee~ yes! Yes! I am the best teacher in the world! Oh, I am on fire! Tee hee~";
@@ -2368,12 +2368,12 @@ yuno_in03,244,31,3	script	Physics Professor#sa	2_M_PHARMACIST,{
 		}
 	}
 	else if (SAGE_Q == 14) {
-		if (countitem(916) > 0 && countitem(919) > 0 && countitem(1019) > 0 && countitem(1024) > 0 && countitem(713) > 0) {
-			delitem 916,1; //Feather_Of_Birds
-			delitem 919,1; //Animal's_Skin
-			delitem 1019,1; //Wooden_Block
-			delitem 1024,1; //Chinese_Ink
-			delitem 713,1; //Empty_Bottle
+		if (countitem(Feather_Of_Birds) > 0 && countitem(Animal's_Skin) > 0 && countitem(Wooden_Block) > 0 && countitem(Chinese_Ink) > 0 && countitem(Empty_Bottle) > 0) {
+			delitem Feather_Of_Birds,1;
+			delitem Animal's_Skin,1;
+			delitem Wooden_Block,1;
+			delitem Chinese_Ink,1;
+			delitem Empty_Bottle,1;
 			mes "Okay~ so its now or never~ tee hee~";
 			mes "I taught you everything I know. Don't be nervous, you'll be okay~";
 			next;
@@ -2509,7 +2509,7 @@ yuno_in03,244,31,3	script	Physics Professor#sa	2_M_PHARMACIST,{
 			mes "[Aebecee George]";
 			mes "Tee hee, so... are you done with your thesis? What do you think of your work? I think you did fine~";
 			mes "Don't forget, this is the first and the last time you'll write a thesis, okay? Tee hee~";
-			getitem 1550,1; //Book
+			getitem Book,1;
 			next;
 			mes "[Aebecee George]";
 			mes "Okay, now you can show the dean your thesis~";
diff --git a/npc/jobs/2-2e/SoulLinker.txt b/npc/jobs/2-2e/SoulLinker.txt
index 0c5ff61db..65febe33e 100644
--- a/npc/jobs/2-2e/SoulLinker.txt
+++ b/npc/jobs/2-2e/SoulLinker.txt
@@ -211,10 +211,10 @@ morocc_in,174,30,6	script	Kid#link1	4_M_KID2,{
 				mes "like I asked you to?";
 				next;
 				if (select("There you are.:No, not yet...") == 1) {
-					if (countitem(732) > 0 && countitem(929) > 0 && countitem(748) > 0) {
-						delitem 732,1; //Crystal_Jewel__
-						delitem 929,1; //Immortal_Heart
-						delitem 748,1; //Witherless_Rose
+					if (countitem(Crystal_Jewel__) > 0 && countitem(Immortal_Heart) > 0 && countitem(Witherless_Rose) > 0) {
+						delitem Crystal_Jewel__,1;
+						delitem Immortal_Heart,1;
+						delitem Witherless_Rose,1;
 						SOUL_Q = 2;
 						changequest 6005,6006;
 						mes "[Kid]";
diff --git a/npc/jobs/novice/supernovice.txt b/npc/jobs/novice/supernovice.txt
index 449a94f0c..19ed21325 100644
--- a/npc/jobs/novice/supernovice.txt
+++ b/npc/jobs/novice/supernovice.txt
@@ -54,9 +54,9 @@ aldeba_in,223,167,3	script	Tzerero#sn	4_M_SEAMAN,{
 		mes "...and a master of none.";
 		close;
 	}
-	if (countitem(938) > 29 && countitem(907) > 29 && SUPNOV_Q == 1) {
-		delitem 938,30; //Sticky_Mucus
-		delitem 907,30; //Resin
+	if (countitem(Sticky_Mucus) > 29 && countitem(Resin) > 29 && SUPNOV_Q == 1) {
+		delitem Sticky_Mucus,30;
+		delitem Resin,30;
 		mes "[Tzerero]";
 		mes "Ah, you've brought the";
 		mes "items I've requested!";
@@ -77,7 +77,7 @@ aldeba_in,223,167,3	script	Tzerero#sn	4_M_SEAMAN,{
 		next;
 		completequest 6010;
 		callfunc "F_ClearJobVar";
-		getitem 2339,1; //G_Strings
+		getitem G_Strings,1;
 		if (Upper==0) jobchange Job_SuperNovice;
 		if (Upper==2) jobchange Job_Super_Baby;
 		mes "[Tzerero]";
diff --git a/npc/jobs/valkyrie.txt b/npc/jobs/valkyrie.txt
index 87bc4e338..483c67346 100644
--- a/npc/jobs/valkyrie.txt
+++ b/npc/jobs/valkyrie.txt
@@ -160,8 +160,8 @@ valkyrie,48,86,4	script	Valkyrie#	4_F_VALKYRIE,{
 			mes "into a brand new life.";
 			mes "Please take these small gifts";
 			mes "in preparation for your new adventures.";
-			getitem 1202,1; //Knife_
-			getitem 2302,1; //Cotton_Shirt_
+			getitem Knife_,1;
+			getitem Cotton_Shirt_,1;
 			next;
 			mes "[Valkyrie]";
 			mes "I wish that the release the goddess Urd has granted you proves to be a blessing. I hope that the memories Verdandi has recorded will always honor you.";