ItemID to Constant: pre-re Folder

22 files changed, 243 insertions, 243 deletions

diff --git a/npc/pre-re/jobs/1-1/archer.txt b/npc/pre-re/jobs/1-1/archer.txt
index 075bb391a..946638d64 100644
--- a/npc/pre-re/jobs/1-1/archer.txt
+++ b/npc/pre-re/jobs/1-1/archer.txt
@@ -145,10 +145,10 @@ payon_in02,64,71,4	script	Archer Guildsman#archer	4_M_03,{
 			close;
 		}
 		if (job_archer_q == 1) {
-			.@archer_item1 = countitem(1066) * 5;
-			.@archer_item2 = countitem(1067) * 3;
-			.@archer_item3 = countitem(1068) * 2;
-			.@archer_item4 = countitem(1019);
+			.@archer_item1 = countitem(Tree_Of_Archer_1) * 5;
+			.@archer_item2 = countitem(Tree_Of_Archer_2) * 3;
+			.@archer_item3 = countitem(Tree_Of_Archer_3) * 2;
+			.@archer_item4 = countitem(Wooden_Block);
 			.@total_archer = .@archer_item1 + .@archer_item2 + .@archer_item3 + .@archer_item4;
 			.@total_archer2 = (((.@archer_item2 + .@archer_item3) * 2) + .@archer_item4);
 			mes "[Archer Guildsman]";
@@ -159,17 +159,17 @@ payon_in02,64,71,4	script	Archer Guildsman#archer	4_M_03,{
 			mes "[Archer Guildsman]";
 			mes "I will appraise the value of the various types of Trunks, needed to produce a Bow, that you've brought.";
 			next;
-			if (countitem(1066) == 0 && countitem(1067) == 0 && countitem(1068) == 0 && countitem(1019) == 0) {
+			if (countitem(Tree_Of_Archer_1) == 0 && countitem(Tree_Of_Archer_2) == 0 && countitem(Tree_Of_Archer_3) == 0 && countitem(Wooden_Block) == 0) {
 				mes "[Archer Guildsman]";
 				mes "Um...";
 				mes "Unfortunately you didn't bring any of the required items. There's nothing for me to appraise.";
 				close;
 			}
 			mes "[Archer Guildsman]";
-			if (countitem(1066) != 0) mes " Grade S : " + countitem(1066) + " ea, Grade: " + .@archer_item1 + " . ";
-			if (countitem(1067) != 0) mes " Grade A : " + countitem(1067) + " ea, Grade : " + .@archer_item2 + " . ";
-			if (countitem(1068) != 0) mes " Grade B : " + countitem(1068) + " ea, Grade : " + .@archer_item3 + " . ";
-			if (countitem(1019) != 0) mes " Grade C : " + countitem(1019) + " ea, Grade : " + .@archer_item4 + " . ";
+			if (countitem(Tree_Of_Archer_1) != 0) mes " Grade S : " + countitem(Tree_Of_Archer_1) + " ea, Grade: " + .@archer_item1 + " . ";
+			if (countitem(Tree_Of_Archer_2) != 0) mes " Grade A : " + countitem(Tree_Of_Archer_2) + " ea, Grade : " + .@archer_item2 + " . ";
+			if (countitem(Tree_Of_Archer_3) != 0) mes " Grade B : " + countitem(Tree_Of_Archer_3) + " ea, Grade : " + .@archer_item3 + " . ";
+			if (countitem(Wooden_Block) != 0) mes " Grade C : " + countitem(Wooden_Block) + " ea, Grade : " + .@archer_item4 + " . ";
 			if (.@total_archer < 25) {
 				mes "Total Grades: ^FF0000" + .@total_archer + "^000000 / 40";
 				next;
@@ -196,10 +196,10 @@ payon_in02,64,71,4	script	Archer Guildsman#archer	4_M_03,{
 			next;
 			mes "[Archer Guildsman]";
 			mes "I'll transfer these Trunks to our Bow Production Department. Now that you've met the requirements, let me promote you right away!";
-			if (countitem(1066) != 0) delitem 1066,countitem(1066); //Tree_Of_Archer_1
-			if (countitem(1067) != 0) delitem 1067,countitem(1067); //Tree_Of_Archer_2
-			if (countitem(1068) != 0) delitem 1068,countitem(1068); //Tree_Of_Archer_3
-			if (countitem(1019) != 0) delitem 1019,countitem(1019); //Wooden_Block
+			if (countitem(Tree_Of_Archer_1) != 0) delitem Tree_Of_Archer_1,countitem(Tree_Of_Archer_1);
+			if (countitem(Tree_Of_Archer_2) != 0) delitem Tree_Of_Archer_2,countitem(Tree_Of_Archer_2);
+			if (countitem(Tree_Of_Archer_3) != 0) delitem Tree_Of_Archer_3,countitem(Tree_Of_Archer_3);
+			if (countitem(Wooden_Block) != 0) delitem Wooden_Block,countitem(Wooden_Block);
 		}
 		next;
 		callfunc "Job_Change",Job_Archer;
@@ -214,8 +214,8 @@ payon_in02,64,71,4	script	Archer Guildsman#archer	4_M_03,{
 		next;
 		mes "[Archer Guildsman]";
 		mes "Ah, your bow has arrived from the Bow Production Department. Here, take it! It's yours~";
-		getitem 1702,1; //Bow_
-		getitem 1750,.@total_archer2; //Arrow
+		getitem Bow_,1;
+		getitem Arrow,.@total_archer2;
 		next;
 		mes "[Archer Guildsman]";
 		mes "Now, off you go. Hunt with pride, knowing you were trained by one of the best!";
diff --git a/npc/pre-re/jobs/1-1/mage.txt b/npc/pre-re/jobs/1-1/mage.txt
index 0108f6a04..4836258c4 100644
--- a/npc/pre-re/jobs/1-1/mage.txt
+++ b/npc/pre-re/jobs/1-1/mage.txt
@@ -139,7 +139,7 @@ geffen_in,164,124,4	script	Mage Guildsman	2_F_MAGICMASTER,{
 					job_magician_q = 4;
 				}
 				next;
-				getitem 1092,1; //Empty_Cylinder
+				getitem Empty_Cylinder,1;
 				mes "[Mage Guildsman]";
 				mes "You can find the neccessary ingredients inside the Guide Book in this Guild. So you better look up what you need before you go.";
 				next;
@@ -175,13 +175,13 @@ geffen_in,164,124,4	script	Mage Guildsman	2_F_MAGICMASTER,{
 		mes "solution accurately...";
 		next;
 		mes "[Mage Guildsman]";
-		if (countitem(1071) == 0 && countitem(1085) == 0 && countitem(1086) == 0 && countitem(1087) == 0 && countitem(1090) == 0) {
+		if (countitem(Mage_Test_1) == 0 && countitem(Mage_Test_2) == 0 && countitem(Mage_Test_3) == 0 && countitem(Mage_Test_4) == 0 && countitem(Mage_Test_Etc) == 0) {
 			mes "Hey, where's the Solution";
 			mes "I asked for...? I can't check it if you don't show it to me, right?";
 			close;
 		}
 		else {
-			if ((job_magician_q == 1 && countitem(1071) == 0) || (job_magician_q == 2 && countitem(1085) == 0) || (job_magician_q == 3 && countitem(1086) == 0) || (job_magician_q == 4 && countitem(1087) == 0)) {
+			if ((job_magician_q == 1 && countitem(Mage_Test_1) == 0) || (job_magician_q == 2 && countitem(Mage_Test_2) == 0) || (job_magician_q == 3 && countitem(Mage_Test_3) == 0) || (job_magician_q == 4 && countitem(Mage_Test_4) == 0)) {
 				mes "Wait.";
 				mes "This isn't the";
 				mes "Solution I asked for!";
@@ -196,19 +196,19 @@ geffen_in,164,124,4	script	Mage Guildsman	2_F_MAGICMASTER,{
 				else
 					mes "You're supposed to make Mixed Solution No. 4 and bring it back to me. Now go and try it again.";
 
-				if (countitem(1071) != 0) delitem 1071,1; //Mage_Test_1
-				else if (countitem(1085) != 0) delitem 1085,1; //Mage_Test_2
-				else if (countitem(1086) != 0) delitem 1086,1; //Mage_Test_3
-				else if (countitem(1087) != 0) delitem 1087,1; //Mage_Test_4
-				else delitem 1090,1; //Mage_Test_Etc
+				if (countitem(Mage_Test_1) != 0) delitem Mage_Test_1,1;
+				else if (countitem(Mage_Test_2) != 0) delitem Mage_Test_2,1;
+				else if (countitem(Mage_Test_3) != 0) delitem Mage_Test_3,1;
+				else if (countitem(Mage_Test_4) != 0) delitem Mage_Test_4,1;
+				else delitem Mage_Test_Etc,1;
 				close;
 			}
 		}
-		if (countitem(1071) != 0) delitem 1071,1; //Mage_Test_1
-		else if (countitem(1085) != 0) delitem 1085,1; //Mage_Test_2
-		else if (countitem(1086) != 0) delitem 1086,1; //Mage_Test_3
-		else if (countitem(1087) != 0) delitem 1087,1; //Mage_Test_4
-		else delitem 1090,1; //Mage_Test_Etc
+		if (countitem(Mage_Test_1) != 0) delitem Mage_Test_1,1;
+		else if (countitem(Mage_Test_2) != 0) delitem Mage_Test_2,1;
+		else if (countitem(Mage_Test_3) != 0) delitem Mage_Test_3,1;
+		else if (countitem(Mage_Test_4) != 0) delitem Mage_Test_4,1;
+		else delitem Mage_Test_Etc,1;
 		mes "Hmm. I can see that you tried really hard. For a beginner's attempt, this is really good.";
 		mes "Great work!";
 		next;
@@ -312,7 +312,7 @@ geffen_in,164,112,4	script	Mixing Machine	HIDDEN_NPC,{
 		next;
 		switch(select("Payon Solution.:Morroc Solution.:No Solvent.")) {
 		case 1:
-			if (countitem(1089) == 0) {
+			if (countitem(Payon_Potion) == 0) {
 				mes "[Mixing Machine]";
 				mes "Error.";
 				mes "Cannot find the item.";
@@ -323,7 +323,7 @@ geffen_in,164,112,4	script	Mixing Machine	HIDDEN_NPC,{
 			.@mixitem2 = 1;
 			break;
 		case 2:
-			if (countitem(1088) == 0) {
+			if (countitem(Morocc_Potion) == 0) {
 				mes "[Mixing Machine]";
 				mes "Error.";
 				mes "Cannot find the item.";
@@ -366,37 +366,37 @@ geffen_in,164,112,4	script	Mixing Machine	HIDDEN_NPC,{
 						mes "Place items into the Mixing Receptacle now. Please wait.";
 						next;
 						mes "[Mixing Machine]";
-						if (countitem(909) < .@mixitem1_1) {
+						if (countitem(Jellopy) < .@mixitem1_1) {
 							mes "Insufficient Jellopy.";
 							mes "Please Check again.";
 							mes "Process Halted.";
 							close;
 						}
-						else if (countitem(914) < .@mixitem1_2) {
+						else if (countitem(Fluff) < .@mixitem1_2) {
 							mes "Insufficient Fluff.";
 							mes "Please Check again.";
 							mes "Process Halted.";
 							close;
 						}
-						else if (countitem(519) < .@mixitem1_3) {
+						else if (countitem(Milk) < .@mixitem1_3) {
 							mes "Insufficient Milk.";
 							mes "Please Check again.";
 							mes "Process Halted.";
 							close;
 						}
 						else if (.@mixitem2 == 1 || .@mixitem2 == 2) {
-							if (countitem(1089) == 0 && countitem(1088) == 0) {
+							if (countitem(Payon_Potion) == 0 && countitem(Morocc_Potion) == 0) {
 								mes "Solution not found.";
 								mes "Please Check again.";
 								mes "Process Halted.";
 								close;
 							}
 						}
-						if (.@mixitem1_1 != 0) delitem 909,.@mixitem1_1; //Jellopy
-						if (.@mixitem1_2 != 0) delitem 914,.@mixitem1_2; //Fluff
-						if (.@mixitem1_3 != 0) delitem 519,.@mixitem1_3; //Milk
-						if (.@mixitem2 == 1) delitem 1089,1; //Payon_Potion
-						if (.@mixitem2 == 2) delitem 1088,1; //Morocc_Potion
+						if (.@mixitem1_1 != 0) delitem Jellopy,.@mixitem1_1;
+						if (.@mixitem1_2 != 0) delitem Fluff,.@mixitem1_2;
+						if (.@mixitem1_3 != 0) delitem Milk,.@mixitem1_3;
+						if (.@mixitem2 == 1) delitem Payon_Potion,1;
+						if (.@mixitem2 == 2) delitem Morocc_Potion,1;
 						mes "Items are Ready.";
 						mes "Close the Lid.";
 						.@progress = 3;
@@ -445,7 +445,7 @@ geffen_in,164,112,4	script	Mixing Machine	HIDDEN_NPC,{
 							next;
 						}
 						else {
-							if (countitem(909) > 0) .@mixitem1_1 += .@input;
+							if (countitem(Jellopy) > 0) .@mixitem1_1 += .@input;
 							.@progress = 2;
 							break;
 						}
@@ -461,7 +461,7 @@ geffen_in,164,112,4	script	Mixing Machine	HIDDEN_NPC,{
 							next;
 						}
 						else {
-							if (countitem(914) > 0) .@mixitem1_2 += .@input;
+							if (countitem(Fluff) > 0) .@mixitem1_2 += .@input;
 							.@progress = 2;
 							break;
 						}
@@ -477,7 +477,7 @@ geffen_in,164,112,4	script	Mixing Machine	HIDDEN_NPC,{
 							next;
 						}
 						else {
-						if (countitem(519) > 0) .@mixitem1_3 += .@input;
+						if (countitem(Milk) > 0) .@mixitem1_3 += .@input;
 							.@progress = 2;
 							break;
 						}
@@ -574,32 +574,32 @@ geffen_in,164,112,4	script	Mixing Machine	HIDDEN_NPC,{
 		if (.@mixitem1_1 == 2 && .@mixitem1_2 == 3 && .@mixitem1_3 == 1 && .@mixitem2 == 1 && .@mixitem3 == 1 && .@magic_powder == 1) {
 			mes "[Mixing Machine]";
 			mes "Mage Test Solution No. 1.";
-			getitem 1071,1; //Mage_Test_1
+			getitem Mage_Test_1,1;
 			next;
 		}
 		else if (.@mixitem1_1 == 3 && .@mixitem1_2 == 1 && .@mixitem1_3 == 1 && .@mixitem2 == 0 && .@mixitem3 == 2 && .@magic_powder == 2) {
 			mes "[Mixing Machine]";
 			mes "Mage Test Solution No. 2.";
-			getitem 1085,1; //Mage_Test_2
+			getitem Mage_Test_2,1;
 			next;
 		}
 		else if (.@mixitem1_1 == 6 && .@mixitem1_2 == 1 && .@mixitem1_3 == 0 && .@mixitem2 == 1 && .@mixitem3 == 3 && .@magic_powder == 3) {
 			mes "[Mixing Machine]";
 			mes "Mage Test Solution No. 3.";
-			getitem 1086,1; //Mage_Test_3
+			getitem Mage_Test_3,1;
 			next;
 		}
 		else if (.@mixitem1_1 == 2 && .@mixitem1_2 == 3 && .@mixitem1_3 == 0 && .@mixitem2 == 2 && .@mixitem3 == 4 && .@magic_powder == 4) {
 			mes "[Mixing Machine]";
 			mes "Mage Test Solution No. 4.";
-			getitem 1087,1; //Mage_Test_4
+			getitem Mage_Test_4,1;
 			next;
 		}
 		else {
 			mes "[Mixing Machine]";
 			mes "Unexpected";
 			mes "Error Occurred.";
-			getitem 1090,1; //Mage_Test_Etc
+			getitem Mage_Test_Etc,1;
 			next;
 		}
 		mes "[Mixing Machine]";
diff --git a/npc/pre-re/jobs/1-1/merchant.txt b/npc/pre-re/jobs/1-1/merchant.txt
index eb20de033..8ba33489d 100644
--- a/npc/pre-re/jobs/1-1/merchant.txt
+++ b/npc/pre-re/jobs/1-1/merchant.txt
@@ -434,7 +434,7 @@ alberta_in,53,43,6	script	Merchant#mer	4_M_04,{
 				next;
 				mes "[Chief Mahnsoo]";
 				mes "Would you please give her this message when you deliver the package? Please~";
-				getitem 1072,1; //Delivery_Message
+				getitem Delivery_Message,1;
 				break;
 			}
 			next;
@@ -555,22 +555,22 @@ alberta_in,28,29,2	script	Merchant Guildsman#mer	4_M_01,{
 		else if (job_merchant_q2 == 7 || job_merchant_q2 == 8)
 			mes "Oh hohohoho~! The Kafra Babe on Byalan Island?! Awesome! Anyway, did you bring the receipt?";
 
-		if (job_merchant_q2 == 1 && countitem(1073) != 0)
-			delitem 1073,1; //Merchant_Voucher_1
-		else if (job_merchant_q2 == 2 && countitem(1074) != 0)
-			delitem 1074,1; //Merchant_Voucher_2
-		else if (job_merchant_q2 == 3 && countitem(1075) != 0)
-			delitem 1075,1; //Merchant_Voucher_3
-		else if (job_merchant_q2 == 4 && countitem(1076) != 0)
-			delitem 1076,1; //Merchant_Voucher_4
-		else if (job_merchant_q2 == 5 && countitem(1077) != 0)
-			delitem 1077,1; //Merchant_Voucher_5
-		else if (job_merchant_q2 == 6 && countitem(1078) != 0)
-			delitem 1078,1; //Merchant_Voucher_6
-		else if (job_merchant_q2 == 7 && countitem(1079) != 0)
-			delitem 1079,1; //Merchant_Voucher_7
-		else if (job_merchant_q2 == 8 && countitem(1080) != 0)
-			delitem 1080,1; //Merchant_Voucher_8
+		if (job_merchant_q2 == 1 && countitem(Merchant_Voucher_1) != 0)
+			delitem Merchant_Voucher_1,1;
+		else if (job_merchant_q2 == 2 && countitem(Merchant_Voucher_2) != 0)
+			delitem Merchant_Voucher_2,1;
+		else if (job_merchant_q2 == 3 && countitem(Merchant_Voucher_3) != 0)
+			delitem Merchant_Voucher_3,1;
+		else if (job_merchant_q2 == 4 && countitem(Merchant_Voucher_4) != 0)
+			delitem Merchant_Voucher_4,1;
+		else if (job_merchant_q2 == 5 && countitem(Merchant_Voucher_5) != 0)
+			delitem Merchant_Voucher_5,1;
+		else if (job_merchant_q2 == 6 && countitem(Merchant_Voucher_6) != 0)
+			delitem Merchant_Voucher_6,1;
+		else if (job_merchant_q2 == 7 && countitem(Merchant_Voucher_7) != 0)
+			delitem Merchant_Voucher_7,1;
+		else if (job_merchant_q2 == 8 && countitem(Merchant_Voucher_8) != 0)
+			delitem Merchant_Voucher_8,1;
 		else {
 			next;
 			job_merchant_q = 9;
@@ -593,7 +593,7 @@ alberta_in,28,29,2	script	Merchant Guildsman#mer	4_M_01,{
 			job_merchant_q = 7;
 		end;
 	}
-	else if (job_merchant_q == 4 || job_merchant_q == 3 && countitem(1081) == 0 && countitem(1082) == 0 && countitem(1091) == 0) {
+	else if (job_merchant_q == 4 || job_merchant_q == 3 && countitem(Merchant_Box_1) == 0 && countitem(Merchant_Box_2) == 0 && countitem(Merchant_Box_Etc) == 0) {
 		mes " [Union Staff Kay] ";
 		mes "Huh?";
 		mes "You're back?";
@@ -614,12 +614,12 @@ alberta_in,28,29,2	script	Merchant Guildsman#mer	4_M_01,{
 		mes "Okay...";
 		close;
 	}
-	else if (job_merchant_q == 4 || job_merchant_q == 3 && countitem(1081) != 0 || countitem(1082) != 0 || countitem(1091) != 0) {
+	else if (job_merchant_q == 4 || job_merchant_q == 3 && countitem(Merchant_Box_1) != 0 || countitem(Merchant_Box_2) != 0 || countitem(Merchant_Box_Etc) != 0) {
 		mes "[Union Staff Kay]";
 		mes "Hey, what are you still doing here? Shouldn't you be on your way already?";
 		next;
 		if (select("I need a new package.:Oh, yeah. You're right!") == 1) {
-			if (countitem(1081) == 0 && countitem(1082) == 0 && countitem(1083) == 0 && countitem(1091) == 0) {
+			if (countitem(Merchant_Box_1) == 0 && countitem(Merchant_Box_2) == 0 && countitem(Merchant_Box_3) == 0 && countitem(Merchant_Box_Etc) == 0) {
 				mes "[Union Staff Kay]";
 				mes "Wha--?";
 				mes "So where did";
@@ -647,12 +647,12 @@ alberta_in,28,29,2	script	Merchant Guildsman#mer	4_M_01,{
 			}
 			mes "[Union Staff Kay]";
 			mes "*Sigh* Man, you're starting to become a pain in the ass. Hold on, lemme cancel your record...";
-			if (countitem(1081) != 0)
-				delitem 1081,1; //Merchant_Box_1
-			else if (countitem(1082) != 0)
-				delitem 1082,1; //Merchant_Box_2
-			else if (countitem(1091) != 0)
-				delitem 1091,1; //Merchant_Box_Etc
+			if (countitem(Merchant_Box_1) != 0)
+				delitem Merchant_Box_1,1;
+			else if (countitem(Merchant_Box_2) != 0)
+				delitem Merchant_Box_2,1;
+			else if (countitem(Merchant_Box_Etc) != 0)
+				delitem Merchant_Box_Etc,1;
 			if (job_merchant_q == 4)
 				job_merchant_q = 2;
 			else if (job_merchant_q == 3)
@@ -739,35 +739,35 @@ alberta_in,28,29,2	script	Merchant Guildsman#mer	4_M_01,{
 			}
 			if (.@where_village == 1) {
 				if (job_merchant_q2 == 1 && .@input == 2485741)
-					getitem 1081,1; //Merchant_Box_1
+					getitem Merchant_Box_1,1;
 				else if (job_merchant_q2 == 2 && .@input == 2328137)
-					getitem 1082,1; //Merchant_Box_2
+					getitem Merchant_Box_2,1;
 				else
-					getitem 1091,1; //Merchant_Box_Etc
+					getitem Merchant_Box_Etc,1;
 			}
 			else if (.@where_village == 2) {
 				if (job_merchant_q2 == 3 && .@input == 2989396)
-					getitem 1081,1; //Merchant_Box_1
+					getitem Merchant_Box_1,1;
 				else if (job_merchant_q2 == 4 && .@input == 2191737)
-					getitem 1082,1; //Merchant_Box_2
+					getitem Merchant_Box_2,1;
 				else
-					getitem 1091,1; //Merchant_Box_Etc
+					getitem Merchant_Box_Etc,1;
 			}
 			else if (.@where_village == 3) {
 				if (job_merchant_q2 == 5 && .@input == 3012685)
-					getitem 1081,1; //Merchant_Box_1
+					getitem Merchant_Box_1,1;
 				else if (job_merchant_q2 == 6 && .@input == 3487372)
-					getitem 1082,1; //Merchant_Box_2
+					getitem Merchant_Box_2,1;
 				else
-					getitem 1091,1; //Merchant_Box_Etc
+					getitem Merchant_Box_Etc,1;
 			}
 			else {
 				if (job_merchant_q2 == 7 && .@input == 3318702)
-					getitem 1081,1; //Merchant_Box_1
+					getitem Merchant_Box_1,1;
 				else if (job_merchant_q2 == 8 && .@input == 3543625)
-					getitem 1082,1; //Merchant_Box_2
+					getitem Merchant_Box_2,1;
 				else
-					getitem 1091,1; //Merchant_Box_Etc
+					getitem Merchant_Box_Etc,1;
 			}
 			if (job_merchant_q == 2)
 				job_merchant_q = 4;
@@ -804,7 +804,7 @@ morocc_in,140,102,4	script	Student#mer	4_M_04,{
 		mes "the right place.";
 		next;
 		mes "[Dyer's Student]";
-		if (countitem(1081) == 1 || countitem(1082) == 1 || countitem(1091) == 1) {
+		if (countitem(Merchant_Box_1) == 1 || countitem(Merchant_Box_2) == 1 || countitem(Merchant_Box_Etc) == 1) {
 			mes "Okay~";
 			mes "Please set the";
 			mes "package down";
@@ -822,21 +822,21 @@ morocc_in,140,102,4	script	Student#mer	4_M_04,{
 		mes "Let me check the Serial Number of the package so I can give you the receipt, okay?";
 		next;
 		mes "[Dyer's Student]";
-		if (job_merchant_q2 == 5 && countitem(1081) != 0) {
+		if (job_merchant_q2 == 5 && countitem(Merchant_Box_1) != 0) {
 			mes "3012685...";
 			mes "That's right.";
 			mes "Here's your";
 			mes "receipt.";
-			delitem 1081,1; //Merchant_Box_1
-			getitem 1077,1; //Merchant_Voucher_5
+			delitem Merchant_Box_1,1;
+			getitem Merchant_Voucher_5,1;
 		}
-		else if (job_merchant_q2 == 6 && countitem(1082) != 0) {
+		else if (job_merchant_q2 == 6 && countitem(Merchant_Box_2) != 0) {
 			mes "3487372...";
 			mes "That's right.";
 			mes "Here's your";
 			mes "receipt.";
-			delitem 1082,1; //Merchant_Box_2
-			getitem 1078,1; //Merchant_Voucher_6
+			delitem Merchant_Box_2,1;
+			getitem Merchant_Voucher_6,1;
 		}
 		else {
 			mes "Excuse me, but...";
@@ -886,7 +886,7 @@ geffen_in,155,122,4	script	Guild Staff#mer	1_M_01,{
 		mes "Ah, you must be with the Merchant Guild. Finally, my package has arrived! Alright...!";
 		next;
 		mes "[Guild Staff]";
-		if (countitem(1081) == 1 || countitem(1082) == 1 || countitem(1091) == 1) {
+		if (countitem(Merchant_Box_1) == 1 || countitem(Merchant_Box_2) == 1 || countitem(Merchant_Box_Etc) == 1) {
 			mes "You must be very tired";
 			mes "from having to travel";
 			mes "in this kind";
@@ -902,15 +902,15 @@ geffen_in,155,122,4	script	Guild Staff#mer	1_M_01,{
 		mes "[Guild Staff]";
 		mes "Alright, let me";
 		mes "check the Serial Number...";
-		if (job_merchant_q2 == 3 && countitem(1081) != 0) {
+		if (job_merchant_q2 == 3 && countitem(Merchant_Box_1) != 0) {
 			mes "2989396. Yes, this is what we ordered. Here is your receipt.";
-			delitem 1081,1; //Merchant_Box_1
-			getitem 1075,1; //Merchant_Voucher_3
+			delitem Merchant_Box_1,1;
+			getitem Merchant_Voucher_3,1;
 		}
-		else if (job_merchant_q2 == 4 && countitem(1082) != 0) {
+		else if (job_merchant_q2 == 4 && countitem(Merchant_Box_2) != 0) {
 			mes "2191737. Yes, this is what we ordered. Here is your receipt.";
-			delitem 1082,1; //Merchant_Box_2
-			getitem 1076,1; //Merchant_Voucher_4
+			delitem Merchant_Box_2,1;
+			getitem Merchant_Voucher_4,1;
 		}
 		else {
 			mes "Uh oh, this is the wrong number. This isn't what we ordered...";
@@ -978,7 +978,7 @@ prontera,248,42,0	script	Kafra Employee#mer	4_F_KAFRA2,{
 		mes "the Merchant Guild?";
 		mes "Oh, yes, please set";
 		mes "it down right over there...";
-		if (countitem(1081) == 1 || countitem(1082) == 1 || countitem(1091) == 1) {
+		if (countitem(Merchant_Box_1) == 1 || countitem(Merchant_Box_2) == 1 || countitem(Merchant_Box_Etc) == 1) {
 			mes "You must be really tired";
 			mes "after carrying it for so long!";
 		}
@@ -993,21 +993,21 @@ prontera,248,42,0	script	Kafra Employee#mer	4_F_KAFRA2,{
 		mes "[Kafra Employee]";
 		mes "Now, let me check";
 		mes "the serial number...";
-		if (job_merchant_q2 == 1 && countitem(1081) != 0) {
+		if (job_merchant_q2 == 1 && countitem(Merchant_Box_1) != 0) {
 			mes "2485741. Right, this is";
 			mes "the one we ordered. Oh,";
 			mes "and don't forget this receipt!";
 			next;
-			delitem 1081,1; //Merchant_Box_1
-			getitem 1073,1; //Merchant_Voucher_1
+			delitem Merchant_Box_1,1;
+			getitem Merchant_Voucher_1,1;
 		}
-		else if (job_merchant_q2 == 2 && countitem(1082) != 0) {
+		else if (job_merchant_q2 == 2 && countitem(Merchant_Box_2) != 0) {
 			mes "2328137. Right, this is";
 			mes "the one we ordered. Oh,";
 			mes "and don't forget this receipt!";
 			next;
-			delitem 1082,1; //Merchant_Box_2
-			getitem 1074,1; //Merchant_Voucher_2
+			delitem Merchant_Box_2,1;
+			getitem Merchant_Voucher_2,1;
 		}
 		else {
 			mes "Mmmm? Hold on. This is";
@@ -1097,7 +1097,7 @@ function	script	F_MercKafra	{
 		mes "the Merchant Guild?";
 		mes "Oh, yes, please set";
 		mes "it down right over there...";
-		if (countitem(1081) == 1 || countitem(1082) == 1 || countitem(1091) == 1) {
+		if (countitem(Merchant_Box_1) == 1 || countitem(Merchant_Box_2) == 1 || countitem(Merchant_Box_Etc) == 1) {
 			mes "You must be really tired";
 			mes "after carrying it for so long!";
 		}
@@ -1112,19 +1112,19 @@ function	script	F_MercKafra	{
 		mes "[Kafra Employee]";
 		mes "Now, let me check";
 		mes "the serial number...";
-		if (job_merchant_q2 == 7 && countitem(1081) != 0) {
+		if (job_merchant_q2 == 7 && countitem(Merchant_Box_1) != 0) {
 			mes "3318702. Right, this is";
 			mes "the one we ordered. Oh,";
 			mes "and don't forget this receipt!";
-			delitem 1081,1; //Merchant_Box_1
-			getitem 1079,1; //Merchant_Voucher_7
+			delitem Merchant_Box_1,1;
+			getitem Merchant_Voucher_7,1;
 		}
-		else if (job_merchant_q2 == 8 && countitem(1082) != 0) {
+		else if (job_merchant_q2 == 8 && countitem(Merchant_Box_2) != 0) {
 			mes "3543625. Right, this is";
 			mes "the one we ordered. Oh,";
 			mes "and don't forget this receipt!";
-			delitem 1082,1; //Merchant_Box_2
-			getitem 1080,1; //Merchant_Voucher_8
+			delitem Merchant_Box_2,1;
+			getitem Merchant_Voucher_8,1;
 		}
 		else {
 			mes "Mmmm? Hold on. This is";
@@ -1144,9 +1144,9 @@ function	script	F_MercKafra	{
 		else if (job_merchant_q == 3)
 			job_merchant_q = 5;
 		next;
-		if (countitem(1072) != 0 && quest_alb_01 == 0) {
+		if (countitem(Delivery_Message) != 0 && quest_alb_01 == 0) {
 			select("This is from Chief Mahnsoo of the Merchant Guild...");
-			delitem 1072,1; //Delivery_Message
+			delitem Delivery_Message,1;
 			quest_alb_01 = 1;
 			mes "[Kafra Employee]";
 			mes "Oh~! A letter from";
@@ -1163,7 +1163,7 @@ function	script	F_MercKafra	{
 			mes "of this. This isn't anything";
 			mes "special, but please take it.";
 			mes "Well, see you again~";
-			getitem 513,3; //Banana
+			getitem Banana,3;
 		}
 		else {
 			mes "[Kafra Employee]";
diff --git a/npc/pre-re/jobs/1-1/swordman.txt b/npc/pre-re/jobs/1-1/swordman.txt
index 33cfeb695..49a113d01 100644
--- a/npc/pre-re/jobs/1-1/swordman.txt
+++ b/npc/pre-re/jobs/1-1/swordman.txt
@@ -294,7 +294,7 @@ izlude_in,30,163,0	script	Test Hall Staff#swd_1	8W_SOLDIER,{
 	}
 	else if (job_sword_q == 2) {
 		mes "Retesting? Try not to worry about it. It's good that you don't back down from a challenge! Here, take these and cheer up!";
-		getitem 512,5; //Apple
+		getitem Apple,5;
 		job_sword_q = 3;
 	}
 	else if (job_sword_q == 3)
diff --git a/npc/pre-re/jobs/1-1/thief.txt b/npc/pre-re/jobs/1-1/thief.txt
index 4777cb603..32f2f0d75 100644
--- a/npc/pre-re/jobs/1-1/thief.txt
+++ b/npc/pre-re/jobs/1-1/thief.txt
@@ -151,7 +151,7 @@ moc_prydb1,39,129,2	script	Thief Guide	1_F_04,{
 		mes "*Sigh* Look, there's really no need for you to be in this kind of place. You oughta go where you ought to go.";
 		close;
 	}
-	if (job_thief_q == 3 && countitem(1069) > 0 || countitem(1070) > 0) {
+	if (job_thief_q == 3 && countitem(Mushroom_Of_Thief_1) > 0 || countitem(Mushroom_Of_Thief_2) > 0) {
 		mes "[Thief Guide]";
 		mes "Hmmm?";
 		mes "You gathered Mushrooms for";
@@ -393,7 +393,7 @@ moc_prydb1,42,133,2	script	Comrade	2_M_THIEFMASTER,{
 	else if (job_thief_q == 3) {
 		mes "[Comrade]";
 		mes "Ah, the guide told me about you. So, let me check your mushrooms...";
-		if (countitem(1069) == 0 && countitem(1070) == 0) {
+		if (countitem(Mushroom_Of_Thief_1) == 0 && countitem(Mushroom_Of_Thief_2) == 0) {
 			next;
 			mes "[Comrade]";
 			mes "What the hell...";
@@ -401,17 +401,17 @@ moc_prydb1,42,133,2	script	Comrade	2_M_THIEFMASTER,{
 			close;
 		}
 		next;
-		.@thief_item1 = countitem(1069) * 3;
-		.@thief_item2 = countitem(1070);
+		.@thief_item1 = countitem(Mushroom_Of_Thief_1) * 3;
+		.@thief_item2 = countitem(Mushroom_Of_Thief_2);
 		.@total_thief = .@thief_item1 + .@thief_item2;
 		.@money_thief = ((.@thief_item1 * 5) + (.@thief_item2 * 2)) + 200;
 		mes "[Comrade]";
-		if (countitem(1069) != 0) {
+		if (countitem(Mushroom_Of_Thief_1) != 0) {
 			mes "First, let me check the Orange Net Mushrooms you got.";
-			mes "Huh, " + countitem(1069) + " of them.";
+			mes "Huh, " + countitem(Mushroom_Of_Thief_1) + " of them.";
 		}
-		if (countitem(1070) != 0)
-			mes "Now I'll just check your Orange Gooey Mushrooms. That's " + countitem(1070) + " you gathered.";
+		if (countitem(Mushroom_Of_Thief_2) != 0)
+			mes "Now I'll just check your Orange Gooey Mushrooms. That's " + countitem(Mushroom_Of_Thief_2) + " you gathered.";
 		next;
 		mes "[Comrade]";
 		mes "So that would";
@@ -442,8 +442,8 @@ moc_prydb1,42,133,2	script	Comrade	2_M_THIEFMASTER,{
 		mes "[Comrade]";
 		mes strcharinfo(0) + "...";
 		mes "You have passed the official Thief Test. You are now one of us.";
-		if (countitem(1069) != 0) delitem 1069,countitem(1069); //Mushroom_Of_Thief_1
-		if (countitem(1070) != 0) delitem 1070,countitem(1070); //Mushroom_Of_Thief_2
+		if (countitem(Mushroom_Of_Thief_1) != 0) delitem Mushroom_Of_Thief_1,countitem(Mushroom_Of_Thief_1);
+		if (countitem(Mushroom_Of_Thief_2) != 0) delitem Mushroom_Of_Thief_2,countitem(Mushroom_Of_Thief_2);
 		callfunc "Job_Change",Job_Thief;
 		callfunc "F_ClearJobVar";
 		completequest 1013;
diff --git a/npc/pre-re/jobs/novice/novice.txt b/npc/pre-re/jobs/novice/novice.txt
index 0a2f86ae3..16efb4a59 100644
--- a/npc/pre-re/jobs/novice/novice.txt
+++ b/npc/pre-re/jobs/novice/novice.txt
@@ -542,7 +542,7 @@ new_1-2,99,105,3	script	Interfaces Tutor#nv1	4_M_CRU,{
 			mes "[Kris]";
 			mes "Now, why don't you speak to Edwin? He will teach you more regarding the basic use of Skills. Ah, and let me give you a small present: a Tattered Novice Ninja Suit!";
 			nov_get_item02 = 12;
-			getitem 2352,1; //Novice_Plate
+			getitem Novice_Plate,1;
 			close;
 		case 2:
 			mes "[Kris]";
@@ -971,11 +971,11 @@ new_1-2,115,111,3	script	Item Tutor#nv	4_F_JOB_BLACKSMITH,{
 			mes "[Alice]";
 			mes "Now, would you click the ^4A708Bitem^000000 tab in the Inventory Window? I just gave you a Novice Potion. You can drink it by double-clicking it. Go ahead, try it!";
 			nov_get_item04 = 10;
-			getitem 569,1; //Novice_Potion
+			getitem Novice_Potion,1;
 			percentheal -50,0;
 			next;
 			mes "[Alice]";
-			if (countitem(569) < 1) {
+			if (countitem(Novice_Potion) < 1) {
 				if (BaseLevel < 8) {
 					mes "Nice~!";
 					mes "And here's";
@@ -1017,9 +1017,9 @@ new_1-2,115,111,3	script	Item Tutor#nv	4_F_JOB_BLACKSMITH,{
 			mes "I just gave you to";
 			mes "put them on.";
 			nov_get_item04 = 12;
-			getitem 2510,1; //Novice_Hood
-			getitem 2414,1; //Novice_Boots
-			getitem 5055,1; //Novice_Egg_Cap
+			getitem Novice_Hood,1;
+			getitem Novice_Boots,1;
+			getitem Novice_Egg_Cap,1;
 			next;
 			mes "[Alice]";
 			if (isequipped(2414)) {
@@ -1091,9 +1091,9 @@ new_1-2,115,111,3	script	Item Tutor#nv	4_F_JOB_BLACKSMITH,{
 			mes "[Alice]";
 			mes "However, ^ff0000do not use the Fly Wing or Butterfly Wing^000000 in these Training Grounds or you could be stuck here forever. Those items are for when you graduate, okay?";
 			nov_get_item04 = 15;
-			getitem 601,10; //Wing_Of_Fly
-			getitem 602,2; //Wing_Of_Butterfly
-			getitem 569,50; //Novice_Potion
+			getitem Wing_Of_Fly,10;
+			getitem Wing_Of_Butterfly,2;
+			getitem Novice_Potion,50;
 			next;
 			mes "[Alice]";
 			mes "And lastly...";
@@ -1337,16 +1337,16 @@ new_1-2,118,108,3	script	Kafra Employee#nv1	4_F_KAFRA1,{
 			close2;
 			if (nov_get_item05 < 11) {
 				nov_get_item05 = 11;
-				getitem 569,100; //Novice_Potion
-				getitem 1243,1; //Novice_Knife
-				getitem 2414,1; //Novice_Boots
-				getitem 2510,1; //Novice_Hood
-				getitem 2352,1; //Novice_Plate
-				getitem 2112,1; //Novice_Guard
-				getitem 601,10; //Wing_Of_Fly
-				getitem 602,2; //Wing_Of_Butterfly
-				getitem 7059,5; //Cargo_Free_Ticket
-				getitem 7060,5; //Warp_Free_Ticket
+				getitem Novice_Potion,100;
+				getitem Novice_Knife,1;
+				getitem Novice_Boots,1;
+				getitem Novice_Hood,1;
+				getitem Novice_Plate,1;
+				getitem Novice_Guard,1;
+				getitem Wing_Of_Fly,10;
+				getitem Wing_Of_Butterfly,2;
+				getitem Cargo_Free_Ticket,5;
+				getitem Warp_Free_Ticket,5;
 			}
 			nov_1st_cos = 0;
 			nov_2nd_cos = 0;
@@ -1408,8 +1408,8 @@ new_1-2,118,108,3	script	Kafra Employee#nv1	4_F_KAFRA1,{
 			close2;
 			if (nov_get_item05 < 11) {
 				nov_get_item05 = 11;
-				getitem 7059,5; //Cargo_Free_Ticket
-				getitem 7060,5; //Warp_Free_Ticket
+				getitem Cargo_Free_Ticket,5;
+				getitem Warp_Free_Ticket,5;
 			}
 			nov_1st_cos = 0;
 			nov_2nd_cos = 0;
@@ -2522,12 +2522,12 @@ new_1-2,38,182,3	script	Entrance Guard#nv	4_F_03,{
 			else {
 				nov_2nd_cos = 29;
 			}
-			getitem 602,1; //Wing_Of_Butterfly
-			getitem 601,9; //Wing_Of_Fly
-			getitem 1243,1; //Novice_Knife
-			getitem 2112,1; //Novice_Guard
-			getitem 611,2; //Spectacles
-			getitem 569,300; //Novice_Potion
+			getitem Wing_Of_Butterfly,1;
+			getitem Wing_Of_Fly,9;
+			getitem Novice_Knife,1;
+			getitem Novice_Guard,1;
+			getitem Spectacles,2;
+			getitem Novice_Potion,300;
 			close2;
 			savepoint "new_1-2",23,188;
 			warp "new_1-3",96,21;
@@ -2592,7 +2592,7 @@ new_1-2,38,182,3	script	Entrance Guard#nv	4_F_03,{
 				getexp 200,0;
 			}
 			percentheal 100,0;
-			getitem 569,50; //Novice_Potion
+			getitem Novice_Potion,50;
 			close2;
 			warp "new_1-3",96,21;
 			end;
@@ -2747,7 +2747,7 @@ new_5-3,96,174,3	duplicate(NovKeyman)	Test Examiner#nv5	4_M_03
 new_1-2,28,185,4	shop	Potato Merchant	4_F_01,516:15
 
 new_1-4,100,29,1	script	Hanson#nv	1_ETC_01,{
-	if (checkweight(909,400) == 0) {
+	if (checkweight(Jellopy,400) == 0) {
 		mes "[Hanson]";
 		mes "All of the items you are carrying must be quite a burden. Where did you get so much things? Please lighten your weight by getting rid of things you don't need.";
 		close;
@@ -3123,9 +3123,9 @@ new_1-4,100,29,1	script	Hanson#nv	1_ETC_01,{
 			next;
 			//---------------------------------------------------------------------------------------------------------------------------------------------------
 			nov_3_swordman = 40;
-			getitem 501,4; //Red_Potion
-			getitem 503,2; //Yellow_Potion
-			getitem 506,2; //Green_Potion
+			getitem Red_Potion,4;
+			getitem Yellow_Potion,2;
+			getitem Green_Potion,2;
 			//-------------------------------------------------------------------------------------------------------------------------------------------------
 			next;
 			mes "[Hanson]";
@@ -3267,10 +3267,10 @@ new_1-4,100,29,1	script	Hanson#nv	1_ETC_01,{
 					mes "^0000337 Phracon^000000";
 					next;
 					nov_3_swordman = 40;
-					getitem 7059,5; //Cargo_Free_Ticket
-					getitem 7060,5; //Warp_Free_Ticket
-					getitem 1104,1; //Falchion
-					getitem 1010,7; //Phracon
+					getitem Cargo_Free_Ticket,5;
+					getitem Warp_Free_Ticket,5;
+					getitem Falchion,1;
+					getitem Phracon,7;
 					////getgold 100
 					mes "[Hanson]";
 					mes "Please check your inventory to see if you have received all the supplies listed. Let me briefly inform you about the items you've received.";
@@ -3336,11 +3336,11 @@ new_1-4,100,29,1	script	Hanson#nv	1_ETC_01,{
 					next;
 					//---------------------------------------------------------------------------------------------------------------------------------------------------
 					nov_3_swordman = 40;
-					getitem 7059,5; //Cargo_Free_Ticket
-					getitem 7060,5; //Warp_Free_Ticket
-					getitem 1601,1; //Rod
-					getitem 1204,1; //Cutter
-					getitem 1010,7; //Phracon
+					getitem Cargo_Free_Ticket,5;
+					getitem Warp_Free_Ticket,5;
+					getitem Rod,1;
+					getitem Cutter,1;
+					getitem Phracon,7;
 					////getgold 100
 					//---------------------------------------------------------------------------------------------------------------------------------------------------
 					mes "[Hanson]";
@@ -3409,11 +3409,11 @@ new_1-4,100,29,1	script	Hanson#nv	1_ETC_01,{
 					next;
 					//---------------------------------------------------------------------------------------------------------------------------------------------------
 					nov_3_swordman = 40;
-					getitem 7059,4; //Cargo_Free_Ticket
-					getitem 7060,4; //Warp_Free_Ticket
-					getitem 7061,4; //Cart_Free_Ticket
-					getitem 1351,1; //Battle_Axe
-					getitem 1010,7; //Phracon
+					getitem Cargo_Free_Ticket,4;
+					getitem Warp_Free_Ticket,4;
+					getitem Cart_Free_Ticket,4;
+					getitem Battle_Axe,1;
+					getitem Phracon,7;
 					////getgold 100
 					//---------------------------------------------------------------------------------------------------------------------------------------------------
 					mes "[Hanson]";
@@ -3486,10 +3486,10 @@ new_1-4,100,29,1	script	Hanson#nv	1_ETC_01,{
 					next;
 					//---------------------------------------------------------------------------------------------------------------------------------------------------
 					nov_3_swordman = 40;
-					getitem 7059,5; //Cargo_Free_Ticket
-					getitem 7060,5; //Warp_Free_Ticket
-					getitem 1207,1; //Main_Gauche
-					getitem 1010,7; //Phracon
+					getitem Cargo_Free_Ticket,5;
+					getitem Warp_Free_Ticket,5;
+					getitem Main_Gauche,1;
+					getitem Phracon,7;
 					////getgold 100
 					//---------------------------------------------------------------------------------------------------------------------------------------------------
 					mes "[Hanson]";
@@ -3547,10 +3547,10 @@ new_1-4,100,29,1	script	Hanson#nv	1_ETC_01,{
 					next;
 					//---------------------------------------------------------------------------------------------------------------------------------------------------
 					nov_3_swordman = 40;
-					getitem 7059,5; //Cargo_Free_Ticket
-					getitem 7060,5; //Warp_Free_Ticket
-					getitem 1704,1; //Composite_Bow
-					getitem 1010,7; //Phracon
+					getitem Cargo_Free_Ticket,5;
+					getitem Warp_Free_Ticket,5;
+					getitem Composite_Bow,1;
+					getitem Phracon,7;
 					////getgold 100
 					//---------------------------------------------------------------------------------------------------------------------------------------------------
 					mes "[Hanson]";
@@ -3619,10 +3619,10 @@ new_1-4,100,29,1	script	Hanson#nv	1_ETC_01,{
 					next;
 					//---------------------------------------------------------------------------------------------------------------------------------------------------
 					nov_3_swordman = 40;
-					getitem 7059,5; //Cargo_Free_Ticket
-					getitem 7060,5; //Warp_Free_Ticket
-					getitem 1504,1; //Mace
-					getitem 1010,7; //Phracon
+					getitem Cargo_Free_Ticket,5;
+					getitem Warp_Free_Ticket,5;
+					getitem Mace,1;
+					getitem Phracon,7;
 					////getgold 100
 					//---------------------------------------------------------------------------------------------------------------------------------------------------
 					mes "[Hanson]";
@@ -3859,9 +3859,9 @@ S_UserJobchoice:
 	next;
 	//------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 	nov_3_swordman = 40;
-	getitem 7059,5; //Cargo_Free_Ticket
-	getitem 7060,5; //Warp_Free_Ticket
-	getitem 2305,1; //Adventure_Suit
+	getitem Cargo_Free_Ticket,5;
+	getitem Warp_Free_Ticket,5;
+	getitem Adventure_Suit,1;
 	////getgold 100
 	//------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 	mes "[Hanson]";
diff --git a/npc/pre-re/quests/collection/quest_alligator.txt b/npc/pre-re/quests/collection/quest_alligator.txt
index 920c3c6a1..84f1d4730 100644
--- a/npc/pre-re/quests/collection/quest_alligator.txt
+++ b/npc/pre-re/quests/collection/quest_alligator.txt
@@ -182,7 +182,7 @@ cmd_fild01,362,256,3	script	Cuir#Gator_Hunt	1_M_MOC_LORD,{
 					switch(select("I have the Anolian Skins:Gators bite!")) {
 					case 1:
 						/*
-						if (checkweight(503,10) == 0) {
+						if (checkweight(Yellow_Potion,10) == 0) {
 							mes "[Cuir]";
 							mes "Hey, it looks like that the weight on";
 							mes "your back will crush you. Come back";
@@ -190,14 +190,14 @@ cmd_fild01,362,256,3	script	Cuir#Gator_Hunt	1_M_MOC_LORD,{
 							close;
 						}
 						*/
-						if (countitem(7003) > 19) {
+						if (countitem(Anolian_Skin) > 19) {
 							mes "[Cuir]";
 							mes "Thank you for the ^00CE0020 Anolian Skins^000000!";
 							mes "I hope you can continue to help me collect these skins.";
 							mes "The armor creators around the world are clamoring for them.";
-							delitem 7003,20; //Anolian_Skin
+							delitem Anolian_Skin,20;
 							getexp 68950,43300;
-							//getitem 503,10; //Yellow_Potion
+							//getitem Yellow_Potion,10;
 							close;
 						}
 						else {
diff --git a/npc/pre-re/quests/collection/quest_caramel.txt b/npc/pre-re/quests/collection/quest_caramel.txt
index 20bf28b8e..97d5b50ec 100644
--- a/npc/pre-re/quests/collection/quest_caramel.txt
+++ b/npc/pre-re/quests/collection/quest_caramel.txt
@@ -182,7 +182,7 @@ mjolnir_01,296,29,6	script	Yullo#Caramel_Hunt	4_F_SISTER,{
 					switch(select("I have Porcupine Quills:Well I don't think I can help.")) {
 					case 1:
 						/*
-						if (checkweight(501,10) == 0) {
+						if (checkweight(Red_Potion,10) == 0) {
 							mes "[Yullo]";
 							mes "Hey, it looks like that the weight on";
 							mes "your back will crush you. Come back";
@@ -190,13 +190,13 @@ mjolnir_01,296,29,6	script	Yullo#Caramel_Hunt	4_F_SISTER,{
 							close;
 						}
 						*/
-						if (countitem(1027) > 24) {
+						if (countitem(Porcupine_Spike) > 24) {
 							mes "[Yullo]";
 							mes "Great, you have enough!";
 							mes "Just like I promised a little reward.";
-							delitem 1027,25; //Porcupine_Spike
+							delitem Porcupine_Spike,25;
 							getexp 10425,6272;
-							//getitem 501,10; //Red_Potion
+							//getitem Red_Potion,10;
 							close;
 						}
 						else {
diff --git a/npc/pre-re/quests/collection/quest_coco.txt b/npc/pre-re/quests/collection/quest_coco.txt
index 88a860610..358726e1a 100644
--- a/npc/pre-re/quests/collection/quest_coco.txt
+++ b/npc/pre-re/quests/collection/quest_coco.txt
@@ -180,7 +180,7 @@ mjolnir_01,293,20,3	script	Nutters#Coco_Hunt	4_M_YOYOROGUE,{
 					switch(select("I have 25 Acorns:Please come again?")) {
 					case 1:
 						/*
-						if (checkweight(502,5) == 0) {
+						if (checkweight(Orange_Potion,5) == 0) {
 							mes "[Nutters]";
 							mes "Hey, it looks like that the weight on";
 							mes "your back will crush you. Come back";
@@ -188,7 +188,7 @@ mjolnir_01,293,20,3	script	Nutters#Coco_Hunt	4_M_YOYOROGUE,{
 							close;
 						}
 						*/
-						if (countitem(1026) > 24) {
+						if (countitem(Acorn) > 24) {
 							mes "[Nutters]";
 							mes "Oh great you found out where they were hiding them.";
 							mes "Gimme Gimme!!!";
@@ -196,9 +196,9 @@ mjolnir_01,293,20,3	script	Nutters#Coco_Hunt	4_M_YOYOROGUE,{
 							mes "[Nutters]";
 							mes "Oh that's right, sorry I just love roasting Acorns. Mmm.";
 							mes "Here is what I promised you.";
-							delitem 1026,25; //Acorn
+							delitem Acorn,25;
 							getexp 3600,3905;
-							//getitem 502,5; //Orange_Potion
+							//getitem Orange_Potion,5;
 							close;
 						}
 						else {
diff --git a/npc/pre-re/quests/collection/quest_creamy.txt b/npc/pre-re/quests/collection/quest_creamy.txt
index 6e0ff1503..e768e1c2c 100644
--- a/npc/pre-re/quests/collection/quest_creamy.txt
+++ b/npc/pre-re/quests/collection/quest_creamy.txt
@@ -179,7 +179,7 @@ prt_fild04,356,148,3	script	Laertes#Creamy_Hunt	4_M_NFMAN,{
 					switch(select("I have Powder of Butterfly:What did you need?")) {
 					case 1:
 						/*
-						if (checkweight(502,5) == 0) {
+						if (checkweight(Orange_Potion,5) == 0) {
 							mes "[Laertes]";
 							mes "Hey, it looks like that the weight on";
 							mes "your back will crush you. Come back";
@@ -187,13 +187,13 @@ prt_fild04,356,148,3	script	Laertes#Creamy_Hunt	4_M_NFMAN,{
 							close;
 						}
 						*/
-						if (countitem(924) > 24) {
+						if (countitem(Powder_Of_Butterfly) > 24) {
 							mes "[Laertes]";
 							mes "Hey, thank you again.";
 							mes "Here you go, as promised.";
-							delitem 924,25; //Powder_Of_Butterfly
+							delitem Powder_Of_Butterfly,25;
 							getexp 2950,1125;
-							//getitem 502,5; //Orange_Potion
+							//getitem Orange_Potion,5;
 							close;
 						}
 						else {
diff --git a/npc/pre-re/quests/collection/quest_demonpungus.txt b/npc/pre-re/quests/collection/quest_demonpungus.txt
index 87d9bc4a6..f3785b932 100644
--- a/npc/pre-re/quests/collection/quest_demonpungus.txt
+++ b/npc/pre-re/quests/collection/quest_demonpungus.txt
@@ -179,7 +179,7 @@ ein_fild01,43,249,0	script	Local Villager#hunt	4_M_HUMAN_01,{
 					switch(select("I have Bacillus:What did you need?")) {
 					case 1:
 						/*
-						if (checkweight(504,10) == 0) {
+						if (checkweight(White_Potion,10) == 0) {
 							mes "[Local Villager]";
 							mes "Hey, it looks like that the weight on";
 							mes "your back will crush you. Come back";
@@ -187,12 +187,12 @@ ein_fild01,43,249,0	script	Local Villager#hunt	4_M_HUMAN_01,{
 							close;
 						}
 						*/
-						if (countitem(7119) > 49) {
+						if (countitem(Spawns) > 49) {
 							mes "[Local Villager]";
 							mes "I had my doubts, but you have proven me wrong.";
-							delitem 7119,50; //Spawns
+							delitem Spawns,50;
 							getexp 250266,144452;
-							//getitem 504,10; //White_Potion
+							//getitem White_Potion,10;
 							close;
 						}
 						else {
diff --git a/npc/pre-re/quests/collection/quest_dokebi.txt b/npc/pre-re/quests/collection/quest_dokebi.txt
index c357c3234..5226cca51 100644
--- a/npc/pre-re/quests/collection/quest_dokebi.txt
+++ b/npc/pre-re/quests/collection/quest_dokebi.txt
@@ -176,11 +176,11 @@ pay_fild10,108,357,5	script	Li#Dokebi_Hunt	4_F_01,{
 					next;
 					switch(select("I have some Dokebi Horns:What did you need?")) {
 					case 1:
-						if (countitem(1021) > 49) {
+						if (countitem(Dokkaebi_Horn) > 49) {
 							mes "[Li]";
 							mes "Oh, great!";
 							mes "Thank you for the horns.";
-							delitem 1021,50; //Dokkaebi_Horn
+							delitem Dokkaebi_Horn,50;
 							getexp 42000,36000;
 							close;
 						}
diff --git a/npc/pre-re/quests/collection/quest_dryad.txt b/npc/pre-re/quests/collection/quest_dryad.txt
index 4419ca971..339f49761 100644
--- a/npc/pre-re/quests/collection/quest_dryad.txt
+++ b/npc/pre-re/quests/collection/quest_dryad.txt
@@ -180,7 +180,7 @@ um_fild01,34,281,5	script	Lilla#Dryad_Hunt	4_F_07,{
 					switch(select("I have some Sharp Leafs:What did you need?")) {
 					case 1:
 						/*
-						if (checkweight(504,10) == 0) {
+						if (checkweight(White_Potion,10) == 0) {
 							mes "[Lilla]";
 							mes "Hey, it looks like that the weight on";
 							mes "your back will crush you. Come back";
@@ -188,7 +188,7 @@ um_fild01,34,281,5	script	Lilla#Dryad_Hunt	4_F_07,{
 							close;
 						}
 						*/
-						if (countitem(7100) > 49) {
+						if (countitem(Sharp_Leaf) > 49) {
 							mes "[Lilla]";
 							mes "Hey, your a sweet little thing.";
 							mes "Thanks so much for helping me!";
@@ -196,9 +196,9 @@ um_fild01,34,281,5	script	Lilla#Dryad_Hunt	4_F_07,{
 							mes "[Lilla]";
 							mes "Oh, I almost forgot. I have something for you ^_^";
 							mes "Thank you so much again for your help.";
-							delitem 7100,50; //Sharp_Leaf
+							delitem Sharp_Leaf,50;
 							getexp 262485,141835;
-							//getitem 504,10; //White_Potion
+							//getitem White_Potion,10;
 							close;
 						}
 						else {
diff --git a/npc/pre-re/quests/collection/quest_fabre.txt b/npc/pre-re/quests/collection/quest_fabre.txt
index e90cacbdb..ec36e1510 100644
--- a/npc/pre-re/quests/collection/quest_fabre.txt
+++ b/npc/pre-re/quests/collection/quest_fabre.txt
@@ -180,11 +180,11 @@ gef_fild07,321,193,4	script	Langry#Fabre_Hunt	4_M_SAGE_A,{
 					next;
 					switch(select("I have some Fluff:What was that again?")) {
 					case 1:
-						if (countitem(914) > 24) {
+						if (countitem(Fluff) > 24) {
 							mes "[Langry]";
 							mes "Thank you for the Fluff. This helps me out greatly.";
 							mes "Oh and here you go, this should help you get stronger, faster!";
-							delitem 914,25; //Fluff
+							delitem Fluff,25;
 							getexp 385,30;
 							close;
 						}
diff --git a/npc/pre-re/quests/collection/quest_frilldora.txt b/npc/pre-re/quests/collection/quest_frilldora.txt
index 5612f7c78..876101cca 100644
--- a/npc/pre-re/quests/collection/quest_frilldora.txt
+++ b/npc/pre-re/quests/collection/quest_frilldora.txt
@@ -179,11 +179,11 @@ moc_fild17,66,273,5	script	Lemly#Frilldora_Hunt	4_F_JOB_ASSASSIN,{
 					// Item turn in
 					switch(select("I have some Frills:What did you need?")) {
 					case 1:
-						if (countitem(1012) > 24) {
+						if (countitem(Lizard_Scruff) > 24) {
 							mes "[Lemly]";
 							mes "Hey, thank you.";
 							mes "These are pretty icky though.";
-							delitem 1012,25; //Lizard_Scruff
+							delitem Lizard_Scruff,25;
 							getexp 30000,23000;
 							close;
 						}
diff --git a/npc/pre-re/quests/collection/quest_goat.txt b/npc/pre-re/quests/collection/quest_goat.txt
index 434840f9e..6c7a9ea88 100644
--- a/npc/pre-re/quests/collection/quest_goat.txt
+++ b/npc/pre-re/quests/collection/quest_goat.txt
@@ -180,7 +180,7 @@ ein_fild06,82,171,0	script	Vegetable Farmer#Goat	4_F_SHABBY,{
 					switch(select("I have Antelope Horns:What did you need?")) {
 					case 1:
 						/*
-						if (checkweight(504,10) == 0) {
+						if (checkweight(White_Potion,10) == 0) {
 							mes "[Vegetable Farmer]";
 							mes "Hey, it looks like that the weight on";
 							mes "your back will crush you. Come back";
@@ -188,13 +188,13 @@ ein_fild06,82,171,0	script	Vegetable Farmer#Goat	4_F_SHABBY,{
 							close;
 						}
 						*/
-						if (countitem(7106) > 49) {
+						if (countitem(Goat's_Horn) > 49) {
 							mes "[Vegetable Farmer]";
 							mes "Amazing, you did that with speed.";
 							mes "I am truly grateful.";
-							delitem 7106,50; //Goat's_Horn
+							delitem Goat's_Horn,50;
 							getexp 258489,155155;
-							//getitem 504,10; //White_Potion
+							//getitem White_Potion,10;
 							close;
 						}
 						else {
diff --git a/npc/pre-re/quests/collection/quest_golem.txt b/npc/pre-re/quests/collection/quest_golem.txt
index 79059da29..2ab40efc2 100644
--- a/npc/pre-re/quests/collection/quest_golem.txt
+++ b/npc/pre-re/quests/collection/quest_golem.txt
@@ -177,10 +177,10 @@ moc_fild11,57,138,0	script	Private Jeremy#hunt	4_M_MOC_SOLDIER,{
 					next;
 					switch(select("I have Stone Hearts:What did you need?")) {
 					case 1:
-						if (countitem(953) > 24) {
+						if (countitem(Stone_Heart) > 24) {
 							mes "[Private Jeremy]";
 							mes "The Morroc Guard thanks you, citizen.";
-							delitem 953,25; //Stone_Heart
+							delitem Stone_Heart,25;
 							getexp 14000,9000;
 							close;
 						}
diff --git a/npc/pre-re/quests/collection/quest_hode.txt b/npc/pre-re/quests/collection/quest_hode.txt
index 5c5fe33e3..16cbf69aa 100644
--- a/npc/pre-re/quests/collection/quest_hode.txt
+++ b/npc/pre-re/quests/collection/quest_hode.txt
@@ -182,7 +182,7 @@ moc_fild17,208,346,5	script	Shone#Hode_Hunt	4_M_MOC_SOLDIER,{
 					switch(select("I have 25 Earthworm Peelings:What was it again?")) {
 					case 1:
 						/*
-						if (checkweight(502,10) == 0) {
+						if (checkweight(Orange_Potion,10) == 0) {
 							mes "[Shone]";
 							mes "Hey, it looks like that the weight on";
 							mes "your back will crush you. Come back";
@@ -190,13 +190,13 @@ moc_fild17,208,346,5	script	Shone#Hode_Hunt	4_M_MOC_SOLDIER,{
 							close;
 						}
 						*/
-						if (countitem(1055) > 24) {
+						if (countitem(Earthworm_Peeling) > 24) {
 							mes "Thank you for the 25 Earthworm";
 							mes "Peelings!";
 							mes "Here is that reward I promised you, I hope take this wisdom I have passed on to you and share it with others.";
-							delitem 1055,25; //Earthworm_Peeling
+							delitem Earthworm_Peeling,25;
 							getexp 15775,1125;
-							//getitem 502,10; //Orange_Potion
+							//getitem Orange_Potion,10;
 							close;
 						}
 						else {
diff --git a/npc/pre-re/quests/collection/quest_leafcat.txt b/npc/pre-re/quests/collection/quest_leafcat.txt
index 3b3a0eab6..c980926e5 100644
--- a/npc/pre-re/quests/collection/quest_leafcat.txt
+++ b/npc/pre-re/quests/collection/quest_leafcat.txt
@@ -179,7 +179,7 @@ ayo_fild01,44,241,5	script	Lella#LeafCat_Hunt	4_F_YUNYANG,{
 					switch(select("I have 50 Huge Leafs:What, sorry I was day dreaming")) {
 					case 1:
 						/*
-						if (checkweight(503,10) == 0) {
+						if (checkweight(Yellow_Potion,10) == 0) {
 							mes "[Lella]";
 							mes "Hey, it looks like that the weight on";
 							mes "your back will crush you. Come back";
@@ -187,15 +187,15 @@ ayo_fild01,44,241,5	script	Lella#LeafCat_Hunt	4_F_YUNYANG,{
 							close;
 						}
 						*/
-						if (countitem(7198) > 49) {
+						if (countitem(Great_Leaf) > 49) {
 							mes "[Lella]";
 							mes "Wonderful I can tell it is just a little bit quieter around here!";
 							next;
 							mes "[Lella]";
 							mes "The more leafs I collect the quieter it seems around here.";
-							delitem 7198,50; //Great_Leaf
+							delitem Great_Leaf,50;
 							getexp 25740,31512;
-							//getitem 503,10; //Yellow_Potion
+							//getitem Yellow_Potion,10;
 							close;
 						}
 						else {
diff --git a/npc/pre-re/quests/collection/quest_pecopeco.txt b/npc/pre-re/quests/collection/quest_pecopeco.txt
index 462703638..32c595c92 100644
--- a/npc/pre-re/quests/collection/quest_pecopeco.txt
+++ b/npc/pre-re/quests/collection/quest_pecopeco.txt
@@ -195,10 +195,10 @@ moc_fild02,74,329,3	script	Gregor#PecoPeco_Hunt	4W_M_01,{
 					next;
 					switch(select("I have some Bill of Birds:What did you need?")) {
 					case 1:
-						if (countitem(925) > 24) {
+						if (countitem(Bill_Of_Birds) > 24) {
 							mes "[Gregor]";
 							mes "Thank you so much.";
-							delitem 925,25; //Bill_Of_Birds
+							delitem Bill_Of_Birds,25;
 							getexp 4000,2000;
 							next;
 							mes "[Gregor]";
diff --git a/npc/pre-re/quests/collection/quest_pupa.txt b/npc/pre-re/quests/collection/quest_pupa.txt
index 4280870ea..5868fae84 100644
--- a/npc/pre-re/quests/collection/quest_pupa.txt
+++ b/npc/pre-re/quests/collection/quest_pupa.txt
@@ -185,11 +185,11 @@ gef_fild04,191,54,3	script	Halgus#Pupa_Hunt	2_F_MAGICMASTER,{
 					next;
 					switch(select("I have Chrysalis:What did you need?")) {
 					case 1:
-						if (countitem(915) > 24) {
+						if (countitem(Chrysalis) > 24) {
 							mes "[Halgus]";
 							mes "Amazing you found so many that fast.";
 							mes "Like I promised, give me the Chrysalis and I will reward you with my wisdom.";
-							delitem 915,25; //Chrysalis
+							delitem Chrysalis,25;
 							getexp 385,30;
 							close;
 						}
diff --git a/npc/pre-re/quests/skills/novice_skills.txt b/npc/pre-re/quests/skills/novice_skills.txt
index 7e5cd03e5..a22a8c5e5 100644
--- a/npc/pre-re/quests/skills/novice_skills.txt
+++ b/npc/pre-re/quests/skills/novice_skills.txt
@@ -127,9 +127,9 @@ prt_in,234,133,4	script	Nami	1_F_01,{
 					mes "this item. . . ";
 					close;
 				case 2:
-					if ((countitem(507) > 2) && (countitem(705) > 2)) {
-						delitem 507,3; //Red_Herb
-						delitem 705,3; //Clover
+					if ((countitem(Red_Herb) > 2) && (countitem(Clover) > 2)) {
+						delitem Red_Herb,3;
+						delitem Clover,3;
 						mes "[Nami]";
 						mes "Hello, welcome back!";
 						mes "You have done well at finding";
@@ -321,7 +321,7 @@ prt_in,73,87,4	script	Chivalry Member	1_M_YOUNGKNIGHT,{
 			mes "Okayyyyy~~~!! *waves goodbye*";
 			close;
 		case 5:
-			if (countitem(7039) > 0) {
+			if (countitem(Novice_Nametag) > 0) {
 				mes "[Bulma]";
 				mes "Hey... I see that you have -";
 				mes "finished your quest! ! ! . .";
@@ -335,7 +335,7 @@ prt_in,73,87,4	script	Chivalry Member	1_M_YOUNGKNIGHT,{
 				mes " ' Play Dead ' ";
 				mes "Okay okay, See you around ! ! !";
 				skill_nov = 6;
-				delitem 7039,1; //Novice_Nametag
+				delitem Novice_Nametag,1;
 				skill "NV_TRICKDEAD",1,0;
 				close;
 			}
@@ -448,7 +448,7 @@ prt_castle,175,146,4	script	Nursing Instructor	1_M_04,{
 			mes "- Click Click *Walks away* . . . . . -";
 			close;
 		case 4:
-			if (countitem(7039) == 0) {
+			if (countitem(Novice_Nametag) == 0) {
 				mes "[Dread Lord]";
 				mes "Look at this guy!";
 				mes "Wake up and watch where you are going.";
@@ -466,7 +466,7 @@ prt_castle,175,146,4	script	Nursing Instructor	1_M_04,{
 				next;
 				mes "^3355FF- Got 1 Newbie Tag -^000000";
 				skill_nov = 5;
-				getitem 7039,1; //Novice_Nametag
+				getitem Novice_Nametag,1;
 				close;
 			}
 			mes "[Dread Lord]";