ItemID to Constant: custom Folder

19 files changed, 202 insertions, 202 deletions

diff --git a/npc/custom/bgqueue/flavius.txt b/npc/custom/bgqueue/flavius.txt
index 99a4d5e0a..01a4888df 100644
--- a/npc/custom/bgqueue/flavius.txt
+++ b/npc/custom/bgqueue/flavius.txt
@@ -439,7 +439,7 @@ OnTouch:
 bat_b01,10,294,3	script	Guillaume Vintenar#b01_a	4_M_RASWORD,{
 	if ($@FlaviusBG1_id1 == getcharid(4)) {
 		if ($@FlaviusBG1_Victory == 1) {
-			set .@your_medal,countitem(7829);
+			set .@your_medal,countitem(BF_Badge2);
 			set .@medal_gap,500 - .@your_medal;
 			if (.@medal_gap > 8) {
 				mes "[Axl Rose]";
@@ -447,7 +447,7 @@ bat_b01,10,294,3	script	Guillaume Vintenar#b01_a	4_M_RASWORD,{
 				mes "Let's enjoy our glorious victory!";
 				mes ""+strcharinfo(0)+", it's a sign reflecting victory.";
 				close2;
-				getitem 7829,9; //BF_Badge2
+				getitem BF_Badge2,9;
 			}
 			else {
 				mes "[Axl Rose]";
@@ -455,11 +455,11 @@ bat_b01,10,294,3	script	Guillaume Vintenar#b01_a	4_M_RASWORD,{
 				mes "Let's enjoy our glorious victory!";
 				mes ""+strcharinfo(0)+", it's a sign reflecting victory.";
 				close2;
-				getitem 7829,.@medal_gap; //BF_Badge2
+				getitem BF_Badge2,.@medal_gap;
 			}
 		}
 		else {
-			set .@your_medal,countitem(7829);
+			set .@your_medal,countitem(BF_Badge2);
 			set .@medal_gap,500 - .@your_medal;
 			if (.@medal_gap > 2) {
 				mes "[Axl Rose]";
@@ -467,7 +467,7 @@ bat_b01,10,294,3	script	Guillaume Vintenar#b01_a	4_M_RASWORD,{
 				mes "This is a reward for your great dedication by Guillaume Marollo!";
 				mes "Just take this defeat as a lesson, next time you will definitely win.";
 				close2;
-				getitem 7829,3; //BF_Badge2
+				getitem BF_Badge2,3;
 			}
 			else {
 				mes "[Axl Rose]";
@@ -475,7 +475,7 @@ bat_b01,10,294,3	script	Guillaume Vintenar#b01_a	4_M_RASWORD,{
 				mes "This is a reward for your great dedication by Guillaume Marollo!";
 				mes "Just take this defeat as a lesson, next time you will definitely win.";
 				close2;
-				getitem 7829,.@medal_gap; //BF_Badge2
+				getitem BF_Badge2,.@medal_gap;
 			}
 		}
 	}
@@ -491,7 +491,7 @@ OnInit:
 bat_b01,389,14,3	script	Croix Vintenar#b01_b	4_M_RASWORD,{
 	if ($@FlaviusBG1_id2 == getcharid(4)) {
 		if ($@FlaviusBG1_Victory == 2) {
-			set .@your_medal,countitem(7829);
+			set .@your_medal,countitem(BF_Badge2);
 			set .@medal_gap,500 - .@your_medal;
 			if (.@medal_gap > 8) {
 				mes "[Swandery]";
@@ -499,7 +499,7 @@ bat_b01,389,14,3	script	Croix Vintenar#b01_b	4_M_RASWORD,{
 				mes "Let's enjoy our glorious victory!";
 				mes ""+strcharinfo(0)+", it's a sign reflecting victory.";
 				close2;
-				getitem 7829,9; //BF_Badge2
+				getitem BF_Badge2,9;
 			}
 			else {
 				mes "[Swandery]";
@@ -507,11 +507,11 @@ bat_b01,389,14,3	script	Croix Vintenar#b01_b	4_M_RASWORD,{
 				mes "Let's enjoy our glorious victory!";
 				mes ""+strcharinfo(0)+", it's a sign reflecting victory.";
 				close2;
-				getitem 7829,.@medal_gap; //BF_Badge2
+				getitem BF_Badge2,.@medal_gap;
 			}
 		}
 		else {
-			set .@your_medal,countitem(7829);
+			set .@your_medal,countitem(BF_Badge2);
 			set .@medal_gap,500 - .@your_medal;
 			if (.@medal_gap > 2) {
 				mes "[Swandery]";
@@ -519,7 +519,7 @@ bat_b01,389,14,3	script	Croix Vintenar#b01_b	4_M_RASWORD,{
 				mes "Even though we didn't win, we did our best.";
 				mes "This is a Royal gift from Croix, and please don't forget this battle. We will win the next one.";
 				close2;
-				getitem 7829,3; //BF_Badge2
+				getitem BF_Badge2,3;
 			}
 			else {
 				mes "[Swandery]";
@@ -527,7 +527,7 @@ bat_b01,389,14,3	script	Croix Vintenar#b01_b	4_M_RASWORD,{
 				mes "Even though we didn't win, we did our best.";
 				mes "This is a Royal gift from Croix, and please don't forget this battle. We will win the next one.";
 				close2;
-				getitem 7829,.@medal_gap; //BF_Badge2
+				getitem BF_Badge2,.@medal_gap;
 			}
 		}
 	}
@@ -625,7 +625,7 @@ bat_b01,10,294,3	script	Vintenar#bat_b01_aover	4_M_KY_HEAD,{
 	set .@A_B_gap,$@Guill_ScoreBG1 - $@Croix_ScoreBG1;
 	if ($@FlaviusBG1_id1 == getcharid(4)) {
 		if (.@A_B_gap > 0) {
-			set .@your_medal,countitem(7829);
+			set .@your_medal,countitem(BF_Badge2);
 			set .@medal_gap,500 - .@your_medal;
 			if (.@medal_gap > 8) {
 				mes "[Axl Rose]";
@@ -633,7 +633,7 @@ bat_b01,10,294,3	script	Vintenar#bat_b01_aover	4_M_KY_HEAD,{
 				mes "Let's enjoy our glorious victory!";
 				mes ""+strcharinfo(0)+", it's a sign reflecting victory.";
 				close2;
-				getitem 7829,9; //BF_Badge2
+				getitem BF_Badge2,9;
 			}
 			else {
 				mes "[Axl Rose]";
@@ -641,11 +641,11 @@ bat_b01,10,294,3	script	Vintenar#bat_b01_aover	4_M_KY_HEAD,{
 				mes "Let's enjoy our glorious victory!";
 				mes ""+strcharinfo(0)+", it's a sign reflecting victory.";
 				close2;
-				getitem 7829,.@medal_gap; //BF_Badge2
+				getitem BF_Badge2,.@medal_gap;
 			}
 		}
 		else if (.@A_B_gap == 0) {
-			set .@your_medal,countitem(7829);
+			set .@your_medal,countitem(BF_Badge2);
 			set .@medal_gap,500 - .@your_medal;
 			if (.@medal_gap > 2) {
 				mes "[Axl Rose]";
@@ -653,7 +653,7 @@ bat_b01,10,294,3	script	Vintenar#bat_b01_aover	4_M_KY_HEAD,{
 				mes "This is a reward for your great dedication by Guillaume Marollo!";
 				mes "Just take this defeat as a lesson, next time you will definitely win.";
 				close2;
-				getitem 7829,3; //BF_Badge2
+				getitem BF_Badge2,3;
 			}
 			else {
 				mes "[Axl Rose]";
@@ -661,11 +661,11 @@ bat_b01,10,294,3	script	Vintenar#bat_b01_aover	4_M_KY_HEAD,{
 				mes "This is a reward for your great dedication by Guillaume Marollo!";
 				mes "Just take this defeat as a lesson, next time you will definitely win.";
 				close2;
-				getitem 7829,.@medal_gap; //BF_Badge2
+				getitem BF_Badge2,.@medal_gap;
 			}
 		}
 		else {
-			set .@your_medal,countitem(7829);
+			set .@your_medal,countitem(BF_Badge2);
 			set .@medal_gap,500 - .@your_medal;
 			if (.@medal_gap > 2) {
 				mes "[Axl Rose]";
@@ -673,7 +673,7 @@ bat_b01,10,294,3	script	Vintenar#bat_b01_aover	4_M_KY_HEAD,{
 				mes "This is a reward for your great dedication by Guillaume Marollo!";
 				mes "Just take this defeat as a lesson, next time you will definitely win.";
 				close2;
-				getitem 7829,3; //BF_Badge2
+				getitem BF_Badge2,3;
 			}
 			else {
 				mes "[Axl Rose]";
@@ -681,7 +681,7 @@ bat_b01,10,294,3	script	Vintenar#bat_b01_aover	4_M_KY_HEAD,{
 				mes "This is a reward for your great dedication by Guillaume Marollo!";
 				mes "Just take this defeat as a lesson, next time you will definitely win.";
 				close2;
-				getitem 7829,.@medal_gap; //BF_Badge2
+				getitem BF_Badge2,.@medal_gap;
 			}
 		}
 	}
