ItemID to Constant: quests/woe Folder

18 files changed, 179 insertions, 179 deletions

diff --git a/npc/quests/skills/acolyte_skills.txt b/npc/quests/skills/acolyte_skills.txt
index b79fd5184..dcc0e2e90 100644
--- a/npc/quests/skills/acolyte_skills.txt
+++ b/npc/quests/skills/acolyte_skills.txt
@@ -90,7 +90,7 @@ prt_church,173,23,4	script	Cleric	1_F_PRIEST,{
 			mes "this skill for the work of good . .";
 			close;
 		}
-		if ((countitem(727) > 0) && (countitem(991) > 0) && (countitem(2608) > 0) && (JobLevel > 29 || (BaseJob == Job_Priest || BaseJob == Job_Monk)) && (BaseClass == Job_Acolyte)) {
+		if ((countitem(White_Jewel) > 0) && (countitem(Crystal_Blue) > 0) && (countitem(Rosary) > 0) && (JobLevel > 29 || (BaseJob == Job_Priest || BaseJob == Job_Monk)) && (BaseClass == Job_Acolyte)) {
 			mes "[Acolyte Klift]";
 			mes "Your faith has proven worthy";
 			mes "for you to gain the ' Holy Light ' skill.";
@@ -98,9 +98,9 @@ prt_church,173,23,4	script	Cleric	1_F_PRIEST,{
 			mes "to use this skill.";
 			mes "Use it wisely. . .";
 			next;
-			delitem 727,1; //White_Jewel
-			delitem 991,1; //Crystal_Blue
-			delitem 2608,1; //Rosary
+			delitem White_Jewel,1;
+			delitem Crystal_Blue,1;
+			delitem Rosary,1;
 			skill "AL_HOLYLIGHT",1,0;
 			mes "[Acolyte Klift]";
 			mes "You now know ' Holy Light '";
diff --git a/npc/quests/skills/alchemist_skills.txt b/npc/quests/skills/alchemist_skills.txt
index 60126b369..31e72b9ae 100644
--- a/npc/quests/skills/alchemist_skills.txt
+++ b/npc/quests/skills/alchemist_skills.txt
@@ -212,11 +212,11 @@ yuno_in04,33,108,4	script	Pisruik#qsk_al	4_M_ALCHE_D,{
 					mes "make sure you didn't";
 					mes "forget anything. Hm...";
 					next;
-					if (countitem(715) > 4 && countitem(1093) > 3 && countitem(950) > 9 && countitem(1057) > 9) {
-						delitem 715,5; //Yellow_Gemstone
-						delitem 1093,4; //Empty_Potion
-						delitem 950,10; //Heart_Of_Mermaid
-						delitem 1057,10; //Moth_Dust
+					if (countitem(Yellow_Gemstone) > 4 && countitem(Empty_Potion) > 3 && countitem(Heart_Of_Mermaid) > 9 && countitem(Moth_Dust) > 9) {
+						delitem Yellow_Gemstone,5;
+						delitem Empty_Potion,4;
+						delitem Heart_Of_Mermaid,10;
+						delitem Moth_Dust,10;
 						ALCHE_SK = 3;
 						mes "[Pisruik]";
 						mes "Great, it looks like";
@@ -393,7 +393,7 @@ yuno_in04,33,108,4	script	Pisruik#qsk_al	4_M_ALCHE_D,{
 							close;
 						}
 					}
-					else if (countitem(715) == 0 && countitem(1093) == 0 && countitem(950) == 0 && countitem(1057) == 0) {
+					else if (countitem(Yellow_Gemstone) == 0 && countitem(Empty_Potion) == 0 && countitem(Heart_Of_Mermaid) == 0 && countitem(Moth_Dust) == 0) {
 						mes "[Pisruik]";
 						mes "So you knew what";
 						mes "you had to bring, came";
@@ -681,8 +681,8 @@ yuno_in04,33,108,4	script	Pisruik#qsk_al	4_M_ALCHE_D,{
 			close;
 		}
 		else if (ALCHE_SK == 6) {
-			if (countitem(1032) > 19) {
-				delitem 1032,20; //Blossom_Of_Maneater
+			if (countitem(Blossom_Of_Maneater) > 19) {
+				delitem Blossom_Of_Maneater,20;
 				ALCHE_SK = 7;
 				mes "[Pisruik]";
 				mes "Thanks so much for";
@@ -785,8 +785,8 @@ yuno_in04,33,108,4	script	Pisruik#qsk_al	4_M_ALCHE_D,{
 			close;
 		}
 		else if (ALCHE_SK == 8) {
-			if (countitem(1032) > 0) {
-				delitem 1032,1; //Blossom_Of_Maneater
+			if (countitem(Blossom_Of_Maneater) > 0) {
+				delitem Blossom_Of_Maneater,1;
 				ALCHE_SK = 7;
 				mes "[Pisruik]";
 				mes "Thanks so much!";
@@ -886,8 +886,8 @@ yuno_in04,33,108,4	script	Pisruik#qsk_al	4_M_ALCHE_D,{
 			mes "dorky without them.^000000";
 			next;
 			if (select("Let him try a pair of your glasses:Don't give him anything") == 1) {
-				if (countitem(2243) > 0) {
-					delitem 2243,1; //Spinning_Eyes
+				if (countitem(Spinning_Eyes) > 0) {
+					delitem Spinning_Eyes,1;
 					ALCHE_SK = 10;
 					//changes the quest steps by deicision.
 					mes "["+ strcharinfo(0) +"]";
@@ -945,7 +945,7 @@ yuno_in04,33,108,4	script	Pisruik#qsk_al	4_M_ALCHE_D,{
 						mes "the medicine's side effects.^000000";
 						next;
 						ALCHE_SK = 11;
-						getitem 7434,1; //Elemental_Create_Book
+						getitem Elemental_Potion_Book,1; //Elemental_Create_Book
 						mes "[Pisruik]";
 						mes "Well, you should be";
 						mes "ready to make your own";
@@ -1032,7 +1032,7 @@ yuno_in04,33,108,4	script	Pisruik#qsk_al	4_M_ALCHE_D,{
 				mes "the medicine's side effects.^000000";
 				next;
 				ALCHE_SK = 11;
-				getitem 7434,1; //Elemental_Create_Book
+				getitem Elemental_Potion_Book,1; //Elemental_Create_Book
 				mes "[Pisruik]";
 				mes "Well, you should be";
 				mes "ready to make your own";
@@ -1072,7 +1072,7 @@ yuno_in04,33,108,4	script	Pisruik#qsk_al	4_M_ALCHE_D,{
 			close;
 		}
 		else if (ALCHE_SK == 11) {
-			if (countitem(7434) == 0) {
+			if (countitem(Elemental_Potion_Book) == 0) {
 				mes "[Pisruik]";
 				mes "Uh oh...";
 				mes "You lost the thesis";
@@ -1081,7 +1081,7 @@ yuno_in04,33,108,4	script	Pisruik#qsk_al	4_M_ALCHE_D,{
 				mes "another one for you now...";
 				close;
 			}
-			else if (countitem(7434) == 1) {
+			else if (countitem(Elemental_Potion_Book) == 1) {
 				mes "[Pisruik]";
 				mes "So, how have you been";
 				mes "using the potions that";
@@ -1090,7 +1090,7 @@ yuno_in04,33,108,4	script	Pisruik#qsk_al	4_M_ALCHE_D,{
 				mes "in handy in your adventures.";
 				close;
 			}
-			else if (countitem(7434) > 1) {
+			else if (countitem(Elemental_Potion_Book) > 1) {
 				mes "[Pisruik]";
 				mes "Huh, so copies of my";
 				mes "thesis are circulating";
diff --git a/npc/quests/skills/archer_skills.txt b/npc/quests/skills/archer_skills.txt
index 87fe97a24..030806877 100644
--- a/npc/quests/skills/archer_skills.txt
+++ b/npc/quests/skills/archer_skills.txt
@@ -65,17 +65,17 @@ moc_ruins,118,99,5	script	Roberto	4_M_ORIENT01,{
 			mes " ";
 			mes "You are...";
 			next;
-			if ((countitem(907) > 19) && (countitem(921) > 6) && (countitem(906) > 40) && (countitem(1019) > 12) && (countitem(501) > 0)) {
+			if ((countitem(Resin) > 19) && (countitem(Mushroom_Spore) > 6) && (countitem(Pointed_Scale) > 40) && (countitem(Wooden_Block) > 12) && (countitem(Red_Potion) > 0)) {
 				mes "[Roberto]";
 				mes "You brought them!";
 				mes "Thank you very much.";
 				mes "Then, as I promised, I will teach you the skill.";
 				next;
-				delitem 907,20; //Resin
-				delitem 921,7; //Mushroom_Spore
-				delitem 906,41; //Tough_Scalelike_Stem
-				delitem 1019,13; //Wooden_Block
-				delitem 501,1; //Red_Potion
+				delitem Resin,20;
+				delitem Mushroom_Spore,7;
+				delitem Pointed_Scale,41; //Tough_Scalelike_Stem
+				delitem Wooden_Block,13;
+				delitem Red_Potion,1;
 				skill "AC_MAKINGARROW",1,0;
 				mes "[Roberto]";
 				mes "No need to worry about arrows now.";
@@ -238,17 +238,17 @@ payon,103,63,3	script	Jason	4_M_ORIENT01,3,3,{
 				mes "(I'm going to be mad if you don't bring the Banana Juice.)";
 				close;
 			case 2:
-				if ((countitem(721) > 1) && (countitem(942) > 2) && (countitem(962) > 9) && (countitem(925) > 9) && (countitem(532) > 35)) {
+				if ((countitem(Azure_Jewel) > 1) && (countitem(Yoyo_Tail) > 2) && (countitem(Tentacle) > 9) && (countitem(Bill_Of_Birds) > 9) && (countitem(Banana_Juice) > 35)) {
 					mes "[Jason]";
 					mes "Ok! Perfect!";
 					mes "I shall teach you the nationally";
 					mes "renowned skill, Arrow Repel!";
 					next;
-					delitem 721,2; //Azure_Jewel
-					delitem 942,3; //Yoyo_Tail
-					delitem 962,10; //Tentacle
-					delitem 925,10; //Bill_Of_Birds
-					delitem 532,36; //Banana_Juice
+					delitem Azure_Jewel,2;
+					delitem Yoyo_Tail,3;
+					delitem Tentacle,10;
+					delitem Bill_Of_Birds,10;
+					delitem Banana_Juice,36;
 					skill "AC_CHARGEARROW",1,0;
 					mes "[Jason]";
 					mes "Oh, works better than I expected!";
diff --git a/npc/quests/skills/assassin_skills.txt b/npc/quests/skills/assassin_skills.txt
index 6fa61baa6..7f3312a07 100644
--- a/npc/quests/skills/assassin_skills.txt
+++ b/npc/quests/skills/assassin_skills.txt
@@ -501,7 +501,7 @@ in_moc_16,23,27,5	script	Assassin#realgirl	4_F_ACROSS,{
 		mes "I trust that you've completed";
 		mes "that task I assigned for you.";
 		next;
-		if ((ASSN_SK == 5 && countitem(726) > 0) || (ASSN_SK == 5 && countitem(723) > 0) || (ASSN_SK == 5 && countitem(720) > 0)) {
+		if ((ASSN_SK == 5 && countitem(Blue_Jewel) > 0) || (ASSN_SK == 5 && countitem(Cardinal_Jewel) > 0) || (ASSN_SK == 5 && countitem(Skyblue_Jewel) > 0)) {
 			select("How's this for treasure?");
 			mes "[Esmille]";
 			mes "Oh, that jewel...!";
@@ -870,7 +870,7 @@ OnTouch:
 					mes "coffin. You have obtained";
 					mes "a Sapphire for Esmille.^000000";
 					ASSN_SK = 5;
-					getitem 726,1; //Blue_Jewel
+					getitem Blue_Jewel,1;
 					close;
 				}
 			case 2:
@@ -939,7 +939,7 @@ OnTouch:
 			mes "to escape its effects. You've";
 			mes "retrieved a Ruby for Esmille.^000000";
 			ASSN_SK = 5;
-			getitem 723,1; //Cardinal_Jewel
+			getitem Cardinal_Jewel,1;
 		}
 		close;
 	}
@@ -1009,7 +1009,7 @@ OnTouch:
 			mes "freeze you. You obtained";
 			mes "an Aquamarine for Esmille.^000000";
 			ASSN_SK = 5;
-			getitem 720,1; //Skyblue_Jewel
+			getitem Skyblue_Jewel,1;
 		}
 		close;
 	}
diff --git a/npc/quests/skills/bard_skills.txt b/npc/quests/skills/bard_skills.txt
index 96852f6b4..8e44a561e 100644
--- a/npc/quests/skills/bard_skills.txt
+++ b/npc/quests/skills/bard_skills.txt
@@ -87,7 +87,7 @@ prontera,174,328,3	script	Young Man#bard_q1	4_M_ORIENT02,3,3,{
 				mes "you really need to relax.";
 				mes "Here, have a drink on me.";
 				next;
-				if (countitem(12112) > 0) {
+				if (countitem(Tropical_Sograt) > 0) {
 					mes "[Timid Young Man]";
 					mes "Oh~! Isn't that";
 					mes "a Tropical Sograt?";
@@ -212,7 +212,7 @@ prontera,174,328,3	script	Young Man#bard_q1	4_M_ORIENT02,3,3,{
 								mes "of power, I can't really";
 								mes "stop you. Thankfully, nobody";
 								mes "has any idea of where he is~";
-								delitem 12112,1; //Tropical_Sograt
+								delitem Tropical_Sograt,1;
 								qskill_bard = 1;
 							}
 							else {
@@ -223,7 +223,7 @@ prontera,174,328,3	script	Young Man#bard_q1	4_M_ORIENT02,3,3,{
 								mes "he mentioned something about";
 								mes "being at least ^660000Job Level 40^000000 to";
 								mes "be able to handle that power...";
-								delitem 12112,1; //Tropical_Sograt
+								delitem Tropical_Sograt,1;
 							}
 							close;
 						case 2:
@@ -306,7 +306,7 @@ prontera,174,328,3	script	Young Man#bard_q1	4_M_ORIENT02,3,3,{
 								mes "of power, I can't really";
 								mes "stop you. Thankfully, nobody";
 								mes "has any idea of where he is~";
-								delitem 12112,1; //Tropical_Sograt
+								delitem Tropical_Sograt,1;
 								qskill_bard = 1;
 							}
 							else {
@@ -317,7 +317,7 @@ prontera,174,328,3	script	Young Man#bard_q1	4_M_ORIENT02,3,3,{
 								mes "he mentioned something about";
 								mes "being at least ^660000Job Level 40^000000 to";
 								mes "be able to handle that power...";
-								delitem 12112,1; //Tropical_Sograt
+								delitem Tropical_Sograt,1;
 							}
 							close;
 						}
@@ -465,7 +465,7 @@ morocc_in,169,72,7	script	Spiteful-Looking Bard#bs	2_M_BARD_ORIENT,3,3,{
 			close;
 		}
 		else if (qskill_bard == 8) {
-			if (countitem(7277) > 0) {
+			if (countitem(Munak_Doll) > 0) {
 				mes "[Riott]";
 				mes "Ah, you've brought me";
 				mes "a Munak Doll made by";
@@ -497,7 +497,7 @@ morocc_in,169,72,7	script	Spiteful-Looking Bard#bs	2_M_BARD_ORIENT,3,3,{
 				mes "mine. Head spinning, head";
 				mes "spinning, head spinning...!''";
 				specialeffect2 EF_TALK_FROSTJOKE;
-				delitem 7277,1; //Munak_Doll
+				delitem Munak_Doll,1;
 				skill "BA_PANGVOICE",1,0;
 				qskill_bard = 9;
 				next;
@@ -547,7 +547,7 @@ morocc_in,169,72,7	script	Spiteful-Looking Bard#bs	2_M_BARD_ORIENT,3,3,{
 			close;
 		}
 		else if (qskill_bard == 7) {
-			if (countitem(574) > 4) {
+			if (countitem(Egg) > 4) {
 				mes "[Riott]";
 				mes "Ah, you've brought me";
 				mes "some fresh eggs laid by";
@@ -579,7 +579,7 @@ morocc_in,169,72,7	script	Spiteful-Looking Bard#bs	2_M_BARD_ORIENT,3,3,{
 				mes "mine. Head spinning, head";
 				mes "spinning, head spinning...!''";
 				specialeffect2 EF_TALK_FROSTJOKE;
-				delitem 574,5; //Egg
+				delitem Egg,5;
 				skill 1010,1,0;
 				qskill_bard = 9;
 				next;
@@ -638,12 +638,12 @@ morocc_in,169,72,7	script	Spiteful-Looking Bard#bs	2_M_BARD_ORIENT,3,3,{
 				mes "an avid collector of her work.";
 				next;
 				mes "[Riott]";
-				if (countitem(574) > 0) {
+				if (countitem(Egg) > 0) {
 					mes "In the meanwhile,";
 					mes "I'll enjoy the few";
 					mes "eggs that you do have!";
 					mes "Bweh heh heh heh heh!";
-					delitem 574,countitem(574); //Egg
+					delitem Egg,countitem(Egg);
 				}
 				qskill_bard = 8;
 				close;
@@ -1172,7 +1172,7 @@ morocc_in,175,70,7	script	Customer#bard_skill02	1_M_04,{
 
 //== Bartender =============================================
 morocc_in,166,76,7	script	Bartender#bard_qskill	1_ETC_01,{
-	if (checkweight(1201,1) == 0) {
+	if (checkweight(Knife,1) == 0) {
 		mes "^3355FFHold it right there!";
 		mes "You're carrying too many items and don't have enough inventory space to receive any rewards. Please make more inventory space available and come back to take this challenge.";
 		close;
@@ -1211,7 +1211,7 @@ morocc_in,166,76,7	script	Bartender#bard_qskill	1_ETC_01,{
 		mes "careful, you'll pass out";
 		mes "in no time flat. Take it easy.";
 		Zeny -= 1000;
-		getitem 12112,1; //Tropical_Sograt
+		getitem Tropical_Sograt,1;
 		close;
 
 	case 2:
@@ -1241,7 +1241,7 @@ morocc_in,166,76,7	script	Bartender#bard_qskill	1_ETC_01,{
 		mes "enjoy your drinking";
 		mes "without going crazy.";
 		Zeny -= 1000;
-		getitem 12113,1; //Vermilion_The_Beach
+		getitem Vermilion_The_Beach,1;
 		close;
 
 	case 3:
@@ -1254,7 +1254,7 @@ morocc_in,166,76,7	script	Bartender#bard_qskill	1_ETC_01,{
 
 //== Function ==============================================
 function	script	F_BardSkillYhelle	{
-	if (checkweight(1201,1) == 0 || MaxWeight - Weight < 2000) {
+	if (checkweight(Knife,1) == 0 || MaxWeight - Weight < 2000) {
 		mes "^3355FFHold it right there!";
 		mes "You're carrying too many items and don't have enough inventory space to receive any rewards. Please make more inventory space available and come back to take this challenge.";
 		close;
@@ -1276,7 +1276,7 @@ function	script	F_BardSkillYhelle	{
 			mes "place where Yhelle the";
 			mes "Hen was roosting.^000000";
 			++qskill_bard;
-			getitem 574,1; //Egg
+			getitem Egg,1;
 		}
 	}
 	else {
diff --git a/npc/quests/skills/blacksmith_skills.txt b/npc/quests/skills/blacksmith_skills.txt
index 537c2e61d..9ab4363f7 100644
--- a/npc/quests/skills/blacksmith_skills.txt
+++ b/npc/quests/skills/blacksmith_skills.txt
@@ -189,7 +189,7 @@ geffen,178,72,3	script	Akkie#qsk_bs	4_F_JOB_BLACKSMITH,{
 				close;
 			}
 			else if (BLACK_SK == 1) {
-				if (countitem(999) > 0 && countitem(1003) > 4 && countitem(971) > 0 && countitem(613) > 0) {
+				if (countitem(Steel) > 0 && countitem(Coal) > 4 && countitem(Detrimindexta) > 0 && countitem(Iron_Hammer) > 0) {
 					if (Zeny >= 500) {
 						mes "[Akkie]";
 						mes "Oh, you came back~";
@@ -205,10 +205,10 @@ geffen,178,72,3	script	Akkie#qsk_bs	4_F_JOB_BLACKSMITH,{
 						mes "Alright, now please wait";
 						mes "while I get these materials";
 						mes "ready for forging, okay?";
-						delitem 1003,5; //Coal
-						delitem 999,1; //Steel
-						delitem 971,1; //Detrimindexta
-						delitem 613,1; //Iron_Hammer
+						delitem Coal,5;
+						delitem Steel,1;
+						delitem Detrimindexta,1;
+						delitem Iron_Hammer,1;
 						Zeny -= 500;
 						BLACK_SK = 2;
 						close;
@@ -293,7 +293,7 @@ geffen,178,72,3	script	Akkie#qsk_bs	4_F_JOB_BLACKSMITH,{
 				close;
 			}
 			else if (BLACK_SK == 3) {
-				if (countitem(999) > 0 && countitem(1003) > 2) {
+				if (countitem(Steel) > 0 && countitem(Coal) > 2) {
 					mes "[Akkie]";
 					mes "Oh, thank you so";
 					mes "much for bringing these";
@@ -301,8 +301,8 @@ geffen,178,72,3	script	Akkie#qsk_bs	4_F_JOB_BLACKSMITH,{
 					mes "really hard to succeed";
 					mes "this time. Just give me";
 					mes "a minute to prepare...";
-					delitem 999,1; //Steel
-					delitem 1003,3; //Coal
+					delitem Steel,1;
+					delitem Coal,3;
 					BLACK_SK = 4;
 					close;
 				}
@@ -345,7 +345,7 @@ geffen,178,72,3	script	Akkie#qsk_bs	4_F_JOB_BLACKSMITH,{
 				close;
 			}
 			else if (BLACK_SK == 5) {
-				if (countitem(613) > 0) {
+				if (countitem(Iron_Hammer) > 0) {
 					mes "[Akkie]";
 					mes "^333333*Sniff*^000000 Did you";
 					mes "r-really bring this";
@@ -358,7 +358,7 @@ geffen,178,72,3	script	Akkie#qsk_bs	4_F_JOB_BLACKSMITH,{
 					mes "give me a moment?";
 					mes "I'm going to try";
 					mes "one more time.";
-					delitem 613,1; //Iron_Hammer
+					delitem Iron_Hammer,1;
 					BLACK_SK = 6;
 					close;
 				}
diff --git a/npc/quests/skills/crusader_skills.txt b/npc/quests/skills/crusader_skills.txt
index 45176af64..64f63b384 100644
--- a/npc/quests/skills/crusader_skills.txt
+++ b/npc/quests/skills/crusader_skills.txt
@@ -380,7 +380,7 @@ gef_fild13,297,242,3	script	Soldier#277	4_M_CRU,{
 			close;
 		}
 		else if (CRUS_SK == 2) {
-			if (countitem(501) > 0) {
+			if (countitem(Red_Potion) > 0) {
 				mes "["+ strcharinfo(0) +"]";
 				mes "Here, please take";
 				mes "this Red Potion.";
@@ -406,7 +406,7 @@ gef_fild13,297,242,3	script	Soldier#277	4_M_CRU,{
 				mes "patrol report. Some of the";
 				mes "pages are smudged with";
 				mes "the blood from his wound.^000000";
-				delitem 501,1; //Red_Potion
+				delitem Red_Potion,1;
 				CRUS_SK = 3;
 				close;
 			}
@@ -673,7 +673,7 @@ prt_church,87,127,3	script	Pastor#1011	4_M_SAGE_C,{
 			close;
 		}
 		else if (CRUS_SK == 5) {
-			if (countitem(514) > 0 && countitem(619) > 0 && countitem(1003) > 0 && countitem(7053) > 2 && countitem(713) > 2 && countitem(909) > 4 && countitem(938) > 19) {
+			if (countitem(Grape) > 0 && countitem(Unripe_Apple) > 0 && countitem(Coal) > 0 && countitem(Cyfar) > 2 && countitem(Empty_Bottle) > 2 && countitem(Jellopy) > 4 && countitem(Sticky_Mucus) > 19) {
 				mes "[Father Arthur]";
 				mes "Ah, you've returned.";
 				mes "Now let me check to";
@@ -703,13 +703,13 @@ prt_church,87,127,3	script	Pastor#1011	4_M_SAGE_C,{
 				mes "to worry about collecting";
 				mes "materials again. Now, give";
 				mes "me a moment to distill this...";
-				delitem 938,20; //Sticky_Mucus
-				delitem 619,1; //Unripe_Apple
-				delitem 909,5; //Jellopy
-				delitem 514,1; //Grape
-				delitem 1003,1; //Coal
-				delitem 7053,3; //Cyfar
-				delitem 713,3; //Empty_Bottle
+				delitem Sticky_Mucus,20;
+				delitem Unripe_Apple,1;
+				delitem Jellopy,5;
+				delitem Grape,1;
+				delitem Coal,1;
+				delitem Cyfar,3;
+				delitem Empty_Bottle,3;
 				CRUS_SK = 6;
 				close;
 			}
diff --git a/npc/quests/skills/dancer_skills.txt b/npc/quests/skills/dancer_skills.txt
index 6aac071ab..4c7107734 100644
--- a/npc/quests/skills/dancer_skills.txt
+++ b/npc/quests/skills/dancer_skills.txt
@@ -128,7 +128,7 @@ comodo,204,172,5	script	Canell#qsk_dan01	4_F_07,{
 			close;
 		}
 		else if (DANCER_SK == 1) {
-			if (countitem(747) > 0) {
+			if (countitem(Crystal_Mirror) > 0) {
 				mes "[Canell]";
 				mes "Finally, you've come";
 				mes "with the mirror. Now,";
@@ -171,7 +171,7 @@ comodo,204,172,5	script	Canell#qsk_dan01	4_F_07,{
 				mes "sky rocketed. Fortunately,";
 				mes "you've managed to avoid";
 				mes "becoming a prima donna.^000000";
-				delitem 747,1; //Crystal_Mirror
+				delitem Crystal_Mirror,1;
 				DANCER_SK = 2;
 				close;
 			}
@@ -512,7 +512,7 @@ prontera,183,333,1	script	Aelle#qsk_dan02	1_F_PRIEST,{
 			close;
 		}
 		else if (DANCER_SK == 5) {
-			if (countitem(970) > 0 && countitem(512) > 0 && countitem(513) > 2 && countitem(538) > 4 && countitem(736) > 0) {
+			if (countitem(Alchol) > 0 && countitem(Apple) > 0 && countitem(Banana) > 2 && countitem(Well_Baked_Cookie) > 4 && countitem(White_Platter) > 0) {
 				mes "[Aelle]";
 				mes "Great, you've brought";
 				mes "the food! It's a good thing";
@@ -585,11 +585,11 @@ prontera,183,333,1	script	Aelle#qsk_dan02	1_F_PRIEST,{
 				percentheal -10,0;
 				specialeffect2 EF_HIT2;
 				emotion e_dots,1;
-				delitem 970,1; //Alchol
-				delitem 512,1; //Apple
-				delitem 513,3; //Banana
-				delitem 538,5; //Well_Baked_Cookie
-				delitem 736,1; //White_Platter
+				delitem Alchol,1;
+				delitem Apple,1;
+				delitem Banana,3;
+				delitem Well_Baked_Cookie,5;
+				delitem White_Platter,1;
 				DANCER_SK = 6;
 				close;
 			}
diff --git a/npc/quests/skills/hunter_skills.txt b/npc/quests/skills/hunter_skills.txt
index 4bd9e56ee..dd0ff503b 100644
--- a/npc/quests/skills/hunter_skills.txt
+++ b/npc/quests/skills/hunter_skills.txt
@@ -102,7 +102,7 @@ pay_arche,109,169,3	script	Arpesto	4_M_05,{
 			}
 		}
 		else if (qskill_hunter == 1) {
-			if (countitem(724) > 4 && countitem(7115) > 4 && countitem(537) > 29) {
+			if (countitem(Cardinal_Jewel_) > 4 && countitem(Harpy's_Feather) > 4 && countitem(Pet_Food) > 29) {
 				mes "[Arpesto]";
 				mes "Hm? You're back?";
 				mes "Oh, did you bring";
@@ -221,9 +221,9 @@ pay_arche,109,169,3	script	Arpesto	4_M_05,{
 				mes "care of him, so just make";
 				mes "sure you make good use";
 				mes "of that new skill. Take care~";
-				delitem 724,5; //Cardinal_Jewel_
-				delitem 7115,5; //Harpy's_Feather
-				delitem 537,30; //Pet_Food
+				delitem Cardinal_Jewel_,5;
+				delitem Harpy's_Feather,5;
+				delitem Pet_Food,30;
 				qskill_hunter = 100;
 				skill "HT_PHANTASMIC",1,0;
 				close;
diff --git a/npc/quests/skills/knight_skills.txt b/npc/quests/skills/knight_skills.txt
index 583ca8a42..164fc0155 100644
--- a/npc/quests/skills/knight_skills.txt
+++ b/npc/quests/skills/knight_skills.txt
@@ -146,7 +146,7 @@ prt_in,85,99,3	script	Knight#kabuto	4_M_JOB_KNIGHT2,{
 			mes "strength and courage!";
 			close;
 		}
-		if (KNGT_SK == 7 && countitem(530) > 4 && countitem(748) > 2) {
+		if (KNGT_SK == 7 && countitem(Candy_Striper) > 4 && countitem(Witherless_Rose) > 2) {
 			mes "[Essofeit]";
 			mes "The concept of honor";
 			mes "seems to be lost on today's";
@@ -201,8 +201,8 @@ prt_in,85,99,3	script	Knight#kabuto	4_M_JOB_KNIGHT2,{
 				mes "been researching recently. Why";
 				mes "don't you come back after I've";
 				mes "completed the preparations?";
-				delitem 530,5; //Candy_Striper
-				delitem 748,3; //Witherless_Rose
+				delitem Candy_Striper,5;
+				delitem Witherless_Rose,3;
 				KNGT_SK = 8;
 				close;
 			}
diff --git a/npc/quests/skills/mage_skills.txt b/npc/quests/skills/mage_skills.txt
index 99b5e2696..ef94b978f 100644
--- a/npc/quests/skills/mage_skills.txt
+++ b/npc/quests/skills/mage_skills.txt
@@ -116,7 +116,7 @@ geffen_in,151,119,4	script	Great Wizard	1_M_WIZARD,{
 			mes "I have nothing more to teach you ...";
 			close;
 		}
-		if ((countitem(746) > 2) && (countitem(730) > 0) && (countitem(935) > 4) && (countitem(943) > 0) && (JobLevel > 34 || (BaseJob == Job_Wizard || BaseJob == Job_Sage)) && (BaseClass == Job_Mage)) {
+		if ((countitem(Glass_Bead) > 2) && (countitem(Crystal_Jewel) > 0) && (countitem(Shell) > 4) && (countitem(Solid_Shell) > 0) && (JobLevel > 34 || (BaseJob == Job_Wizard || BaseJob == Job_Sage)) && (BaseClass == Job_Mage)) {
 			mes "[BLIZZARDRISS]";
 			mes "Okay, I have received your request.";
 			mes "I will now awaken your hidden energies . .";
@@ -138,10 +138,10 @@ geffen_in,151,119,4	script	Great Wizard	1_M_WIZARD,{
 			mes ". . . . . . . . . . . .";
 			mes "ENERGY COAT! ! !";
 			next;
-			delitem 746,3; //Glass_Bead
-			delitem 730,1; //Crystal_Jewel
-			delitem 935,5; //Shell
-			delitem 943,1; //Solid_Shell
+			delitem Glass_Bead,3;
+			delitem Crystal_Jewel,1;
+			delitem Shell,5;
+			delitem Solid_Shell,1;
 			skill "MG_ENERGYCOAT",1,0;
 			mes "[BLIZZARDRISS]";
 			mes ". . . . .";
diff --git a/npc/quests/skills/merchant_skills.txt b/npc/quests/skills/merchant_skills.txt
index 7cab246a1..3a4575899 100644
--- a/npc/quests/skills/merchant_skills.txt
+++ b/npc/quests/skills/merchant_skills.txt
@@ -86,7 +86,7 @@ alberta,83,96,5	script	Necko	4W_M_02,7,7,{
 			mes "Kyukwakakakakakakakakakaka!";
 			close;
 		}
-		else if ((countitem(722) > 6) && (countitem(532) > 0) && (countitem(921) > 49) && (JobLevel >= 15 || (BaseJob == Job_Blacksmith || BaseJob == Job_Alchemist))) {
+		else if ((countitem(Scarlet_Jewel) > 6) && (countitem(Banana_Juice) > 0) && (countitem(Mushroom_Spore) > 49) && (JobLevel >= 15 || (BaseJob == Job_Blacksmith || BaseJob == Job_Alchemist))) {
 			mes "[Necko]";
 			mes "Oh! You!";
 			mes "You are qualified to learn how to shout!";
@@ -100,9 +100,9 @@ alberta,83,96,5	script	Necko	4W_M_02,7,7,{
 				mes "That's the spirit!";
 				mes "Here we go!";
 				next;
-				delitem 722,7; //Scarlet_Jewel
-				delitem 532,1; //Banana_Juice
-				delitem 921,50; //Mushroom_Spore
+				delitem Scarlet_Jewel,7;
+				delitem Banana_Juice,1;
+				delitem Mushroom_Spore,50;
 				skill "MC_LOUD",1,0;
 				mes "[Necko]";
 				mes "You have learned Crazy Uproar!!";
@@ -238,15 +238,15 @@ alberta,119,221,6	script	Charlron	1_M_PAY_ELDER,{
 			next;
 			switch (select("That's why I came here.:What about my cart?:Two pairs is pitiful?")) {
 			case 1:
-				if ((countitem(1019) > 49) && (countitem(998) > 9) && (countitem(919) > 19)) {
+				if ((countitem(Wooden_Block) > 49) && (countitem(Iron) > 9) && (countitem(Animal's_Skin) > 19)) {
 					mes "[Charlron]";
 					mes "Haha! Ok, ok!";
 					mes "With the things you brought";
 					mes "I will change your cart.";
 					next;
-					delitem 1019,50; //Wooden_Block
-					delitem 998,10; //Iron
-					delitem 919,20; //Animal's_Skin
+					delitem Wooden_Block,50;
+					delitem Iron,10;
+					delitem Animal's_Skin,20;
 					skill "MC_CHANGECART",1,0;
 					mes "[Charlron]";
 					mes "Congratulations.";
@@ -384,7 +384,7 @@ alberta,119,221,6	script	Charlron	1_M_PAY_ELDER,{
 			case 1:
 				.@care_random = rand(1,3);
 				if (.@care_random == 1) {
-					if ((countitem(533) > 1) && (countitem(998) > 19) && (countitem(938) > 29) && (countitem(601) > 19) && (countitem(962) > 4)) {
+					if ((countitem(Grape_Juice) > 1) && (countitem(Iron) > 19) && (countitem(Sticky_Mucus) > 29) && (countitem(Wing_Of_Fly) > 19) && (countitem(Tentacle) > 4)) {
 						mes "[Gershaun]";
 						mes "Hoho!";
 						mes "Got it! I shall teach you";
@@ -395,11 +395,11 @@ alberta,119,221,6	script	Charlron	1_M_PAY_ELDER,{
 						mes "I shall reward those who";
 						mes "eagerly swing their carts!";
 						next;
-						delitem 533,2; //Grape_Juice
-						delitem 998,20; //Iron
-						delitem 938,30; //Sticky_Mucus
-						delitem 601,20; //Wing_Of_Fly
-						delitem 962,5; //Tentacle
+						delitem Grape_Juice,2;
+						delitem Iron,20;
+						delitem Sticky_Mucus,30;
+						delitem Wing_Of_Fly,20;
+						delitem Tentacle,5;
 						skill "MC_CARTREVOLUTION",1,0;
 						mes "Now you can use Cart Revolution";
 						mes "I expect you to make merchants";
@@ -410,13 +410,13 @@ alberta,119,221,6	script	Charlron	1_M_PAY_ELDER,{
 						mes "Have a great day!!";
 						close;
 					}
-					else if (countitem(532) > 0) {
+					else if (countitem(Banana_Juice) > 0) {
 						mes "[Gershaun]";
 						mes "Ooh!";
 						mes "It's banana juice!";
 						mes "Thank you very much!";
 						mes "...............Kaah!";
-						delitem 532,1; //Banana_Juice
+						delitem Banana_Juice,1;
 						mes "Very refreshing! Thank you! Goodbye!";
 						next;
 						mes "[Gershaun]";
@@ -456,7 +456,7 @@ alberta,119,221,6	script	Charlron	1_M_PAY_ELDER,{
 					close;
 				}
 				if (.@care_random == 2) {
-					if ((countitem(533) > 1) && (countitem(998) > 14) && (countitem(938) > 24) && (countitem(601) > 14) && (countitem(962) > 4)) {
+					if ((countitem(Grape_Juice) > 1) && (countitem(Iron) > 14) && (countitem(Sticky_Mucus) > 24) && (countitem(Wing_Of_Fly) > 14) && (countitem(Tentacle) > 4)) {
 						mes "[Gershaun]";
 						mes "Mmm that's good!";
 						mes "Great! I shall teach you";
@@ -467,11 +467,11 @@ alberta,119,221,6	script	Charlron	1_M_PAY_ELDER,{
 						mes "I shall reward those who";
 						mes "eagerly swing their carts!";
 						next;
-						delitem 533,2; //Grape_Juice
-						delitem 998,15; //Iron
-						delitem 938,25; //Sticky_Mucus
-						delitem 601,15; //Wing_Of_Fly
-						delitem 962,5; //Tentacle
+						delitem Grape_Juice,2;
+						delitem Iron,15;
+						delitem Sticky_Mucus,25;
+						delitem Wing_Of_Fly,15;
+						delitem Tentacle,5;
 						skill "MC_CARTREVOLUTION",1,0;
 						mes "Now you can use Cart Revolution";
 						mes "I expect you to make merchants";
@@ -482,13 +482,13 @@ alberta,119,221,6	script	Charlron	1_M_PAY_ELDER,{
 						mes "Have a good day!!";
 						close;
 					}
-					else if (countitem(532) > 0) {
+					else if (countitem(Banana_Juice) > 0) {
 						mes "[Gershaun]";
 						mes "Ooh!";
 						mes "It's banana juice!";
 						mes "Thanks a lot!";
 						mes "...............Kaaah!";
-						delitem 532,1; //Banana_Juice
+						delitem Banana_Juice,1;
 						mes "Very good! Thank you! Good-bye!";
 						next;
 						mes "[Gershaun]";
@@ -529,7 +529,7 @@ alberta,119,221,6	script	Charlron	1_M_PAY_ELDER,{
 					close;
 				}
 				if (.@care_random == 3) {
-					if ((countitem(533) > 1) && (countitem(998) > 22) && (countitem(938) > 31) && (countitem(601) > 22) && (countitem(962) > 5)) {
+					if ((countitem(Grape_Juice) > 1) && (countitem(Iron) > 22) && (countitem(Sticky_Mucus) > 31) && (countitem(Wing_Of_Fly) > 22) && (countitem(Tentacle) > 5)) {
 						mes "[Gershaun]";
 						mes "Mmm that's good!";
 						mes "Great! I shall teach you";
@@ -540,11 +540,11 @@ alberta,119,221,6	script	Charlron	1_M_PAY_ELDER,{
 						mes "I shall reward those who";
 						mes "eagerly swing their carts!";
 						next;
-						delitem 533,2; //Grape_Juice
-						delitem 998,23; //Iron
-						delitem 938,32; //Sticky_Mucus
-						delitem 601,23; //Wing_Of_Fly
-						delitem 962,6; //Tentacle
+						delitem Grape_Juice,2;
+						delitem Iron,23;
+						delitem Sticky_Mucus,32;
+						delitem Wing_Of_Fly,23;
+						delitem Tentacle,6;
 						skill "MC_CARTREVOLUTION",1,0;
 						mes "Now you can use Cart Revolution";
 						mes "I expect you to make merchants";
@@ -555,13 +555,13 @@ alberta,119,221,6	script	Charlron	1_M_PAY_ELDER,{
 						mes "Have a good day!!";
 						close;
 					}
-					else if (countitem(532) > 0) {
+					else if (countitem(Banana_Juice) > 0) {
 						mes "[Gershaun]";
 						mes "Ooh!";
 						mes "It's Banana Juice!";
 						mes "Thanks a lot!";
 						mes "...............Kaaah!";
-						delitem 532,1; //Banana_Juice
+						delitem Banana_Juice,1;
 						mes "Very good! Thank you! Good-bye!";
 						next;
 						mes "[Gershaun]";
diff --git a/npc/quests/skills/monk_skills.txt b/npc/quests/skills/monk_skills.txt
index e3b38cf4c..c494511bd 100644
--- a/npc/quests/skills/monk_skills.txt
+++ b/npc/quests/skills/monk_skills.txt
@@ -286,7 +286,7 @@ monk_test,316,69,5	script	Monk#qsk_mo	4_M_CHNMONK,{
 			mes "for now, my friend.";
 			close;
 		}
-		if (MONK_SK == 4 && countitem(905) > 19 && countitem(711) > 2) {
+		if (MONK_SK == 4 && countitem(Stem) > 19 && countitem(Shoot) > 2) {
 			mes "[Monk]";
 			mes "What's that...?";
 			mes "You've learned the";
@@ -301,8 +301,8 @@ monk_test,316,69,5	script	Monk#qsk_mo	4_M_CHNMONK,{
 			mes "good number of Mandragoras.";
 			mes "All right. You seem to be ready. Come back in a little while so";
 			mes "that I can finish preparations.";
-			delitem 905,20; //Stem
-			delitem 711,3; //Shoot
+			delitem Stem,20;
+			delitem Shoot,3;
 			MONK_SK = 5;
 			close;
 		}
diff --git a/npc/quests/skills/priest_skills.txt b/npc/quests/skills/priest_skills.txt
index 41a8919eb..858eaa3d1 100644
--- a/npc/quests/skills/priest_skills.txt
+++ b/npc/quests/skills/priest_skills.txt
@@ -283,7 +283,7 @@ prt_church,111,112,1	script	Sister Linus	1_F_PRIEST,{
 		}
 		else if (PRIEST_SK == 2) {
 			if (getskilllv("ALL_RESURRECTION") > 0) {
-				if (countitem(523) > 29 && countitem(717) > 19) {
+				if (countitem(Holy_Water) > 29 && countitem(Blue_Gemstone) > 19) {
 					mes "[Sister Linus]";
 					mes "Ooh, it seems like you've";
 					mes "brought everything that you";
@@ -328,8 +328,8 @@ prt_church,111,112,1	script	Sister Linus	1_F_PRIEST,{
 						mes "Please remember to only";
 						mes "use this skill in the most";
 						mes "critical situations.";
-						delitem 717,20; //Blue_Gemstone
-						delitem 523,30; //Holy_Water
+						delitem Blue_Gemstone,20;
+						delitem Holy_Water,30;
 						PRIEST_SK = 100;
 						skill "PR_REDEMPTIO",1,0;
 						close;
@@ -343,8 +343,8 @@ prt_church,111,112,1	script	Sister Linus	1_F_PRIEST,{
 						mes "I'll be waiting right here,";
 						mes "so we can try again when";
 						mes "you're ready, okay?";
-						delitem 717,1; //Blue_Gemstone
-						delitem 523,1; //Holy_Water
+						delitem Blue_Gemstone,1;
+						delitem Holy_Water,1;
 						close;
 					}
 
diff --git a/npc/quests/skills/sage_skills.txt b/npc/quests/skills/sage_skills.txt
index 0978a9534..ff98e2d78 100644
--- a/npc/quests/skills/sage_skills.txt
+++ b/npc/quests/skills/sage_skills.txt
@@ -266,7 +266,7 @@ yuno_in03,176,24,3	script	Mischna	4_M_SAGE_C,{
 		close;
 	}
 	else if(SAG_SK == 1) {
-		if (countitem(904) < 10 || countitem(947) < 7 || countitem(1013) < 12 || countitem(946) < 10 || countitem(7433) < 4) {
+		if (countitem(Scorpion's_Tail) < 10 || countitem(Horn) < 7 || countitem(Colorful_Shell) < 12 || countitem(Snail's_Shell) < 10 || countitem(Scroll) < 4) {
 			mes "[Mishuna]";
 			mes "Hm, you still haven't";
 			mes "gathered all of the materials";
@@ -333,11 +333,11 @@ yuno_in03,176,24,3	script	Mischna	4_M_SAGE_C,{
 			mes "Creation skill by reviewing";
 			mes "your copy of Barmundt's scroll.^000000";
 			specialeffect2 EF_ABSORBSPIRITS;
-			delitem 904,10; // Scorpion_Tail
-			delitem 947,7; // Horn
-			delitem 1013,12; // Rainbow_Shell
-			delitem 946,10; // Snail's_Shell
-			delitem 7433,4; // Blank_Scroll
+			delitem Scorpion's_Tail,10; // Scorpion_Tail
+			delitem Horn,7; // Horn
+			delitem Colorful_Shell,12; // Rainbow_Shell
+			delitem Snail's_Shell,10; // Snail's_Shell
+			delitem Scroll,4; // Blank_Scroll
 			SAG_SK = 2;
 			skill "SA_CREATECON",1,0;
 			next;
@@ -421,7 +421,7 @@ yuno_in03,176,24,3	script	Mischna	4_M_SAGE_C,{
 		setarray .@ReqItem$[0],"Red Bloods","Green Lives","Wind of Verdure","Crystal Blues";
 		setarray .@skill[0],1018,1017,1019,1008;
 		setarray .@skill$[0],"Fire","Earth","Wind","Water";
-		if (countitem(.@ReqItem[.@i]) < 20 || countitem(1089) < 1 || countitem(1088) < 1) {
+		if (countitem(.@ReqItem[.@i]) < 20 || countitem(Payon_Potion) < 1 || countitem(Morocc_Potion) < 1) {
 			mes "[Mishuna]";
 			mes "Are you having trouble";
 			mes "gathering all the required";
@@ -472,8 +472,8 @@ yuno_in03,176,24,3	script	Mischna	4_M_SAGE_C,{
 		mes "@#$%^~ Yap!";
 		specialeffect2 EF_BRANDISHSPEAR;
 		delitem .@ReqItem[.@i],20;
-		delitem 1089,1; // Payon Potion
-		delitem 1088,1; // Morocc Potion
+		delitem Payon_Potion,1; // Payon Potion
+		delitem Morocc_Potion,1; // Morocc Potion
 		SAG_SK = 100;
 		skill .@skill[.@i],1,0;
 		next;
diff --git a/npc/quests/skills/swordman_skills.txt b/npc/quests/skills/swordman_skills.txt
index e66043bef..ffecc8311 100644
--- a/npc/quests/skills/swordman_skills.txt
+++ b/npc/quests/skills/swordman_skills.txt
@@ -116,7 +116,7 @@ izlude_in,118,175,4	script	Knight De Thomas	4W_M_02,{
 		next;
 		switch (select("Yes.:No, I'm not ready yet.")) {
 		case 1:
-			if ((JobLevel > 34 || (BaseJob == Job_Knight || BaseJob == Job_Crusader)) && (countitem(713) > 199) && (countitem(1058) > 0)) {
+			if ((JobLevel > 34 || (BaseJob == Job_Knight || BaseJob == Job_Crusader)) && (countitem(Empty_Bottle) > 199) && (countitem(Wing_Of_Moth) > 0)) {
 				mes "[De Thomas]";
 				mes "Let's see.....";
 				next;
@@ -124,8 +124,8 @@ izlude_in,118,175,4	script	Knight De Thomas	4W_M_02,{
 				mes "Ok! I shall now teach you...";
 				mes "...The Body Movin' skill!";
 				next;
-				delitem 713,200; //Empty_Bottle
-				delitem 1058,1; //Wing_Of_Moth
+				delitem Empty_Bottle,200;
+				delitem Wing_Of_Moth,1;
 				skill "SM_MOVINGRECOVERY",1,0;
 				sm_movingrecovery_x = 2;
 				mes "[De Thomas]";
@@ -145,7 +145,7 @@ izlude_in,118,175,4	script	Knight De Thomas	4W_M_02,{
 				mes "Come back when it is.";
 				close;
 			}
-			else if ((countitem(713) < 200) || (countitem(1058) < 1)) {
+			else if ((countitem(Empty_Bottle) < 200) || (countitem(Wing_Of_Moth) < 1)) {
 				mes "[De Thomas]";
 				mes "You do not have all the items I asked for.";
 				next;
@@ -186,7 +186,7 @@ prt_in,75,88,5	script	Leon Von Frich	4_M_03,3,3,{
 			mes "Be careful! Hahaha!";
 			close;
 		}
-		else if ((countitem(1752) > 9) && (countitem(1751) > 9) && (countitem(532) > 0) && (countitem(962) > 29) && (countitem(526) > 4)) {
+		else if ((countitem(Fire_Arrow) > 9) && (countitem(Silver_Arrow) > 9) && (countitem(Banana_Juice) > 0) && (countitem(Tentacle) > 29) && (countitem(Royal_Jelly) > 4)) {
 			mes "[Leon]";
 			mes "Ooh! You are more than ready";
 			mes "to learn Fatal Blow!";
@@ -197,11 +197,11 @@ prt_in,75,88,5	script	Leon Von Frich	4_M_03,3,3,{
 				mes "[Leon]";
 				mes "OK, lets begin!";
 				next;
-				delitem 1752,10; //Fire_Arrow
-				delitem 1751,10; //Silver_Arrow
-				delitem 532,1; //Banana_Juice
-				delitem 962,30; //Tentacle
-				delitem 526,5; //Royal_Jelly
+				delitem Fire_Arrow,10;
+				delitem Silver_Arrow,10;
+				delitem Banana_Juice,1;
+				delitem Tentacle,30;
+				delitem Royal_Jelly,5;
 				skill "SM_FATALBLOW",1,0;
 				mes "[Leon]";
 				mes "Success!";
@@ -353,7 +353,7 @@ prt_in,94,57,3	script	Juan	4_M_03,4,4,{
 			mes "You can be on your way. (smiley~)";
 			close;
 		}
-		else if ((countitem(924) > 34) && (countitem(958) > 9) && (countitem(957) > 9) && (countitem(518) > 9)) {
+		else if ((countitem(Powder_Of_Butterfly) > 34) && (countitem(Horrendous_Mouth) > 9) && (countitem(Decayed_Nail) > 9) && (countitem(Honey) > 9)) {
 			mes "[Juan]";
 			mes "Ooh. Young swordsman!";
 			mes "You are ready to learn the";
@@ -364,10 +364,10 @@ prt_in,94,57,3	script	Juan	4_M_03,4,4,{
 				mes "[Juan]";
 				mes "Ok. Then...";
 				next;
-				delitem 924,35; //Powder_Of_Butterfly
-				delitem 958,10; //Horrendous_Mouth
-				delitem 957,10; //Decayed_Nail
-				delitem 518,10; //Honey
+				delitem Powder_Of_Butterfly,35;
+				delitem Horrendous_Mouth,10;
+				delitem Decayed_Nail,10;
+				delitem Honey,10;
 				skill "SM_AUTOBERSERK",1,0;
 				mes "[Juan]";
 				mes "You have just become a swordsman";
diff --git a/npc/quests/skills/thief_skills.txt b/npc/quests/skills/thief_skills.txt
index 464657f3e..6aa7e452c 100644
--- a/npc/quests/skills/thief_skills.txt
+++ b/npc/quests/skills/thief_skills.txt
@@ -53,7 +53,7 @@ moc_prydb1,154,128,4	script	Alcouskou	2_M_THIEFMASTER,{
 		case 1:
 			switch (skill_thief_1) {
 			case 0:
-				if ((countitem(7041) > 4) && ((JobLevel > 24) || (BaseJob == Job_Assassin || BaseJob == Job_Rogue))) {
+				if ((countitem(Fine_Grit) > 4) && ((JobLevel > 24) || (BaseJob == Job_Assassin || BaseJob == Job_Rogue))) {
 					mes "[Alcouskou]";
 					mes "Luckily, you have brought some";
 					mes "sand with you. It is very important";
@@ -82,7 +82,7 @@ moc_prydb1,154,128,4	script	Alcouskou	2_M_THIEFMASTER,{
 					mes "return. Find RuRumuni in";
 					mes "west Payon. That is where I";
 					mes "heard he is these days.";
-					delitem 7041,5; //Fine_Grit
+					delitem Fine_Grit,5;
 					skill_thief_1 = 1;
 					close;
 				}
@@ -170,12 +170,12 @@ moc_prydb1,154,128,4	script	Alcouskou	2_M_THIEFMASTER,{
 				mes "that I can teach you.";
 				mes "I hope that this skill will";
 				mes "aid you in the future. -";
-				delitem 7042,1; //Leather_Bag_Of_Infinity
+				delitem Leather_Bag_Of_Infinity,1;
 				skill "TF_SPRINKLESAND",1,0;
 				close;
 			}
 	case 2:
-		if ((countitem(940) > 19) && ((JobLevel > 34) || (BaseJob == Job_Assassin || BaseJob == Job_Rogue))) {
+		if ((countitem(Grasshopper's_Leg) > 19) && ((JobLevel > 34) || (BaseJob == Job_Assassin || BaseJob == Job_Rogue))) {
 			mes "[Alcouskou]";
 			mes "Okay! Let's practice!";
 			next;
@@ -192,7 +192,7 @@ moc_prydb1,154,128,4	script	Alcouskou	2_M_THIEFMASTER,{
 			mes "Great! -At this level,";
 			mes "I am sure you can increase";
 			mes "your skill on your own.";
-			delitem 940,20; //Grasshopper's_Leg
+			delitem Grasshopper's_Leg,20;
 			skill "TF_BACKSLIDING",1,0;
 			close;
 		}
@@ -252,7 +252,7 @@ moc_prydb1,154,128,4	script	Alcouskou	2_M_THIEFMASTER,{
 		mes "If not, I cannot teach you.";
 		close;
 	case 3:
-		if ((countitem(912) > 0) && (countitem(948) > 0) && (countitem(908) > 4) && ((JobLevel > 19) || (BaseJob == Job_Assassin || BaseJob == Job_Rogue))) {
+		if ((countitem(Zargon) > 0) && (countitem(Bear's_Foot) > 0) && (countitem(Spawn) > 4) && ((JobLevel > 19) || (BaseJob == Job_Assassin || BaseJob == Job_Rogue))) {
 			mes "[Alcouskou]";
 			mes "Wow, you have already prepared?";
 			mes "Great, I see promise in you. -";
@@ -282,9 +282,9 @@ moc_prydb1,154,128,4	script	Alcouskou	2_M_THIEFMASTER,{
 			mes "practice on your own time.";
 			mes "I hope it aids you in the future.";
 			mes ". . . . . Hope to see you soon";
-			delitem 912,1; //Zargon
-			delitem 948,1; //Bear's_Foot
-			delitem 908,5; //Spawn
+			delitem Zargon,1;
+			delitem Bear's_Foot,1;
+			delitem Spawn,5;
 			skill "TF_PICKSTONE",1,0;
 			close;
 		}
@@ -342,7 +342,7 @@ moc_prydb1,154,128,4	script	Alcouskou	2_M_THIEFMASTER,{
 		mes "Retrieve these items by any means you see fit.";
 		close;
 	case 4:
-		if ((countitem(910) > 1) && (countitem(911) > 1) && ((JobLevel > 14) || (BaseJob == Job_Assassin || BaseJob == Job_Rogue))) {
+		if ((countitem(Garlet) > 1) && (countitem(Scell) > 1) && ((JobLevel > 14) || (BaseJob == Job_Assassin || BaseJob == Job_Rogue))) {
 			mes "[Alcouskou]";
 			mes "Wow! Have you already gathered the items!";
 			mes "Very well, do you wish to begin?";
@@ -365,8 +365,8 @@ moc_prydb1,154,128,4	script	Alcouskou	2_M_THIEFMASTER,{
 			mes "to it. How you use it in";
 			mes "the future is up to you ..";
 			mes "I wish you luck!";
-			delitem 910,2; //Garlet
-			delitem 911,2; //Scell
+			delitem Garlet,2;
+			delitem Scell,2;
 			skill "TF_THROWSTONE",1,0;
 			close;
 		}
@@ -474,7 +474,7 @@ payon,91,77,3	script	Bag Seller	4W_M_03,{
 		mes "They visit my store often.";
 		close;
 	case 1:
-		if ((countitem(952) > 0) && (countitem(1055) > 0) && (countitem(1025) > 0)) {
+		if ((countitem(Cactus_Needle) > 0) && (countitem(Earthworm_Peeling) > 0) && (countitem(Spiderweb) > 0)) {
 			mes "[RuRumuni]";
 			mes "Ahhh... You have come for a leather bag.";
 			mes "Very good, very good.";
@@ -490,11 +490,11 @@ payon,91,77,3	script	Bag Seller	4W_M_03,{
 			mes "If you take him this, he will";
 			mes "teach you the skill that you ";
 			mes "wish to learn.";
-			delitem 952,1; //Cactus_Needle
-			delitem 1055,1; //Earthworm_Peeling
-			delitem 1025,1; //Spiderweb
+			delitem Cactus_Needle,1;
+			delitem Earthworm_Peeling,1;
+			delitem Spiderweb,1;
 			skill_thief_1 = 2;
-			getitem 7042,1; //Leather_Bag_Of_Infinity
+			getitem Leather_Bag_Of_Infinity,1;
 			close;
 		}
 		mes "[RuRumuni]";
diff --git a/npc/quests/skills/wizard_skills.txt b/npc/quests/skills/wizard_skills.txt
index b774094c5..30bc596a0 100644
--- a/npc/quests/skills/wizard_skills.txt
+++ b/npc/quests/skills/wizard_skills.txt
@@ -240,7 +240,7 @@ gef_tower,115,36,4	script	Meow#q_wiz	4_CAT,{
 			close;
 		}
 		else if (WIZ_SK == 3) {
-			if (countitem(991) < 10 || countitem(993) < 10 || countitem(990) < 10 || countitem(992) < 10) {
+			if (countitem(Crystal_Blue) < 10 || countitem(Yellow_Live) < 10 || countitem(Boody_Red) < 10 || countitem(Wind_Of_Verdure) < 10) {
 				mes "[Meow]";
 				mes "^333333*Yaaaaaawn~*^000000 Hm?";
 				mes "H-how dare you come";
@@ -312,10 +312,10 @@ gef_tower,115,36,4	script	Meow#q_wiz	4_CAT,{
 			mes "That took way too much effort,";
 			mes "but at least we're done here.";
 			specialeffect2 EF_ABSORBSPIRITS;
-			delitem 991,10; //Crystal_Blue
-			delitem 993,10; //Yellow_Live
-			delitem 990,10; //Boody_Red
-			delitem 992,10; //Wind_Of_Verdure
+			delitem Crystal_Blue,10;
+			delitem Yellow_Live,10;
+			delitem Boody_Red,10;
+			delitem Wind_Of_Verdure,10;
 			WIZ_SK = 100;
 			skill "WZ_SIGHTBLASTER",1,0;
 			next;