ItemID to Constant: custom Folder

4 files changed, 16 insertions, 16 deletions

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;