@@ -703,7 +703,7 @@ bat_b01,389,14,3	script	Vintenar#bat_b01_bover	4_M_CRU_HEAD,{
 	set .@A_B_gap,$@Guill_ScoreBG1 - $@Croix_ScoreBG1;
 	if ($@FlaviusBG1_id2 == getcharid(4)) {
 		if (.@A_B_gap > 0) {
-			set .@your_medal,countitem(7829);
+			set .@your_medal,countitem(BF_Badge2);
 			set .@medal_gap,500 - .@your_medal;
 			if (.@medal_gap > 2) {
 				mes "[Swandery]";
@@ -711,7 +711,7 @@ bat_b01,389,14,3	script	Vintenar#bat_b01_bover	4_M_CRU_HEAD,{
 				mes "Even though we didn't win, we did our best.";
 				mes "This is a Royal gift from Croix, and please don't forget this battle. We will win the next one.";
 				close2;
-				getitem 7829,3; //BF_Badge2
+				getitem BF_Badge2,3;
 			}
 			else {
 				mes "[Swandery]";
@@ -719,11 +719,11 @@ bat_b01,389,14,3	script	Vintenar#bat_b01_bover	4_M_CRU_HEAD,{
 				mes "Even though we didn't win, we did our best.";
 				mes "This is a Royal gift from Croix, and please don't forget this battle. We will win the next one.";
 				close2;
-				getitem 7829,.@medal_gap; //BF_Badge2
+				getitem BF_Badge2,.@medal_gap;
 			}
 		}
 		else if (.@A_B_gap == 0) {
-			set .@your_medal,countitem(7829);
+			set .@your_medal,countitem(BF_Badge2);
 			set .@medal_gap,500 - .@your_medal;
 			if (.@medal_gap > 2) {
 				mes "[Swandery]";
@@ -731,7 +731,7 @@ bat_b01,389,14,3	script	Vintenar#bat_b01_bover	4_M_CRU_HEAD,{
 				mes "Even though we didn't win, we did our best.";
 				mes "This is a Royal gift from Croix, and please don't forget this battle. We will win the next one.";
 				close2;
-				getitem 7829,3; //BF_Badge2
+				getitem BF_Badge2,3;
 			}
 			else {
 				mes "[Swandery]";
@@ -739,11 +739,11 @@ bat_b01,389,14,3	script	Vintenar#bat_b01_bover	4_M_CRU_HEAD,{
 				mes "Even though we didn't win, we did our best.";
 				mes "This is a Royal gift from Croix, and please don't forget this battle. We will win the next one.";
 				close2;
-				getitem 7829,.@medal_gap; //BF_Badge2
+				getitem BF_Badge2,.@medal_gap;
 			}
 		}
 		else {
-			set .@your_medal,countitem(7829);
+			set .@your_medal,countitem(BF_Badge2);
 			set .@medal_gap,500 - .@your_medal;
 			if (.@medal_gap > 8) {
 				mes "[Swandery]";
@@ -751,7 +751,7 @@ bat_b01,389,14,3	script	Vintenar#bat_b01_bover	4_M_CRU_HEAD,{
 				mes "Let's enjoy our glorious victory!";
 				mes ""+strcharinfo(0)+", it's a sign reflecting victory.";
 				close2;
-				getitem 7829,9; //BF_Badge2
+				getitem BF_Badge2,9;
 			}
 			else {
 				mes "[Swandery]";
@@ -759,7 +759,7 @@ bat_b01,389,14,3	script	Vintenar#bat_b01_bover	4_M_CRU_HEAD,{
 				mes "Let's enjoy our glorious victory!";
 				mes ""+strcharinfo(0)+", it's a sign reflecting victory.";
 				close2;
-				getitem 7829,.@medal_gap; //BF_Badge2
+				getitem BF_Badge2,.@medal_gap;
 			}
 		}
 	}
diff --git a/npc/custom/card_remover.txt b/npc/custom/card_remover.txt
index dace8cac0..902f09f91 100644
--- a/npc/custom/card_remover.txt
+++ b/npc/custom/card_remover.txt
@@ -50,7 +50,7 @@ prt_in,28,73,4	script	Wise Old Woman#eAcustom	1_F_ORIENT_04,{
 		}
 		set .@cardcount,getequipcardcnt(.@part);
 
