ItemID to Constant: instances/jobs Folder

6 files changed, 71 insertions, 71 deletions

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