-		if (!checkweight(1202,(.@cardcount+1))) {
+		if (!checkweight(Knife_,(.@cardcount+1))) {
 			mes "^3355FFJust a minute!";
 			mes "I can't offer any of my";
 			mes "services to you because";
@@ -67,7 +67,7 @@ prt_in,28,73,4	script	Wise Old Woman#eAcustom	1_F_ORIENT_04,{
 			mes "Very well. Return at once if you seek my services.";
 			close;
 		}
-		if((Zeny < (.zenycost+(.@cardcount * .percardcost))) || (countitem(1000) < 1) || (countitem(715) < 1)) {
+		if((Zeny < (.zenycost+(.@cardcount * .percardcost))) || (countitem(Star_Crumb) < 1) || (countitem(Yellow_Gemstone) < 1)) {
 			mes "[Wise Old Woman]";
 			mes "You do not have all the items I require to work my magic, child. Come again when you do.";
 			close;
diff --git a/npc/custom/etc/penal_servitude.txt b/npc/custom/etc/penal_servitude.txt
index 30aaf17e2..8566fb871 100644
--- a/npc/custom/etc/penal_servitude.txt
+++ b/npc/custom/etc/penal_servitude.txt
@@ -130,24 +130,24 @@ M_NO_THANKS:
 sec_in02,137,57,1	script	Overseer	4_M_PAY_SOLDIER,{
 	mes "[Oliver]";
 
-	delitem 4002,countitem(4002);//Items: Fabre_Card,
-	delitem 4009,countitem(4009);//Items: Chonchon_Card,
-	delitem 4022,countitem(4022);//Items: Spore_Card,
-	delitem 4048,countitem(4048);//Items: Poison_Spore_Card,
+	delitem Fabre_Card,countitem(Fabre_Card);//Items: Fabre_Card,
+	delitem Chonchon_Card,countitem(Chonchon_Card);//Items: Chonchon_Card,
+	delitem Spore_Card,countitem(Spore_Card);//Items: Spore_Card,
+	delitem Poison_Spore_Card,countitem(Poison_Spore_Card);//Items: Poison_Spore_Card,
 
 	if (PRISON_Q <= 0 ) goto L_GET_Q;
 
 	mes "I want you to gather ^FF0000"+PRISON_Q+" Orange Net Mushroom^000000.";
-	if ( countitem(1069)<PRISON_Q ) close;//Items: Orange_Net_Mushroom,
+	if ( countitem(Mushroom_Of_Thief_1)<PRISON_Q ) close;//Items: Orange_Net_Mushroom,
 	mes "OK... hand me all the shrooms...";
-	mes "Let me see... "+countitem(1069)+" of almost eadible ones...";//Items: Orange_Net_Mushroom,
-	mes "And "+countitem(1070)+" useless deadly ones.";//Items: Orange_Gooey_Mushroom_,
+	mes "Let me see... "+countitem(Mushroom_Of_Thief_1)+" of almost eadible ones...";//Items: Orange_Net_Mushroom,
+	mes "And "+countitem(Mushroom_Of_Thief_2)+" useless deadly ones.";//Items: Orange_Gooey_Mushroom_,
 	next;
 	mes "[Oliver]";
 	mes "Thank you. You are free!";
 	set PRISON_Q,0;
-	delitem 1069,countitem(1069);//Items: Orange_Net_Mushroom,
-	delitem 1070,countitem(1070);//Items: Orange_Gooey_Mushroom_,
+	delitem Mushroom_Of_Thief_1,countitem(Mushroom_Of_Thief_1);//Items: Orange_Net_Mushroom,
+	delitem Mushroom_Of_Thief_2,countitem(Mushroom_Of_Thief_2);//Items: Orange_Gooey_Mushroom_,
 	next;
 	savepoint "izlude",105,112;
 	warp "izlude",105,112;
@@ -157,9 +157,9 @@ L_GET_Q:
 	set PRISON,PRISON+1;
 	if (PRISON > 1) mes "Hmm... You've been here already... Well-well...";
 
-	if ( countitem(1069) || countitem(1070) ) mes "Drop these mushrooms!! They are poisonous!";//Items: Orange_Net_Mushroom, Orange_Gooey_Mushroom_,
-	delitem 1069,countitem(1069);//Items: Orange_Net_Mushroom,
-	delitem 1070,countitem(1070);//Items: Orange_Gooey_Mushroom_,
+	if ( countitem(Mushroom_Of_Thief_1) || countitem(Mushroom_Of_Thief_2) ) mes "Drop these mushrooms!! They are poisonous!";//Items: Orange_Net_Mushroom, Orange_Gooey_Mushroom_,
+	delitem Mushroom_Of_Thief_1,countitem(Mushroom_Of_Thief_1);//Items: Orange_Net_Mushroom,
+	delitem Mushroom_Of_Thief_2,countitem(Mushroom_Of_Thief_2);//Items: Orange_Gooey_Mushroom_,
 
 	set PRISON_Q, PRISON*3 + BaseLevel/3;
 	set PRISON_Q, PRISON_Q * (readparam(bAspd)/55 + 1);
diff --git a/npc/custom/events/hallow06.txt b/npc/custom/events/hallow06.txt
index 01a122320..3045c2330 100644
--- a/npc/custom/events/hallow06.txt
+++ b/npc/custom/events/hallow06.txt
@@ -87,7 +87,7 @@ L_Treat:
 	menu "Got'em",-, "Don't Have",L_Dont_Have, "See List",L_List;
 
 	mes "[Hallows' Eve Event]";
-	if((countitem(2220) < 1) || (countitem(535) < 30) || (countitem(7205) < 20)){
+	if((countitem(Hat) < 1) || (countitem(Pumpkin) < 30) || (countitem(Piece_Of_Black_Cloth) < 20)){
 		mes "You don't have enough items. Come back when you do.";
 		emotion e_sry;
 		close;
diff --git a/npc/custom/events/uneasy_cemetery.txt b/npc/custom/events/uneasy_cemetery.txt
index d48e5f928..114c6d65a 100644
--- a/npc/custom/events/uneasy_cemetery.txt
+++ b/npc/custom/events/uneasy_cemetery.txt
@@ -82,9 +82,9 @@ L_Undead_Walk:
 	next;
 	menu "Yes, have all my Holy Water!",-, "Nope, I need it.",M_NO, "I don't have any.",M_DONT_HAVE;
 
-	if ( countitem(523)<1 ) goto M_DONT_HAVE;
-	set $UNEASY_BL,$UNEASY_BL-countitem(523);
-	delitem 523,countitem(523);
+	if ( countitem(Holy_Water)<1 ) goto M_DONT_HAVE;
+	set $UNEASY_BL,$UNEASY_BL-countitem(Holy_Water);
+	delitem 523,countitem(Holy_Water);
 
 	if ( $UNEASY_BL > 0 ) goto L_NEED_MORE;
 //set quiet days!!! no more undead for this period!
@@ -107,7 +107,7 @@ L_Undead_Walk:
 	if (Sex==0) mapannounce "prontera","[Mother Mathana]: In the name of Odin we declare beautiful "+$UNEASY_H$+" as a Prontera savior!",0;
 	mes "[Mother Mathana]";
 	mes "In the name of Odin we bless you and decently present a modest gift just from Mareusis' wine-cellar.";
-	getitem 505,1; //Blue_Potion
+	getitem Blue_Potion,1;
 	set JobExp,JobExp+100;
 	set BaseExp,BaseExp+50;
 	close;
diff --git a/npc/custom/events/valentinesdayexp.txt b/npc/custom/events/valentinesdayexp.txt
index 933afc647..ccb66bde6 100644
--- a/npc/custom/events/valentinesdayexp.txt
+++ b/npc/custom/events/valentinesdayexp.txt
@@ -166,7 +166,7 @@ M_CHOCO:
 	if (@flag_num > 5) goto L_ERR;
 	set @needmon,@flag_num*4500;
 	if (Zeny < @needmon) goto L_NOTENO;
-	if (countitem(519) < @flag_num) goto L_NOMILK;
+	if (countitem(Milk) < @flag_num) goto L_NOMILK;
 	Zeny -= @needmon;
 	delitem 519,@flag_num;
 	getitem 561,@flag_num;
@@ -204,7 +204,7 @@ prt_castle,54,34,4	script	Carl Orleans#val1	1_M_01,{
 	mes "[Carl Orleans]";
 	mes "Well, I just might be able to fulfill your needs...";
 	next;
-	if (countitem(558)<3) {
+	if (countitem(Chocolate)<3) {
 		mes "[Carl Orleans]";
 		mes "I'm sorry you do not have enough Chocolate Bars to do this.";
 		if(rand(2))mes "They say Stephen from Alberta used to sell good Chocolate.";
@@ -237,7 +237,7 @@ M_WHITE:
 	mes "[Carl Orleans]";
 	mes "Well, I just might be able to fulfill your needs...";
 	next;
-	if (countitem(561)<3) {
+	if (countitem(White_Chocolate)<3) {
 		mes "[Carl Orleans]";
 		mes "I'm sorry you do not have enough White Chocolate Bars to do this.";
 		if(rand(2))mes "They say Jainie from Alberta used to sell good White Chocolate.";
diff --git a/npc/custom/events/xmas_rings_event.txt b/npc/custom/events/xmas_rings_event.txt
index 71be79aa5..a1b8918d9 100644
--- a/npc/custom/events/xmas_rings_event.txt
+++ b/npc/custom/events/xmas_rings_event.txt
@@ -64,17 +64,17 @@ M_WRAP:
 	next;
 	menu "Wrap them, please!",-, "No, thanks.",M_QUEST;
 
-	set @prizes, countitem(664)+countitem(665)+countitem(666)+countitem(667);
+	set @prizes, countitem(Gift_Box_1)+countitem(Gift_Box_2)+countitem(Gift_Box_3)+countitem(Gift_Box_4);
 	if( @prizes == 0){
 		mes "[Snower]";
 		mes "I don't see any gifts in fancy boxes on you...";
-		if(countitem(644))mes "You've got only gray boxes.";
+		if(countitem(Gift_Box))mes "You've got only gray boxes.";
 		close;
 	}
-	delitem 664,countitem(664);
-	delitem 665,countitem(665);
-	delitem 666,countitem(666);
-	delitem 667,countitem(667);
+	delitem 664,countitem(Gift_Box_1);
+	delitem 665,countitem(Gift_Box_2);
+	delitem 666,countitem(Gift_Box_3);
+	delitem 667,countitem(Gift_Box_4);
 	getitem 644,@prizes;
 
 	mes "[Snower]";
@@ -114,7 +114,7 @@ louyang,224,249,4	script	Sneewy	4_F_KID3,{
 		menu "Here are your 4 Gift Boxes",-, "I don't know any Snowhatevers...",M_End;
 
 		mes "[Sneewy]";
-		if(countitem(644)<4){
+		if(countitem(Gift_Box)<4){
 			mes "Gimme 4 gifts for poor kids... Wait, you haven't got 4 of them!";
 			emotion e_sry;
 			close;
@@ -166,7 +166,7 @@ izlu2dun,133,160,2	script	Snoowy	4_F_06,{
 		menu "Have these gifts!",-, "I need a li'l something in return",M_End;
 
 		mes "[Snoowy]";
-		if(countitem(644)<3){
+		if(countitem(Gift_Box)<3){
 			mes "Oops!! You haven't got 3 gray gift boxes on you.";
 			emotion e_sry;
 			close;
diff --git a/npc/custom/quests/bandit_beard.txt b/npc/custom/quests/bandit_beard.txt
index 68c13727b..dc2d837fb 100644
--- a/npc/custom/quests/bandit_beard.txt
+++ b/npc/custom/quests/bandit_beard.txt
@@ -71,8 +71,8 @@ L_MAKE:
 	mes "[Bearded Man]";
 	mes "Let's make you your beard!";
 	next;
-	if(countitem(7200) < 1 || countitem(919) < 1 ||	countitem(983) < 1 || countitem(2241) < 1 ||
-	countitem(938) < 100 || countitem(973) < 1 || countitem(731) < 1) goto L_NOITEMS;
+	if(countitem(Flexible_String) < 1 || countitem(Animal's_Skin) < 1 ||	countitem(Black_Dyestuffs) < 1 || countitem(Granpa_Beard) < 1 ||
+	countitem(Sticky_Mucus) < 100 || countitem(Counteragent) < 1 || countitem(Crystal_Jewel_) < 1) goto L_NOITEMS;
 	delitem 7200, 1;
 	delitem 919, 1;
 	delitem 983, 1;
diff --git a/npc/custom/quests/dead_branch.txt b/npc/custom/quests/dead_branch.txt
index ef49db159..9b54501f7 100644
--- a/npc/custom/quests/dead_branch.txt
+++ b/npc/custom/quests/dead_branch.txt
@@ -77,10 +77,10 @@ M_CREATE:
 	mes "[Mister Mobry]";
 	mes "Well...let us see what you brought me...";
 	next;
-	if(countitem(7201)<3) goto L_NOLOG;
-	if(countitem(7189)<1) goto L_NOHEART;
-	if(countitem(1019)<5) goto L_NOTRUNK;
-	if(countitem(7222)<1) goto L_NOGNARL;
+	if(countitem(Log)<3) goto L_NOLOG;
+	if(countitem(Heart_Of_Tree)<1) goto L_NOHEART;
+	if(countitem(Wooden_Block)<5) goto L_NOTRUNK;
+	if(countitem(Tree_Knot)<1) goto L_NOGNARL;
 	delitem 7201,3;
 	delitem 7189,1;
 	delitem 1019,5;
@@ -89,10 +89,10 @@ M_CREATE:
 	mes "Heh... Hope you have fun with the tree spirits... Careful now...";
 	mes "Heh... careful now? What do I care if you di..... Never mind.";
 	if(rand(1000)==0) goto L_GIVE2;
-	getitem 604,1; //Dead Branch
+	getitem Branch_Of_Dead_Tree,1; //Dead Branch
 	close;
 L_GIVE2:
-	getitem 12103,1; //Bloody Branch
+	getitem Bloody_Dead_Branch,1; //Bloody Branch
 	close;
 
 M_End:
diff --git a/npc/custom/quests/elvenear.txt b/npc/custom/quests/elvenear.txt
index eb2d1ba4c..cf468d68e 100644
--- a/npc/custom/quests/elvenear.txt
+++ b/npc/custom/quests/elvenear.txt
@@ -21,7 +21,7 @@ geffen,127,49,5	script	Elven Ears Quest	4_M_02,{
 	mes "[Elven Ears quest]";
 	mes "Good good, let me just check";
 	next;
-	if(countitem(2213)<1 || countitem(1040)<20 || countitem(919)<20) goto L_NoMake;
+	if(countitem(Cat_Hairband)<1 || countitem(Elder_Pixie's_Beard)<20 || countitem(Animal's_Skin)<20) goto L_NoMake;
 	delitem 2213,1;
 	delitem 1040,20;
 	delitem 919,20;
diff --git a/npc/custom/quests/event_6_new_hats.txt b/npc/custom/quests/event_6_new_hats.txt
index 497fae849..b72d895df 100644
--- a/npc/custom/quests/event_6_new_hats.txt
+++ b/npc/custom/quests/event_6_new_hats.txt
@@ -39,18 +39,18 @@ L1_4:
 	mes "[Zac]";
 	mes "Let me check the items you have brought here.";
 	next;
-	if(countitem(609) < 10) goto L_ITEM_1c;//Items: Amulet,
-	if(countitem(978) < 1) goto L_ITEM_2c;//Items: Cobaltblue Dyestuff,
-	if(countitem(2264) < 1) goto L_ITEM_3c;//Items: Munak Hat,
-	delitem 609,10;//Items: Amulet,
-	delitem 978,1;//Items: Cobaltblue Dyestuff,
-	delitem 2264,1;	//Items: Munak Hat,
+	if(countitem(Amulet) < 10) goto L_ITEM_1c;//Items: Amulet,
+	if(countitem(Cobaltblue_Dyestuffs) < 1) goto L_ITEM_2c;//Items: Cobaltblue Dyestuff,
+	if(countitem(Munak_Turban) < 1) goto L_ITEM_3c;//Items: Munak Hat,
+	delitem Amulet,10;//Items: Amulet,
+	delitem Cobaltblue_Dyestuffs,1;//Items: Cobaltblue Dyestuff,
+	delitem Munak_Turban,1;	//Items: Munak Hat,
 	mes "[Zac]";
 	mes "Wow!! Well done! Finally you have gathered all items needed! We will make the Bongun Hat for you right away. Please Wait a Moment.";
    	next;
 	mes "[Zac]";
 	mes "Tah Dah! ^FF0000Bongun Hat^000000...! Please Take it!";
-	getitem 5046,1;//Items: Bongun Hat,
+	getitem Bongun_Hat,1;//Items: Bongun Hat,
 	next;
 	mes "[Zac]";
 	mes "I liked that, I look forward to making more. Thank you.";
@@ -99,16 +99,16 @@ L1_9:
 	mes "[Blac]";
 	mes "Let me check the items you have brought here.";
 	next;
-	if(countitem(5041) < 1) goto L_ITEM_1;//Items: Heart Hairpin,
-	if(countitem(999) < 10) goto L_ITEM_2;//Items: Steel,
-	delitem 5041,1;//Items: Heart Hairpin,
-	delitem 999,10;	//Items: Steel,
+	if(countitem(Heart_Hair_Pin) < 1) goto L_ITEM_1;//Items: Heart Hairpin,
+	if(countitem(Steel) < 10) goto L_ITEM_2;//Items: Steel,
+	delitem Heart_Hair_Pin,1;//Items: Heart Hairpin,
+	delitem Steel,10;	//Items: Steel,
 	mes "[Blac]";
 	mes "Wow!! Well done! Finally you have gathered all items needed! We will make the Crescent Hairpin for you right away. Please Wait a Moment.";
    	next;
 	mes "[Blac]";
 	mes "Tah Dah! ^FF0000Crescent Hairpin^000000...! Please Take it!";
-	getitem 5048,1;//Items: Cresent Hairpin,
+	getitem First_Moon_Hair_Pin,1;//Items: Cresent Hairpin,
 	next;
 	mes "[Blac]";
 	mes "I liked that, I look forward to making more. Thank you.";
@@ -153,16 +153,16 @@ L1_19:
 	mes "[Jac]";
 	mes "Let me check the items you have brought here.";
 	next;
-	if(countitem(10007) < 1) goto L_ITEM_1b;//Items: Silk Ribbon,
-	if(countitem(10009) < 1) goto L_ITEM_2b;//Items: Wild Flower,
-	delitem 10007,1;//Items: Silk Ribbon,
-	delitem 10009,1;	//Items: Wild Flower,
+	if(countitem(Silk_Ribbon) < 1) goto L_ITEM_1b;//Items: Silk Ribbon,
+	if(countitem(Wild_Flower) < 1) goto L_ITEM_2b;//Items: Wild Flower,
+	delitem Silk_Ribbon,1;//Items: Silk Ribbon,
+	delitem Wild_Flower,1;	//Items: Wild Flower,
 	mes "[Jac]";
 	mes "Wow!! Well done! Finally you have gathered all items needed! We will make the Kafra Band for you right away. Please Wait a Moment.";
    	next;
 	mes "[Jac]";
 	mes "Tah Dah! ^FF0000Kafra Band^000000...! Please Take it!";
-	getitem 5020,1;//Items: Kafra's Band,
+	getitem Kafra_Band,1;//Items: Kafra's Band,
 	next;
 	mes "[Jac]";
 	mes "I liked that, I look forward to making more. Thank you.";
@@ -179,16 +179,16 @@ L1_24:
 	mes "[Jac]";
 	mes "Let me check the items you have brought here.";
 	next;
-	if(countitem(999) < 10) goto L_ITEM_1g;//Items: Steel,
-	if(countitem(948) < 200) goto L_ITEM_2g;//Items: Bears Footskin,
-	delitem 999,10;//Items: Steel,
-	delitem 948,200;	//Items: Bears Footskin,
+	if(countitem(Steel) < 10) goto L_ITEM_1g;//Items: Steel,
+	if(countitem(Bear's_Foot) < 200) goto L_ITEM_2g;//Items: Bears Footskin,
+	delitem Steel,10;//Items: Steel,
+	delitem Bear's_Foot,200;	//Items: Bears Footskin,
 	mes "[Jac]";
 	mes "Wow!! Well done! Finally you have gathered all items needed! We will make the Panda Hat for you right away. Please Wait a Moment.";
    	next;
 	mes "[Jac]";
 	mes "Tah Dah! ^FF0000Panda Hat^000000...! Please Take it!";
-	getitem 5030,1;//Items: Panda Hat,
+	getitem Panda_Cap,1;//Items: Panda Hat,
 	next;
 	mes "[Jac]";
 	mes "I liked that, I look forward to making more. Thank you.";
@@ -237,16 +237,16 @@ L1_26:
 	mes "[Pac]";
 	mes "Let me check the items you have brought here.";
 	next;
-	if(countitem(741) < 1) goto L_ITEM_1a;//Items: Poring Doll,
-	if(countitem(909) < 300) goto L_ITEM_2a;//Items: Jellopy,
-	delitem 741,1;//Items: Poring Doll,
-	delitem 909,300;//Items: Jellopy,
+	if(countitem(Poring_Doll) < 1) goto L_ITEM_1a;//Items: Poring Doll,
+	if(countitem(Jellopy) < 300) goto L_ITEM_2a;//Items: Jellopy,
+	delitem Poring_Doll,1;//Items: Poring Doll,
+	delitem Jellopy,300;//Items: Jellopy,
 	mes "[Pac]";
 	mes "Wow!! Well done! Finally you have gathered all items needed! We will make the Poring Hat for you right away. Please Wait a Moment.";
    	next;
 	mes "[Pac]";
 	mes "Tah Dah! ^FF0000Poring Hat^000000...! Please Take it!";
-	getitem 5035,1;//Items: Poring Hat,
+	getitem Poring_Hat,1;//Items: Poring Hat,
 	next;
 	mes "[Pac]";
 	mes "I liked that, I look forward to making more. Thank you.";
@@ -263,22 +263,22 @@ L1_29:
 	mes "[Pac]";
 	mes "Let me check the items you have brought here.";
 	next;
-	if(countitem(999) < 25) goto L_ITEM_1d;//Items: Steel,
-	if(countitem(979) < 1) goto L_ITEM_2d;//Items: Darkgreen Dyestuff,
-	if(countitem(976) < 1) goto L_ITEM_3d;//Items: Lemon Dyestuffs,
-	if(countitem(1059) < 150) goto L_ITEM_4d;//Items: Fabric,
-	if(countitem(969) < 2) goto L_ITEM_5d;//Items: Gold,
-	delitem 999,25;//Items: Steel,
-	delitem 979,1;//Items: Darkgreen Dyestuff,
-	delitem 976,1;//Items: Lemon Dyestuffs,
-	delitem 1059,150;//Items: Fabric,
-	delitem 969,2; 	//Items: Gold,
+	if(countitem(Steel) < 25) goto L_ITEM_1d;//Items: Steel,
+	if(countitem(Darkgreen_Dyestuffs) < 1) goto L_ITEM_2d;//Items: Darkgreen Dyestuff,
+	if(countitem(Lemon_Dyestuffs) < 1) goto L_ITEM_3d;//Items: Lemon Dyestuffs,
+	if(countitem(Transparent_Cloth) < 150) goto L_ITEM_4d;//Items: Fabric,
+	if(countitem(Gold) < 2) goto L_ITEM_5d;//Items: Gold,
+	delitem Steel,25;//Items: Steel,
+	delitem Darkgreen_Dyestuffs,1;//Items: Darkgreen Dyestuff,
+	delitem Lemon_Dyestuffs,1;//Items: Lemon Dyestuffs,
+	delitem Transparent_Cloth,150;//Items: Fabric,
+	delitem Gold,2; 	//Items: Gold,
 	mes "[Pac]";
 	mes "Wow!! Well done! Finally you have gathered all items needed! We will make the Sphinx Hat for you right away. Please Wait a Moment.";
    	next;
 	mes "[Pac]";
 	mes "Tah Dah! ^FF0000Sphinx Hat^000000...! Please Take it!";
-	getitem 5053,1;//Items: Sphinx Hat,
+	getitem Spinx_Helm,1;//Items: Sphinx Hat,
 	next;
 	mes "[Pac]";
 	mes "I liked that, I look forward to making more. Thank you.";
diff --git a/npc/custom/quests/jewel_case.txt b/npc/custom/quests/jewel_case.txt
index d725a33f1..509819626 100644
--- a/npc/custom/quests/jewel_case.txt
+++ b/npc/custom/quests/jewel_case.txt
@@ -20,7 +20,7 @@ lighthalzen,108,229,2	script	La Fenn	4_M_JPNOJI,{
 			mes "[La Fenn]";
 			mes "Here is your prize. It's yours for good.";
 			set Q_99LVL,0;
-			getitem 12106,1; //Jewel Case
+			getitem Accessory_Box,1; //Jewel Case
 			emotion e_grat;
 		} else {
 			mes callfunc("F_Hi");
diff --git a/npc/custom/quests/kahohorn.txt b/npc/custom/quests/kahohorn.txt
index 8c5c4d8cf..880e2aff9 100644
--- a/npc/custom/quests/kahohorn.txt
+++ b/npc/custom/quests/kahohorn.txt
@@ -53,7 +53,7 @@ geffen,115,107,5	script	Lord Kaho's Servant	1_M_PUBMASTER,{
 	mes .@n$;
 	for(set .@i,0; .@i<18; set .@i,.@i+1)
 		if (!countitem(.@items[.@i])) { set .@nr,1; break; }
-	if (.@nr || countitem(714) < 3 || Zeny < 5000000) {
+	if (.@nr || countitem(Emperium) < 3 || Zeny < 5000000) {
 		mes "I can't afford to make this if you don't bring all materials needed. Please understand this is to benefit heroes such as yourself!";
 		close; }
 	for(set .@i,0; .@i<18; set .@i,.@i+1)
diff --git a/npc/custom/quests/may_hats.txt b/npc/custom/quests/may_hats.txt
index 1739fee07..3a37c5c9c 100644
--- a/npc/custom/quests/may_hats.txt
+++ b/npc/custom/quests/may_hats.txt
@@ -36,11 +36,11 @@ gonryun,187,140,4	script	Yakima	4_F_EINWOMAN,{
 	next;
 	menu "Yeah.",-,"Nay.",M_Exit;
 
-	if(countitem(5067) < 1 || countitem(916) < 920 || countitem(925) < 310) goto l_noitem;//Items: Sombrero, Feather_of_Birds, Bill_of_Birds,
-	delitem 5067,1;//Items: Sombrero,
-	delitem 916,920;//Items: Feather_of_Birds,
-	delitem 925,310;//Items: Bill_of_Birds,
-	getitem 5129,1;//Items: Bird_Nest,
+	if(countitem(Sombrero) < 1 || countitem(Feather_Of_Birds) < 920 || countitem(Bill_Of_Birds) < 310) goto l_noitem;//Items: Sombrero, Feather_of_Birds, Bill_of_Birds,
+	delitem Sombrero,1;//Items: Sombrero,
+	delitem Feather_Of_Birds,920;//Items: Feather_of_Birds,
+	delitem Bill_Of_Birds,310;//Items: Bill_of_Birds,
+	getitem Bird_Nest,1;//Items: Bird_Nest,
 	mes "[Yakima]";
 	mes "Thank you very very much!";
 	mes callfunc("F_Bye");
@@ -63,12 +63,12 @@ M_2:
 	next;
 	menu "Yeah.",-,"Nay.",M_Exit;
 
-	if(countitem(5098) < 1 || countitem(1030) < 10 || countitem(1029) < 30 || countitem(7267) < 300) goto l_noitem;//Items: Tiger_Mask, Tiger_Skin, Tiger's_Footskin, Tiger_Panty,
-	delitem 5098,1;//Items: Tiger_Mask,
-	delitem 1030,10;//Items: Tiger's_Footskin,
-	delitem 1029,30;//Items: Tiger_Skin,
-	delitem 7267,300;//Items: Tiger_Panty,
-	getitem 5130,1;//Items: Lion_Mask,
+	if(countitem(Tiger_Mask) < 1 || countitem(Tiger_Footskin) < 10 || countitem(Tiger's_Skin) < 30 || countitem(Tiger_Skin_Panties) < 300) goto l_noitem;//Items: Tiger_Mask, Tiger_Skin, Tiger's_Footskin, Tiger_Panty,
+	delitem Tiger_Mask,1;//Items: Tiger_Mask,
+	delitem Tiger_Footskin,10;//Items: Tiger's_Footskin,
+	delitem Tiger's_Skin,30;//Items: Tiger_Skin,
+	delitem Tiger_Skin_Panties,300;//Items: Tiger_Panty,
+	getitem Lion_Mask,1;//Items: Lion_Mask,
 	mes "[Yakima]";
 	mes "Thank you very very much!";
 	mes callfunc("F_Bye");
@@ -92,12 +92,12 @@ M_3:
 	next;
 	menu "Yeah.",-,"Nay.",M_Exit;
 
-	if(countitem(2508) < 1 || countitem(2506) < 2 || countitem(2609) < 3 || countitem(7207) < 10) goto l_noitem;//Items: Ragamuffin_Manteau, Manteau_, Skull_Ring, Old_Manteau,
-	delitem 2508,1;//Items: Ragamuffin_Manteau,
-	delitem 2506,2;//Items: Manteau_,
-	delitem 2609,3;//Items: Skull_Ring,
-	delitem 7207,10;//Items: Old_Manteau,
-	getitem 2511,1;//Items: Skeleton_Manteau,
+	if(countitem(Ragamuffin_Cape) < 1 || countitem(Manteau_) < 2 || countitem(Skul_Ring) < 3 || countitem(Old_Manteau) < 10) goto l_noitem;//Items: Ragamuffin_Manteau, Manteau_, Skull_Ring, Old_Manteau,
+	delitem Ragamuffin_Cape,1;//Items: Ragamuffin_Manteau,
+	delitem Manteau_,2;//Items: Manteau_,
+	delitem Skul_Ring,3;//Items: Skull_Ring,
+	delitem Old_Manteau,10;//Items: Old_Manteau,
+	getitem Skeleton's_Cape,1;//Items: Skeleton_Manteau,
 	mes "[Yakima]";
 	mes "Thank you very very much!";
 	mes callfunc("F_Bye");
@@ -121,12 +121,12 @@ M_4:
 	next;
 	menu "Yeah.",-,"Nay.",M_Exit;
 
-	if(countitem(2269) < 3 || countitem(2207) < 3 || countitem(2612) < 2 || countitem(2287)<3 ) goto l_noitem;//Items: Romantic_Flower, Fancy_Flower, Flower_Ring,
-	delitem 2269,3;//Items: Romantic_Flower,
-	delitem 2207,3;//Items: Fancy_Flower,
-	delitem 2612,2;//Items: Flower_Ring,
-	delitem 2287,3;//Items: Pirate_Bandana
-	getitem 2641,1;//Items: Fashion_Hip_Sack,
+	if(countitem(Centimental_Flower) < 3 || countitem(Fancy_Flower) < 3 || countitem(Flower_Ring) < 2 || countitem(Pirate_Bandana)<3 ) goto l_noitem;//Items: Romantic_Flower, Fancy_Flower, Flower_Ring,
+	delitem Centimental_Flower,3;//Items: Romantic_Flower,
+	delitem Fancy_Flower,3;//Items: Fancy_Flower,
+	delitem Flower_Ring,2;//Items: Flower_Ring,
+	delitem Pirate_Bandana,3;//Items: Pirate_Bandana
+	getitem Fashionable_Sack,1;//Items: Fashion_Hip_Sack,
 	mes "[Yakima]";
 	mes "Thank you very very much!";
 	mes callfunc("F_Bye");
@@ -152,14 +152,14 @@ M_5:
 	next;
 	menu "Yeah.",-,"Nay.",M_Exit;
 
-	if(countitem(975) < 1 || countitem(980) < 1 || countitem(2272) < 2 || countitem(2262) < 3 || countitem(7298) < 180 || countitem(7164) < 20) goto l_noitem;//Items: Scarlet_Dyestuff, Orange_Dyestuff, Stop_Post, Clown_Nose, Fig_Leaf, Solid_Peach,
-	delitem 975,1;//Items: Scarlet_Dyestuff,
-	delitem 980,1;//Items: Orange_Dyestuff,
-	delitem 2272,2;//Items: Stop_Post,
-	delitem 2262,3;//Items: Clown_Nose,
-	delitem 7298,180;//Items: Fig_Leaf,
-	delitem 7164,20;//Items: Solid_Peach,
-	getitem 5100,1;//Items: Sales_Banner,
+	if(countitem(Scarlet_Dyestuffs) < 1 || countitem(Orange_Dyestuffs) < 1 || countitem(Stop_Post) < 2 || countitem(Pierrot_Nose) < 3 || countitem(Leaf_Clothes) < 180 || countitem(Hard_Peach) < 20) goto l_noitem;//Items: Scarlet_Dyestuff, Orange_Dyestuff, Stop_Post, Clown_Nose, Fig_Leaf, Solid_Peach,
+	delitem Scarlet_Dyestuffs,1;//Items: Scarlet_Dyestuff,
+	delitem Orange_Dyestuffs,1;//Items: Orange_Dyestuff,
+	delitem Stop_Post,2;//Items: Stop_Post,
+	delitem Pierrot_Nose,3;//Items: Clown_Nose,
+	delitem Leaf_Clothes,180;//Items: Fig_Leaf,
+	delitem Hard_Peach,20;//Items: Solid_Peach,
+	getitem Sales_Signboard,1;//Items: Sales_Banner,
 	mes "[Yakima]";
 	mes "Thank you very very much!";
 	mes callfunc("F_Bye");
diff --git a/npc/custom/quests/sunglasses.txt b/npc/custom/quests/sunglasses.txt
index 447fca877..1b45c9036 100644
--- a/npc/custom/quests/sunglasses.txt
+++ b/npc/custom/quests/sunglasses.txt
@@ -51,7 +51,7 @@ alberta,88,193,5	script	Sunglasses Trader	1_F_MERCHANT_01,{
 		mes "Suit yourself.";
 		close; }
 	mes "[Sunglasses Trader]";
-	if (countitem(730) < 1 || countitem(949) < 50 || Zeny < 100000) {
+	if (countitem(Crystal_Jewel) < 1 || countitem(Feather) < 50 || Zeny < 100000) {
 		mes "You're missing something. Come back when you've gathered all the materials.";
 		close; }
 	delitem 730,1;
@@ -87,7 +87,7 @@ moc_fild07,334,186,5	script	Maseph	4_F_GON,{
 		mes "As you wish.";
 		close; }
 	mes "[Maseph]";
-	if (countitem(2201) < 1) {
+	if (countitem(Sunglasses) < 1) {
 		mes "I need one pair of ^000088Sunglasses^000000. Come back to me when you have one.";
 		close; }
 	if (Zeny < 400000) {
diff --git a/npc/custom/quests/tha_statues.txt b/npc/custom/quests/tha_statues.txt
index 00a7c9a8f..83630355a 100644
--- a/npc/custom/quests/tha_statues.txt
+++ b/npc/custom/quests/tha_statues.txt
@@ -239,7 +239,7 @@ tha_t12,128,88,4	script	Sox	HIDDEN_NPC,{
 	mes "[Sox]";
 	mes "You have to give me Red Magic Stone, Yellow Magic Stone, Blue Magic Stone & Green Magic Stone.";
 	next;
-	if(countitem(7426) < 1 || countitem(7427) < 1 || countitem(7428) < 1 || countitem(7429) < 1) goto nostone;
+	if(countitem(Magic_Gem_Red) < 1 || countitem(Magic_Gem_Yellow) < 1 || countitem(Magic_Gem_Blue) < 1 || countitem(Magic_Gem_Green) < 1) goto nostone;
 	delitem 7426,1;
 	delitem 7427,1;
 	delitem 7428,1;
diff --git a/npc/custom/quests/thq/THQS_QuestNPC.txt b/npc/custom/quests/thq/THQS_QuestNPC.txt
index 9b655625c..eedbcfa5d 100644
--- a/npc/custom/quests/thq/THQS_QuestNPC.txt
+++ b/npc/custom/quests/thq/THQS_QuestNPC.txt
@@ -134,7 +134,7 @@ N_MasterBow:
 	mes "This is just a package delivery run, no big deal or anything.";
 	mes " ";
 	mes "Take this to an archer in the Archer Village outside of Payon.";
-	getitem 1072,1; //Delivery_Box
+	getitem Delivery_Message,1; //Delivery_Box
 	set one_qset,2;
 	goto L_QuestGiven;
 
@@ -173,7 +173,7 @@ N_JobList2:
 	mes " ";
 	mes "A strange man came in here yesterday and asked me to deliver this ^FF0000Strange Letter^000000 to some woman in Morroc. Knowing us we do not ask questions so you must take care of this delivery.";
 	mes "The Woman is in located in Morroc and her name is Erika.";
-	getitem 1072,1; //Delivery_Message
+	getitem Delivery_Message,1;
 	set two_qset, 1;
 	goto L_QuestGiven;
 
@@ -183,7 +183,7 @@ N_JurJeramiah:
 	mes "Standard delivery quest.";
 	mes " ";
 	mes "Jeramiah ordered a Special Jur from our weapon shop.Your Job is to deliver it to him in the Assasin Temple.";
-	getitem 1998,1; //Jeramiah's_Jur
+	getitem 1998,1;
 	set two_qset,2;
 	goto L_QuestGiven;
 
@@ -225,7 +225,7 @@ N_Delivery1:
 	mes "Standard drop off quest.";
 	mes " ";
 	mes "In this quest you need to deliver a mystery box to someone names ^FF0000Flank at the bridge between Aldebaran and Juno^000000.";
-	getitem 1082,1; //Delivery_Box_
+	getitem Merchant_Box_2,1; //Delivery_Box_
 	set three_qset,2;
 	goto L_QuestGiven;
 
@@ -271,7 +271,7 @@ N_MWizard:
 	mes "Proto-type of a Staff must be delivered to Zed the Wizard.";
 	mes " ";
 	mes "Zed the Wizard has requested to try out a new un-named proto-type staff. It will be your job to deliver this to him. Zed tend to stay within the general area of Juno.";
-	getitem 1999,1; //Zed's_Staff
+	getitem 1999,1;
 	set four_qset,2;
 	goto L_QuestGiven;
 
@@ -322,7 +322,7 @@ N_Thinkfirst:
 	mes "This sounds like another one of those ditzy girl quests...";
 	mes " ";
 	mes "Dazzy the local blond around Geffen has asked for you to deliver her these flowers. I don't know why someone would send flowers to herself...";
-	getitem 744,1; //Bouquet
+	getitem Bunch_Of_Flowers,1; //Bouquet
 	set five_qset,3;
 	goto L_QuestGiven;
 
@@ -346,7 +346,7 @@ N_JobList6:
 	mes "How ironic.";
 	mes " ";
 	mes "Deliver this Box to the Thiefs guild.";
-	getitem 1083,1; //Delivery_Box__
+	getitem Merchant_Box_3,1; //Delivery_Box__
 	set six_qset,1;
 	goto L_QuestGiven;
 
@@ -365,7 +365,7 @@ N_Delivery2:
 	mes "Well most of what we do is run packages, this is no different from other's.";
 	mes " ";
 	mes "Take this box, DO NOT OPEN IT! To a little girl in Lutie named Chirach she should be around santa.";
-	getitem 1083,1; //Delivery_Box__
+	getitem Merchant_Box_3,1; //Delivery_Box__
 	set six_qset,3;
 	goto L_QuestGiven;
 
@@ -398,7 +398,7 @@ N_Delivery3:
 	mes "So many packages so little time.";
 	mes " ";
 	mes "Take this box to a man in Alberta named Charles.";
-	getitem 1082,1; //Delivery_Box_
+	getitem Merchant_Box_2,1; //Delivery_Box_
 	set seven_qset,2;
 	goto L_QuestGiven;
 
@@ -440,7 +440,7 @@ N_Delivery4:
 	mes "Well yah box delivering is in high demand,lots of lazy people.";
 	mes " ";
 	mes "Take this package to a man in Morroc named Klye.";
-	getitem 1081,1; //Delivery_Box
+	getitem Merchant_Box_1,1; //Delivery_Box
 	set eight_qset,2;
 	goto L_QuestGiven;
 
@@ -473,7 +473,7 @@ N_JobList9:
 	mes "Oh god please get this out of here fast.";
 	mes " ";
 	mes "Oh man smells like someone died in here.Take this to the Magic School in Geffen and hurry,ahh the smell its burning my eye's!!!";
-	getitem 1082,1; //Delivery_Box_
+	getitem Merchant_Box_2,1; //Delivery_Box_
 	set nine_qset,1;
 	goto L_QuestGiven;
 
@@ -519,7 +519,7 @@ N_JobList10:
 	mes "Package to Morroc";
 	mes " ";
 	mes "There is nothing writen on this box but a notice to deliver it to a man Kreg.";
-	getitem 1082,1; //Delivery_Box_
+	getitem Merchant_Box_2,1; //Delivery_Box_
 	set ten_qset,1;
 	goto L_QuestGiven;
 
diff --git a/npc/custom/quests/thq/THQS_Quests.txt b/npc/custom/quests/thq/THQS_Quests.txt
index 40e89c18b..55037eb5c 100644
--- a/npc/custom/quests/thq/THQS_Quests.txt
+++ b/npc/custom/quests/thq/THQS_Quests.txt
@@ -44,7 +44,7 @@ pay_arche,86,129,6	script	Archer	4_M_JOB_HUNTER,{
 	close;
 N_QuestStart:
 	mes "[Kieth]";
-	if (countitem(1072) < 1) {
+	if (countitem(Delivery_Message) < 1) {
 		mes "Weren't you supposed to deliver me a box? Where is it?";
 		close;
 	}
@@ -59,7 +59,7 @@ N_QuestStart:
 }
 //1-3
 prt_fild06,37,192,6	script	Farmer	4_M_TELEPORTER,{
-	if (one_qset == 3 && countitem(909) > 19 && countitem(955) > 19 && countitem(914) > 19 && countitem(705) > 19) goto N_QuestComp;
+	if (one_qset == 3 && countitem(Jellopy) > 19 && countitem(Worm_Peelings) > 19 && countitem(Fluff) > 19 && countitem(Clover) > 19) goto N_QuestComp;
 	if (one_qset==3) goto N_QuestStart;
 	mes "[Billy-Bob]";
 	mes "Arrrg!... Those Bastard Bugs have eaten everything, this place donest even look like my farm anymore!!";
@@ -86,7 +86,7 @@ N_QuestStart:
 }
 //1-4
 prontera,264,353,6	script	Old Lady#thq	8_F_GRANDMOTHER,{
-	if (one_qset == 4 && countitem(934) > 14) goto N_QuestComp;
+	if (one_qset == 4 && countitem(Mementos) > 14) goto N_QuestComp;
 	if (one_qset == 4) goto N_QuestStart;
 	mes "[Old Lady]";
 	mes "This is my husbands grave... I'm just paying him a little visit.";
@@ -115,7 +115,7 @@ N_QuestStart:
 ///////Job list 2///////
 //2-1;
 morocc,59,109,6	script	Erika	8_F_GIRL,{
-	if (two_qset == 1 && countitem(1072) > 0) goto N_QuestComp;
+	if (two_qset == 1 && countitem(Delivery_Message) > 0) goto N_QuestComp;
 	if (two_qset == 1) goto N_QuestStart;
 	mes "[Erika]";
 	mes "Hello my name is Erika.";
@@ -173,7 +173,7 @@ N_QuestStart:
 }
 //2-3;
 prt_fild07,316,263,6	script	Marsh Man	4_M_02,{
-	if (two_qset == 3 && countitem(518) > 19) goto N_QuestComp;
+	if (two_qset == 3 && countitem(Honey) > 19) goto N_QuestComp;
 	if (two_qset == 3) goto N_QuestStart;
 	mes "[Lenith]";
 	mes "Hello, sorry I don't have much time to talk I'm waiting for someone.";
@@ -198,7 +198,7 @@ N_QuestStart:
 }
 //2-4;
 payon,161,72,6	script	Molly	4_F_06,{
-	if (two_qset == 4 && countitem(7005) > 0) goto N_QuestComp;
+	if (two_qset == 4 && countitem(Skull) > 0) goto N_QuestComp;
 	if (two_qset == 4) goto N_QuestStart;
 	mes "[Molly]";
 	mes "Sorry can't talk, I'm waiting for someone.";
@@ -228,7 +228,7 @@ N_QuestStart:
 ///////Job list 3///////
 //3-1;
 moc_fild04,208,322,6	script	Clark	1_M_YOUNGKNIGHT,{
-	if (three_qset == 1 && countitem(1040) > 29) goto N_QuestComp;
+	if (three_qset == 1 && countitem(Elder_Pixie's_Beard) > 29) goto N_QuestComp;
 	if (three_qset == 1) goto N_QuestStart;
 	mes "[Clark]";
 	mes "Love to chat, but I'm waiting for someone.";
@@ -257,7 +257,7 @@ N_QuestStart:
 }
 //3-2;
 yuno_fild01,186,162,6	script	Flank	1_F_MERCHANT_01,{
-	if (three_qset == 2 && countitem(1082) > 0) goto N_QuestComp;
+	if (three_qset == 2 && countitem(Merchant_Box_2) > 0) goto N_QuestComp;
 	if (three_qset == 2) goto N_QuestStart;
 	mes "[Flank]";
 	mes "Sorry I'm waiting for my package so I don't want to talk.";
@@ -282,7 +282,7 @@ N_QuestStart:
 }
 //3-3 Goes to 7-3 using callfunc
 prt_sewb1,120,245,6	script	Sewer Managment Knight	4_M_GEF_SOLDIER,{
-	if (three_qset == 3 && countitem(955) > 149) goto N_QuestComp;
+	if (three_qset == 3 && countitem(Worm_Peelings) > 149) goto N_QuestComp;
 	if (three_qset == 3) goto N_QuestStart;
 	if (seven_qset == 3) goto N_QuestStart2;
 	mes "[Sewer Managmant]";
@@ -310,7 +310,7 @@ N_QuestStart2:
 }
 //3-4
 mjolnir_02,87,357,6	script	Man#01	1_M_BARD,{
-	if (three_qset == 4 && countitem(1041) > 49) goto N_QuestComp;
+	if (three_qset == 4 && countitem(Lantern) > 49) goto N_QuestComp;
 	if (three_qset == 4) goto N_QuestStart;
 	mes "[Rudolfo]";
 	mes "Danger, the Coal Mine is now a hostile area.";
@@ -338,7 +338,7 @@ N_QuestStart:
 ///////Job list 4///////
 //4-1;
 pay_arche,45,138,6	script	Flora	4_F_07,{
-	if (four_qset == 1 && countitem(957) > 49) goto N_QuestComp;
+	if (four_qset == 1 && countitem(Decayed_Nail) > 49) goto N_QuestComp;
 	if (four_qset == 1) goto N_QuestStart;
 	mes "[Flora]";
 	mes "Well hello be carfull in the cave, we have heard reports of Undead monster funning around.";
@@ -397,7 +397,7 @@ N_QuestStart:
 }
 //4-3;
 prontera,176,204,6	script	Dassy	4_F_SISTER,{
-	if (four_qset == 3 && countitem(711) > 19) goto N_QuestComp;
+	if (four_qset == 3 && countitem(Shoot) > 19) goto N_QuestComp;
 	if (four_qset == 3) goto N_QuestStart;
 	mes "[Dassy]";
 	mes "Hello!";
@@ -423,7 +423,7 @@ N_QuestStart:
 }
 //4-4;
 prt_gld,157,99,6	script	Czhore	4_M_CRU_OLD,{
-	if (four_qset == 4 && countitem(714) > 0) goto N_QuestComp;
+	if (four_qset == 4 && countitem(Emperium) > 0) goto N_QuestComp;
 	if (four_qset == 4) goto N_QuestStart;
 	mes "[Czhore]";
 	mes "Hello friend";
@@ -456,7 +456,7 @@ N_QuestStart:
 ///////Job list 5///////
 //5-1;
 prt_maze01,18,184,6	script	Lithin#01	4_M_CRU_OLD,{
-	if (five_qset == 1 && countitem(1028) > 14) goto N_QuestComp;
+	if (five_qset == 1 && countitem(Wild_Boar's_Mane) > 14) goto N_QuestComp;
 	if (five_qset == 1) goto N_QuestStart;
 	mes "[Lithin]";
 	mes "Well hello.";
@@ -483,7 +483,7 @@ N_QuestStart:
 }
 //5-2 goes to 6-2 using callfunc;
 moc_ruins,75,167,6	script	Lithin#02	4_M_BARBER,{
-	if (five_qset == 2 && countitem(932) > 29) goto N_QuestComp;
+	if (five_qset == 2 && countitem(Skel_Bone) > 29) goto N_QuestComp;
 	if (five_qset == 2) goto N_QuestStart;
 	if (six_qset == 2) goto N_QuestStart2;
 	mes "[Strange Man]";
@@ -511,7 +511,7 @@ N_QuestStart2:
 }
 //5-3;
 geffen,57,130,6	script	Blonde Girl	4_F_07,{
-	if (five_qset == 3 && countitem(744) > 0) goto N_QuestComp;
+	if (five_qset == 3 && countitem(Bunch_Of_Flowers) > 0) goto N_QuestComp;
 	if (five_qset == 3) goto N_QuestStart;
 	mes "[Blonde Girl]";
 	mes "I wonder what happened to my flowers";
@@ -535,7 +535,7 @@ N_QuestStart:
 }
 //5-4;
 gef_tower,49,27,6	script	Wizard#01	4_M_JOB_WIZARD,{
-	if (five_qset == 4 && countitem(1059) > 49) goto N_QuestComp;
+	if (five_qset == 4 && countitem(Transparent_Cloth) > 49) goto N_QuestComp;
 	if (five_qset == 4) goto N_QuestStart;
 	mes "[Wizard]";
 	mes "Hello, have you seen my Whisper friend?";
@@ -563,7 +563,7 @@ N_QuestStart:
 ///////Job list 6///////
 //6-1;
 moc_prydb1,47,132,6	script	Thief	1_M_02,{
-	if (six_qset == 1 && countitem(1083) > 0) goto N_QuestComp;
+	if (six_qset == 1 && countitem(Merchant_Box_3) > 0) goto N_QuestComp;
 	if (six_qset == 1) goto N_QuestStart;
 	mes "[Thief]";
 	mes "Welcome to the Thiefs Guild.";
@@ -586,7 +586,7 @@ N_QuestStart:
 }
 //6-2
 function	script	six_qset2	{
-	if (six_qset == 2 && countitem(930) > 29) goto N_QuestComp2;
+	if (six_qset == 2 && countitem(Rotten_Bandage) > 29) goto N_QuestComp2;
 	mes "[Strange Man]";
 	mes "Another quest for you I have.";
 	mes "Futher into the pyramid you must go.";
@@ -609,7 +609,7 @@ N_QuestComp2:
 }
 //6-3;
 xmas,144,136,6	script	Chirach	1_M_02,{
-	if (six_qset == 3 && countitem(1083) > 0) goto N_QuestComp;
+	if (six_qset == 3 && countitem(Merchant_Box_3) > 0) goto N_QuestComp;
 	if (six_qset == 3) goto N_QuestStart;
 	mes "[Chirach]";
 	mes "Welcome.";
@@ -632,7 +632,7 @@ N_QuestStart:
 }
 //6-4;
 gef_tower,52,87,6	script	Wizard#02	4_M_JOB_WIZARD,{
-	if (six_qset == 4 && countitem(944) > 19) goto N_QuestComp;
+	if (six_qset == 4 && countitem(Horseshoe) > 19) goto N_QuestComp;
 	if (six_qset == 4) goto N_QuestStart;
 	mes "[Zuuzuu]";
 	mes "Hello, welcome to geffen tower.";
@@ -664,7 +664,7 @@ N_QuestStart:
 ///////Job list 7///////
 //7-1 goes to 8-1 using callfunc;
 prontera,123,208,6	script	Little Girl#thq	4_F_KID3,{
-	if (seven_qset == 1 && countitem(531) > 4) goto N_QuestComp;
+	if (seven_qset == 1 && countitem(Apple_Juice) > 4) goto N_QuestComp;
 	if (seven_qset == 1) goto N_QuestStart;
 	if (eight_qset == 1) goto N_QuestStart2;
 	mes "[Girl]";
@@ -691,7 +691,7 @@ N_QuestStart2:
 }
 //7-2;
 alberta,101,84,6	script	Charles	1_M_02,{
-	if (seven_qset == 2 && countitem(1082) > 0) goto N_QuestComp;
+	if (seven_qset == 2 && countitem(Merchant_Box_2) > 0) goto N_QuestComp;
 	if (seven_qset == 2) goto N_QuestStart;
 	mes "[Charles]";
 	mes "Hello "+strcharinfo(0)+" welcome to Alberta.";
@@ -714,7 +714,7 @@ N_QuestStart:
 }
 //7-3
 function	script	seven_qset-3	{
-	if (seven_qset == 3 && countitem(969) > 0) goto N_QuestComp2;
+	if (seven_qset == 3 && countitem(Gold) > 0) goto N_QuestComp2;
 	mes "[Sewer Managment]";
 	mes "Well there have been reports of a Golden Thief Bug running around the bottem on the Culvert";
 	mes " ";
@@ -734,7 +734,7 @@ N_QuestComp2:
 }
 //7-4;
 alb2trea,94,102,6	script	Scarlet	4_F_JOB_ASSASSIN,{
-	if (seven_qset == 4 && countitem(1127) > 0) goto N_QuestComp;
+	if (seven_qset == 4 && countitem(Saber_) > 0) goto N_QuestComp;
 	if (seven_qset == 4) goto N_QuestStart;
 	mes "[Scarlet]";
 	mes "Sorry, busy.";
@@ -760,7 +760,7 @@ N_QuestStart:
 ///////Job list 8///////
 //8-1
 function	script	eight_qset1	{
-	if (eight_qset == 1 && countitem(532) > 4) goto N_QuestComp2;
+	if (eight_qset == 1 && countitem(Banana_Juice) > 4) goto N_QuestComp2;
 	mes "[Girl]";
 	mes "Hi mister person. Can you get me some Banana juice?";
 	mes "I want 5 of them.";
@@ -779,7 +779,7 @@ N_QuestComp2:
 }
 //8-2;
 morocc,165,55,6	script	Klye	1_M_02,{
-	if (eight_qset == 2 && countitem(1081) > 0) goto N_QuestComp;
+	if (eight_qset == 2 && countitem(Merchant_Box_1) > 0) goto N_QuestComp;
 	if (eight_qset == 2) goto N_QuestStart;
 	mes "[Klye]";
 	mes "Hello "+strcharinfo(0)+".";
@@ -803,7 +803,7 @@ N_QuestStart:
 }
 //8-3;
 prt_maze02,103,86,6	script	Zack	4_M_CRU,{
-	if (eight_qset == 3 && countitem(923) > 0) goto N_QuestComp;
+	if (eight_qset == 3 && countitem(Evil_Horn) > 0) goto N_QuestComp;
 	if (eight_qset == 3) goto N_QuestStart;
 	mes "[Zack]";
 	mes "Hello, have you seen my Whisper friend?";
@@ -829,7 +829,7 @@ N_QuestStart:
 }
 //8-4;
 payon,136,129,6	script	Flower	4_F_KID2,{
-	if (eight_qset == 4 && countitem(746) > 9) goto N_QuestComp;
+	if (eight_qset == 4 && countitem(Glass_Bead) > 9) goto N_QuestComp;
 	if (eight_qset == 4) goto N_QuestStart;
 	mes "[Flower]";
 	mes "Sorry I'm waiting for someone. You will have to come back later.";
@@ -855,7 +855,7 @@ N_QuestStart:
 ///////Job list 9///////
 //9-1;
 geffen_in,168,124,6	script	Mage	1_M_02,{
-	if (nine_qset == 1 && countitem(1082) > 0) goto N_QuestComp;
+	if (nine_qset == 1 && countitem(Merchant_Box_2) > 0) goto N_QuestComp;
 	if (nine_qset == 1) goto N_QuestStart;
 	mes "[Mage]";
 	mes "Hello "+strcharinfo(0)+" welcome to the Mage Guild.";
@@ -878,7 +878,7 @@ N_QuestStart:
 }
 //9-2;
 pay_arche,98,74,6	script	School Girl	4_F_KID2,{
-	if (nine_qset == 2 && countitem(1020) > 19) goto N_QuestComp;
+	if (nine_qset == 2 && countitem(Long_Hair) > 19) goto N_QuestComp;
 	if (nine_qset == 2) goto N_QuestStart;
 	mes "[School Girl]";
 	mes "Sorry I'm waiting for someone, you will have to come back later";
@@ -906,7 +906,7 @@ N_QuestStart:
 }
 //9-3
 payon_in02,19,33,6	script	Jack	2_M_ALCHE,{
-	if (nine_qset == 3 && countitem(1022) > 0) goto N_QuestComp;
+	if (nine_qset == 3 && countitem(Fox_Tail) > 0) goto N_QuestComp;
 	if (nine_qset == 3) goto N_QuestStart;
 	if (nine_qset == 4) goto N_QuestStart2;
 	mes "[Jack]";
@@ -931,7 +931,7 @@ N_QuestStart:
 	close;
 N_QuestStart2:
 //9-4
-	if (nine_qset == 4 && countitem(901) > 39) goto N_QuestComp2;
+	if (nine_qset == 4 && countitem(Danggie) > 39) goto N_QuestComp2;
 	mes "[Jack]";
 	mes "Hello, we need you to investigate some crap in the 3rd level of payon.";
 	mes " ";
@@ -952,7 +952,7 @@ N_QuestComp2:
 ///////Job list 10///////
 //10-1
 morocc,193,51,6	script	Kreg	1_M_02,{
-	if (ten_qset == 1 && countitem(1082) > 0) goto N_QuestComp;
+	if (ten_qset == 1 && countitem(Merchant_Box_2) > 0) goto N_QuestComp;
 	if (ten_qset == 1) goto N_QuestStart;
 	mes "[Kreg]";
 	mes "Hello "+strcharinfo(0)+" welcome to Morroc.";
@@ -975,7 +975,7 @@ N_QuestStart:
 }
 //10-2;
 pay_fild10,145,252,6	script	Man#02	2_M_DYEINGER,{
-	if (ten_qset == 2 && countitem(1029) > 0) goto N_QuestComp;
+	if (ten_qset == 2 && countitem(Tiger's_Skin) > 0) goto N_QuestComp;
 	if (ten_qset == 2) goto N_QuestStart;
 	mes "[Man]";
 	mes "Sorry I'm waiting for someone, you will have to come back later";
@@ -1000,7 +1000,7 @@ N_QuestStart:
 }
 //10-3;
 cmd_fild08,328,349,4	script	Caral	2_M_SWORDMASTER,{
-	if (ten_qset == 3 && countitem(1015) > 0) goto N_QuestComp;
+	if (ten_qset == 3 && countitem(Thin_N'_Long_Tongue) > 0) goto N_QuestComp;
 	if (ten_qset == 3) goto N_QuestStart;
 	mes "[Caral]";
 	mes "Sorry I'm waiting for someone, you will have to come back later.";
@@ -1025,7 +1025,7 @@ N_QuestStart:
 }
 //10-4
 moc_fild15,250,251,6	script	Jeni	4_F_JOB_HUNTER,{
-	if (ten_qset == 4 && countitem(1096) > 0) goto N_QuestComp;
+	if (ten_qset == 4 && countitem(Round_Shell) > 0) goto N_QuestComp;
 	if (ten_qset == 4) goto N_QuestStart;
 	mes "[Jeni]";
 	mes "Sorry I'm waiting for someone, You will have to come back later";
diff --git a/npc/custom/quests/umbalian_language.txt b/npc/custom/quests/umbalian_language.txt
index 5bb17955e..d0ecb2d29 100644
--- a/npc/custom/quests/umbalian_language.txt
+++ b/npc/custom/quests/umbalian_language.txt
@@ -72,7 +72,7 @@ M_DONE:
 	next;
 	mes "[Mason]";
 	mes "Ah, I heard that her class was somewhere around there... thanks a lot! Here's a lil something for your help.";
-	getitem 7117,1;//Items: Torn Spell Book,
+	getitem Rent_Spell_Book,1;//Items: Torn Spell Book,
 	set umb_mason,1;
 	close;
 
@@ -106,7 +106,7 @@ amatsu,267,189,4	script	Marie	4_F_ALCHE,{
 	mes "[Marie]";
 	if(umb_lang==0) goto L_NOT_GOT_QUEST;
 	if(umb_lang==2 || umb_marie==1) goto L_AGAIN;
-	if(countitem(9001)>0 && countitem(643)>0) goto L_DONE;//Items: Poring Egg, Pet Incubator,
+	if(countitem(Poring_Egg)>0 && countitem(Pet_Incubator)>0) goto L_DONE;//Items: Poring Egg, Pet Incubator,
 	mes "Hello, is there something you need?";
 	next;
 	menu "No nothing at all.",M_NO,"Your teacher sent me.",-;
@@ -134,11 +134,11 @@ L_DONE:
 	menu "Yep!",-, "Sorry, no.",M_DOH;
 
 	mes "[Marie]";
-	if(countitem(9001)==0 && countitem(643)==0) goto M_DOH;//Items: Poring Egg, Pet Incubator,
+	if(countitem(Poring_Egg)==0 && countitem(Pet_Incubator)==0) goto M_DOH;//Items: Poring Egg, Pet Incubator,
 	mes "Yatta!  Here's a lil something in return.";
-	delitem 9001,1;//Items: Poring Egg,
-	delitem 643,1;//Items: Pet Incubator,
-	getitem 7118,1;//Items: Torn Scroll,
+	delitem Poring_Egg,1;//Items: Poring Egg,
+	delitem Pet_Incubator,1;//Items: Pet Incubator,
+	getitem Rent_Scroll,1;//Items: Torn Scroll,
 	set umb_marie,1; //got Torn Scroll
 	close;
 
@@ -159,10 +159,10 @@ yuno,157,366,2	script	Wise Man Fabius	2_M_SAGE_OLD,{
 	mes "You speak Umbalian fluently! So you will never forget the language of Umbalians!";
 	close;
 L_Quest:
-	if((countitem(1006) < 1) || (countitem(7118) < 1) || (countitem(7117) < 1)) goto L_DONE;//Items: Old Magic Book, Torn Scroll, Torn Spell Book,
-	delitem 1006,1;	//Items: Old Magic Book,
-	delitem 7118,1;	//Items: Torn Scroll,
-	delitem 7117,1;//Items: Torn Spell Book,
+	if((countitem(Old_Magic_Book) < 1) || (countitem(Rent_Scroll) < 1) || (countitem(Rent_Spell_Book) < 1)) goto L_DONE;//Items: Old Magic Book, Torn Scroll, Torn Spell Book,
+	delitem Old_Magic_Book,1;	//Items: Old Magic Book,
+	delitem Rent_Scroll,1;	//Items: Torn Scroll,
+	delitem Rent_Spell_Book,1;//Items: Torn Spell Book,
 	emotion e_thx;
 	mes "Ah, you've done well in retrieving my references. These artifacts holds information about ruins around the world, from the burning hell of the Magma Dungeon, to the strange eerie Hidden Forest of Yggsadril.";
 	next;