Added ability to use constants instead of sprite IDs for NPCs. Converted all npcs to use this.

1 files changed, 94 insertions, 94 deletions

diff --git a/npc/re/instances/HazyForest.txt b/npc/re/instances/HazyForest.txt
index 75c6ececd..c76fe2c46 100644
--- a/npc/re/instances/HazyForest.txt
+++ b/npc/re/instances/HazyForest.txt
@@ -18,7 +18,7 @@
 
 // Instance Creation
 //============================================================
-bif_fild01,158,340,5	script	Laphine Soldier#mist	447,{
+bif_fild01,158,340,5	script	Laphine Soldier#mist	4_M_FAIRYSOLDIER,{
 
 	set .@party_id,getcharid(1);
 	set .@md_name$,"Mistwood Maze";
@@ -140,7 +140,7 @@ bif_fild01,158,340,5	script	Laphine Soldier#mist	447,{
 	}
 }
 
-bif_fild01,161,355,0	script	Log Tunnel	844,{
+bif_fild01,161,355,0	script	Log Tunnel	CLEAR_NPC,{
 	mes "I see the forest through the log tunnel.";
 	mes "It looks like I can enter the forest through the log tunnel.";
 	next;
@@ -167,7 +167,7 @@ bif_fild01,161,355,0	script	Log Tunnel	844,{
 
 // Instance Scripts
 //============================================================
-1@mist,89,29,0	script	#Whisper_mist	844,1,1,{
+1@mist,89,29,0	script	#Whisper_mist	CLEAR_NPC,1,1,{
 	end;
 OnInstanceInit:
 	enablenpc instance_npcname("#Whisper_mist");
@@ -211,8 +211,8 @@ function	script	F_Mora_Mist	{
 	end;
 }
 
-1@mist,251,121,3	script	Tom's Garden	858,{ end; }
-1@mist,247,123,0	script	Tom's Garden Tree	527,{
+1@mist,251,121,3	script	Tom's Garden	4_BULLETIN_BOARD2,{ end; }
+1@mist,247,123,0	script	Tom's Garden Tree	4_CREEPER,{
 	callfunc "F_Mora_Mist",
 		"a25_a18-1",
 		"Roaring Cry: Tom's bolt is broken! Watch out, Tomba! Watch out, Tomba!",
@@ -225,8 +225,8 @@ OnMyMobDead:
 	end;
 }
 
-1@mist,226,95,3	script	Tomba's Garden	858,{ end; }
-1@mist,225,98,0	script	Tomba's Garden Tree	527,{
+1@mist,226,95,3	script	Tomba's Garden	4_BULLETIN_BOARD2,{ end; }
+1@mist,225,98,0	script	Tomba's Garden Tree	4_CREEPER,{
 	callfunc "F_Mora_Mist",
 		"a27-2_af1-2",
 		"Roaring Cry: Tomba's Garden Tree is gone with Tomba. Remi, what are you going to do now?",
@@ -239,8 +239,8 @@ OnMyMobDead:
 	end;
 }
 
-1@mist,157,183,3	script	Remi's Garden	858,{ end; }
-1@mist,159,184,0	script	Remi's Garden Tree	527,{
+1@mist,157,183,3	script	Remi's Garden	4_BULLETIN_BOARD2,{ end; }
+1@mist,159,184,0	script	Remi's Garden Tree	4_CREEPER,{
 	callfunc "F_Mora_Mist",
 		"a15-2_a4-1",
 		"Roaring Cry: Remi, Remi's Garden Tree was chopped down- Rem, it's your turn next. Poor Rem!",
@@ -253,8 +253,8 @@ OnMyMobDead:
 	end;
 }
 
-1@mist,58,39,3	script	Tired Rem's Garden	858,{ end; }
-1@mist,61,39,0	script	Tired Rem's Garden Tree	527,{
+1@mist,58,39,3	script	Tired Rem's Garden	4_BULLETIN_BOARD2,{ end; }
+1@mist,61,39,0	script	Tired Rem's Garden Tree	4_CREEPER,{
 	callfunc "F_Mora_Mist",
 		"a4-2_a11",
 		"Rem's Desperate Cry: Argh... Rem will sleep. Rem will sleep now, and won't wake up forever!",
@@ -277,8 +277,8 @@ OnMyMobDead:
 	end;
 }
 
-1@mist,227,179,3	script	Ron's Garden	858,{ end; }
-1@mist,230,179,0	script	Ron's Garden Tree	527,{
+1@mist,227,179,3	script	Ron's Garden	4_BULLETIN_BOARD2,{ end; }
+1@mist,230,179,0	script	Ron's Garden Tree	4_CREEPER,{
 	callfunc "F_Mora_Mist",
 		"b4-2_b2",
 		"Ron the Gardener's Cry: I'm getting off work! Don't look for Ron, the second gardener, any more!!",
@@ -291,8 +291,8 @@ OnMyMobDead:
 	end;
 }
 
-1@mist,288,226,3	script	Rover's Garden	858,{ end; }
-1@mist,285,225,0	script	Rover's Garden Tree	527,{
+1@mist,288,226,3	script	Rover's Garden	4_BULLETIN_BOARD2,{ end; }
+1@mist,285,225,0	script	Rover's Garden Tree	4_CREEPER,{
 	callfunc "F_Mora_Mist",
 		"b7_bf1-2",
 		"Roaring Whisper: Ron's, and Rover's trees were chopped down as well. Who is forcing his way into the forest? Who is it?",
@@ -305,8 +305,8 @@ OnMyMobDead:
 	end;
 }
 
-1@mist,159,318,3	script	Mona's Garden	858,{ end; }
-1@mist,161,316,0	script	Mona's Garden Tree	527,{
+1@mist,159,318,3	script	Mona's Garden	4_BULLETIN_BOARD2,{ end; }
+1@mist,161,316,0	script	Mona's Garden Tree	4_CREEPER,{
 	callfunc "F_Mora_Mist",
 		"b31_b16",
 		"Clamoring Whisper: Mona the Seedseeker's garden tree is gone! Mona is gone too! Namon will be okay, because he is brave, right? Namon, are you okay?",
@@ -319,8 +319,8 @@ OnMyMobDead:
 	end;
 }
 
-1@mist,205,300,3	script	Namon's Garden	858,{ end; }
-1@mist,204,299,0	script	Namon's Garden Tree	527,{
+1@mist,205,300,3	script	Namon's Garden	4_BULLETIN_BOARD2,{ end; }
+1@mist,204,299,0	script	Namon's Garden Tree	4_CREEPER,{
 	callfunc "F_Mora_Mist",
 		"b27-3_bN-1",
 		"Clamoring Whisper: Brave Namon met his fate not so bravely... *giggle*",
@@ -333,8 +333,8 @@ OnMyMobDead:
 	end;
 }
 
-1@mist,219,232,3	script	Sad Neoron's Garden	858,{ end; }
-1@mist,221,236,0	script	Sad Neoron's Garden Tree	527,{
+1@mist,219,232,3	script	Sad Neoron's Garden	4_BULLETIN_BOARD2,{ end; }
+1@mist,221,236,0	script	Sad Neoron's Garden Tree	4_CREEPER,{
 	callfunc "F_Mora_Mist",
 		"b6-1_b33",
 		"Lamenting Whisper: Sad Neoron has become cheerful! Spyder the Superior Spider, what are you going to do? What are you going to do now?",
@@ -347,8 +347,8 @@ OnMyMobDead:
 	end;
 }
 
-1@mist,206,202,3	script	Spyder's Garden	858,{ end; }
-1@mist,206,200,0	script	Spyder's Garden Tree	527,{
+1@mist,206,202,3	script	Spyder's Garden	4_BULLETIN_BOARD2,{ end; }
+1@mist,206,200,0	script	Spyder's Garden Tree	4_CREEPER,{
 	callfunc "F_Mora_Mist",
 		"b5_b14",
 		"Depressed Whisper: Now it's all over with the second deepest forest. Gardeners are dying out-",
@@ -374,8 +374,8 @@ OnMyMobDead:
 	end;
 }
 
-1@mist,96,288,3	script	Tito's Garden	858,{ end; }
-1@mist,95,287,0	script	Tito's Garden Tree	527,{
+1@mist,96,288,3	script	Tito's Garden	4_BULLETIN_BOARD2,{ end; }
+1@mist,95,287,0	script	Tito's Garden Tree	4_CREEPER,{
 	callfunc "F_Mora_Mist",
 		"c1_c13-1",
 		"Tito's Cry: *sob* *sob* Tito's gone now! Tito's done for! Boo hoo!!",
@@ -388,8 +388,8 @@ OnMyMobDead:
 	end;
 }
 
-1@mist,326,325,3	script	Pumba's Garden	858,{ end; }
-1@mist,324,325,0	script	Pumba's Garden Tree	527,{
+1@mist,326,325,3	script	Pumba's Garden	4_BULLETIN_BOARD2,{ end; }
+1@mist,324,325,0	script	Pumba's Garden Tree	4_CREEPER,{
 	callfunc "F_Mora_Mist",
 		"c13-3_c4",
 		"Roaring Whisper: Tito the Hard Worker was defeated! Stop playing and go to work, Tete! Start working!",
@@ -402,8 +402,8 @@ OnMyMobDead:
 	end;
 }
 
-1@mist,278,345,3	script	Tete's Garden	858,{ end; }
-1@mist,280,344,0	script	Tete's Garden Tree	527,{
+1@mist,278,345,3	script	Tete's Garden	4_BULLETIN_BOARD2,{ end; }
+1@mist,280,344,0	script	Tete's Garden Tree	4_CREEPER,{
 	callfunc "F_Mora_Mist",
 		"c19_c4",
 		"Whisper: They are strong, strong indeed. What are we going to do now? Are there any gardeners left? Are there any?",
@@ -416,7 +416,7 @@ OnMyMobDead:
 	end;
 }
 
-1@mist,345,186,0	script	The Gardeners' Tree	527,{
+1@mist,345,186,0	script	The Gardeners' Tree	4_CREEPER,{
 	callfunc "F_Mora_Mist",
 		"#to_bif02",
 		"Roaring Whisper: The forest will remember you! It will remember you, the one who broke the clippers of all the gardeners!",
@@ -442,64 +442,64 @@ OnMyMobDead:
 	end;
 }
 
-1@mist,73,290,0	script	Mysterious Flower#1	844,{
+1@mist,73,290,0	script	Mysterious Flower#1	CLEAR_NPC,{
 	specialeffect EF_LEVEL99_4;
 	disablenpc instance_npcname(strnpcinfo(0));
 	getitem 12561,1; //Mysterious_Seed
 	end;
 }
-1@mist,69,295,0	duplicate(Mysterious Flower#1)	Mysterious Flower#2	844
-1@mist,62,291,0	duplicate(Mysterious Flower#1)	Mysterious Flower#3	844
-1@mist,54,293,0	duplicate(Mysterious Flower#1)	Mysterious Flower#4	844
-1@mist,48,286,0	duplicate(Mysterious Flower#1)	Mysterious Flower#5	844
-1@mist,54,277,0	duplicate(Mysterious Flower#1)	Mysterious Flower#6	844
-1@mist,52,270,0	duplicate(Mysterious Flower#1)	Mysterious Flower#7	844
-1@mist,62,268,0	duplicate(Mysterious Flower#1)	Mysterious Flower#8	844
-1@mist,72,271,0	duplicate(Mysterious Flower#1)	Mysterious Flower#9	844
-1@mist,72,276,0	duplicate(Mysterious Flower#1)	Mysterious Flower#10	844
-1@mist,118,194,0	duplicate(Mysterious Flower#1)	Mysterious Flower#11	844
-1@mist,122,204,0	duplicate(Mysterious Flower#1)	Mysterious Flower#12	844
-1@mist,137,209,0	duplicate(Mysterious Flower#1)	Mysterious Flower#13	844
-1@mist,144,203,0	duplicate(Mysterious Flower#1)	Mysterious Flower#14	844
-1@mist,146,186,0	duplicate(Mysterious Flower#1)	Mysterious Flower#15	844
-1@mist,142,182,0	duplicate(Mysterious Flower#1)	Mysterious Flower#16	844
-1@mist,132,179,0	duplicate(Mysterious Flower#1)	Mysterious Flower#17	844
-1@mist,123,184,0	duplicate(Mysterious Flower#1)	Mysterious Flower#18	844
-1@mist,194,118,0	duplicate(Mysterious Flower#1)	Mysterious Flower#19	844
-1@mist,188,109,0	duplicate(Mysterious Flower#1)	Mysterious Flower#20	844
-1@mist,193,94,0	duplicate(Mysterious Flower#1)	Mysterious Flower#21	844
-1@mist,205,92,0	duplicate(Mysterious Flower#1)	Mysterious Flower#22	844
-1@mist,213,96,0	duplicate(Mysterious Flower#1)	Mysterious Flower#23	844
-1@mist,216,103,0	duplicate(Mysterious Flower#1)	Mysterious Flower#24	844
-1@mist,212,116,0	duplicate(Mysterious Flower#1)	Mysterious Flower#25	844
-1@mist,207,120,0	duplicate(Mysterious Flower#1)	Mysterious Flower#26	844
-1@mist,169,310,0	duplicate(Mysterious Flower#1)	Mysterious Flower#27	844
-1@mist,172,296,0	duplicate(Mysterious Flower#1)	Mysterious Flower#28	844
-1@mist,191,301,0	duplicate(Mysterious Flower#1)	Mysterious Flower#30	844
-1@mist,195,301,0	duplicate(Mysterious Flower#1)	Mysterious Flower#31	844
-1@mist,192,316,0	duplicate(Mysterious Flower#1)	Mysterious Flower#32	844
-1@mist,187,320,0	duplicate(Mysterious Flower#1)	Mysterious Flower#33	844
-1@mist,174,318,0	duplicate(Mysterious Flower#1)	Mysterious Flower#34	844
-1@mist,308,136,0	duplicate(Mysterious Flower#1)	Mysterious Flower#35	844
-1@mist,314,122,0	duplicate(Mysterious Flower#1)	Mysterious Flower#36	844
-1@mist,321,118,0	duplicate(Mysterious Flower#1)	Mysterious Flower#37	844
-1@mist,331,123,0	duplicate(Mysterious Flower#1)	Mysterious Flower#38	844
-1@mist,335,126,0	duplicate(Mysterious Flower#1)	Mysterious Flower#39	844
-1@mist,332,141,0	duplicate(Mysterious Flower#1)	Mysterious Flower#40	844
-1@mist,328,144,0	duplicate(Mysterious Flower#1)	Mysterious Flower#41	844
-1@mist,314,144,0	duplicate(Mysterious Flower#1)	Mysterious Flower#42	844
-1@mist,238,224,0	duplicate(Mysterious Flower#1)	Mysterious Flower#43	844
-1@mist,244,231,0	duplicate(Mysterious Flower#1)	Mysterious Flower#44	844
-1@mist,257,232,0	duplicate(Mysterious Flower#1)	Mysterious Flower#45	844
-1@mist,262,229,0	duplicate(Mysterious Flower#1)	Mysterious Flower#46	844
-1@mist,265,216,0	duplicate(Mysterious Flower#1)	Mysterious Flower#47	844
-1@mist,260,214,0	duplicate(Mysterious Flower#1)	Mysterious Flower#48	844
-1@mist,252,206,0	duplicate(Mysterious Flower#1)	Mysterious Flower#49	844
-1@mist,244,211,0	duplicate(Mysterious Flower#1)	Mysterious Flower#50	844
+1@mist,69,295,0	duplicate(Mysterious Flower#1)	Mysterious Flower#2	CLEAR_NPC
+1@mist,62,291,0	duplicate(Mysterious Flower#1)	Mysterious Flower#3	CLEAR_NPC
+1@mist,54,293,0	duplicate(Mysterious Flower#1)	Mysterious Flower#4	CLEAR_NPC
+1@mist,48,286,0	duplicate(Mysterious Flower#1)	Mysterious Flower#5	CLEAR_NPC
+1@mist,54,277,0	duplicate(Mysterious Flower#1)	Mysterious Flower#6	CLEAR_NPC
+1@mist,52,270,0	duplicate(Mysterious Flower#1)	Mysterious Flower#7	CLEAR_NPC
+1@mist,62,268,0	duplicate(Mysterious Flower#1)	Mysterious Flower#8	CLEAR_NPC
+1@mist,72,271,0	duplicate(Mysterious Flower#1)	Mysterious Flower#9	CLEAR_NPC
+1@mist,72,276,0	duplicate(Mysterious Flower#1)	Mysterious Flower#10	CLEAR_NPC
+1@mist,118,194,0	duplicate(Mysterious Flower#1)	Mysterious Flower#11	CLEAR_NPC
+1@mist,122,204,0	duplicate(Mysterious Flower#1)	Mysterious Flower#12	CLEAR_NPC
+1@mist,137,209,0	duplicate(Mysterious Flower#1)	Mysterious Flower#13	CLEAR_NPC
+1@mist,144,203,0	duplicate(Mysterious Flower#1)	Mysterious Flower#14	CLEAR_NPC
+1@mist,146,186,0	duplicate(Mysterious Flower#1)	Mysterious Flower#15	CLEAR_NPC
+1@mist,142,182,0	duplicate(Mysterious Flower#1)	Mysterious Flower#16	CLEAR_NPC
+1@mist,132,179,0	duplicate(Mysterious Flower#1)	Mysterious Flower#17	CLEAR_NPC
+1@mist,123,184,0	duplicate(Mysterious Flower#1)	Mysterious Flower#18	CLEAR_NPC
+1@mist,194,118,0	duplicate(Mysterious Flower#1)	Mysterious Flower#19	CLEAR_NPC
+1@mist,188,109,0	duplicate(Mysterious Flower#1)	Mysterious Flower#20	CLEAR_NPC
+1@mist,193,94,0	duplicate(Mysterious Flower#1)	Mysterious Flower#21	CLEAR_NPC
+1@mist,205,92,0	duplicate(Mysterious Flower#1)	Mysterious Flower#22	CLEAR_NPC
+1@mist,213,96,0	duplicate(Mysterious Flower#1)	Mysterious Flower#23	CLEAR_NPC
+1@mist,216,103,0	duplicate(Mysterious Flower#1)	Mysterious Flower#24	CLEAR_NPC
+1@mist,212,116,0	duplicate(Mysterious Flower#1)	Mysterious Flower#25	CLEAR_NPC
+1@mist,207,120,0	duplicate(Mysterious Flower#1)	Mysterious Flower#26	CLEAR_NPC
+1@mist,169,310,0	duplicate(Mysterious Flower#1)	Mysterious Flower#27	CLEAR_NPC
+1@mist,172,296,0	duplicate(Mysterious Flower#1)	Mysterious Flower#28	CLEAR_NPC
+1@mist,191,301,0	duplicate(Mysterious Flower#1)	Mysterious Flower#30	CLEAR_NPC
+1@mist,195,301,0	duplicate(Mysterious Flower#1)	Mysterious Flower#31	CLEAR_NPC
+1@mist,192,316,0	duplicate(Mysterious Flower#1)	Mysterious Flower#32	CLEAR_NPC
+1@mist,187,320,0	duplicate(Mysterious Flower#1)	Mysterious Flower#33	CLEAR_NPC
+1@mist,174,318,0	duplicate(Mysterious Flower#1)	Mysterious Flower#34	CLEAR_NPC
+1@mist,308,136,0	duplicate(Mysterious Flower#1)	Mysterious Flower#35	CLEAR_NPC
+1@mist,314,122,0	duplicate(Mysterious Flower#1)	Mysterious Flower#36	CLEAR_NPC
+1@mist,321,118,0	duplicate(Mysterious Flower#1)	Mysterious Flower#37	CLEAR_NPC
+1@mist,331,123,0	duplicate(Mysterious Flower#1)	Mysterious Flower#38	CLEAR_NPC
+1@mist,335,126,0	duplicate(Mysterious Flower#1)	Mysterious Flower#39	CLEAR_NPC
+1@mist,332,141,0	duplicate(Mysterious Flower#1)	Mysterious Flower#40	CLEAR_NPC
+1@mist,328,144,0	duplicate(Mysterious Flower#1)	Mysterious Flower#41	CLEAR_NPC
+1@mist,314,144,0	duplicate(Mysterious Flower#1)	Mysterious Flower#42	CLEAR_NPC
+1@mist,238,224,0	duplicate(Mysterious Flower#1)	Mysterious Flower#43	CLEAR_NPC
+1@mist,244,231,0	duplicate(Mysterious Flower#1)	Mysterious Flower#44	CLEAR_NPC
+1@mist,257,232,0	duplicate(Mysterious Flower#1)	Mysterious Flower#45	CLEAR_NPC
+1@mist,262,229,0	duplicate(Mysterious Flower#1)	Mysterious Flower#46	CLEAR_NPC
+1@mist,265,216,0	duplicate(Mysterious Flower#1)	Mysterious Flower#47	CLEAR_NPC
+1@mist,260,214,0	duplicate(Mysterious Flower#1)	Mysterious Flower#48	CLEAR_NPC
+1@mist,252,206,0	duplicate(Mysterious Flower#1)	Mysterious Flower#49	CLEAR_NPC
+1@mist,244,211,0	duplicate(Mysterious Flower#1)	Mysterious Flower#50	CLEAR_NPC
 
 // Wandering Guardian Quest
 //============================================================
-1@mist,2,2,0	script	#Dragon Herder	844,{
+1@mist,2,2,0	script	#Dragon Herder	CLEAR_NPC,{
 	end;
 OnInstanceInit:
 	switch(rand(1,6)) {
@@ -529,7 +529,7 @@ OnTimer3000:
 	end;
 }
 
-1@mist,97,30,3	script	Mysterious Young Man#mis	512,{
+1@mist,97,30,3	script	Mysterious Young Man#mis	4_M_ROKI2,{
 	if (BaseLevel < 98) {
 		mes "[Mysterious Young Man]";
 		mes "Huh? Do you plan to pass through here?";
@@ -677,7 +677,7 @@ OnDisable:
 	end;
 }
 
-1@mist,183,304,3	script	Loki#mist	512,{
+1@mist,183,304,3	script	Loki#mist	4_M_ROKI2,{
 	if (ep14_1_mistwoods < 2) {
 		mes "[Loki]";
 		mes "An adventurer in the forest.";
@@ -731,7 +731,7 @@ OnEnable:
 	end;
 }
 
-1@mist,181,303,3	script	Collapsed Girl#mist	511,{
+1@mist,181,303,3	script	Collapsed Girl#mist	4_F_NYDHOG2,{
 	mes "You see a girl with mysterious hair collapsed on the ground.";
 	mes "As you approach her, you smell the scent of flowers so strong that it makes you dizzy.";
 	close;
@@ -744,7 +744,7 @@ OnEnable:
 	end;
 }
 
-mora,46,152,5	script	Flower Smelling Lady	510,{
+mora,46,152,5	script	Flower Smelling Lady	4_F_NYDHOG,{
 	if (ep14_1_mistwoods < 3) {
 		mes "[Flower Smell Lady]";
 		mes "I need rest.";
@@ -799,7 +799,7 @@ mora,46,152,5	script	Flower Smelling Lady	510,{
 	}
 }
 
-mora,48,152,3	script	Sharp Eyed Man	512,{
+mora,48,152,3	script	Sharp Eyed Man	4_M_ROKI2,{
 	if (checkweight(1201,1) == 0 || MaxWeight - Weight < 1000) {
 		mes "- You have too many items to do this quest. -";
 		close;
@@ -921,7 +921,7 @@ mora,48,152,3	script	Sharp Eyed Man	512,{
 
 // Monster Spawns
 //============================================================
-1@mist,1,1,0	script	#Mist Mobs Respawn1	844,{
+1@mist,1,1,0	script	#Mist Mobs Respawn1	CLEAR_NPC,{
 	end;
 OnInstanceInit:
 	monster instance_mapname("1@mist"),0,0,"Miming",2137,15,instance_npcname("#Mist Mobs Respawn1")+"::OnMyMobDead";
@@ -934,7 +934,7 @@ OnMyMobDead:
 	end;
 }
 
-1@mist,1,2,0	script	#Mist Mobs Respawn2	844,{
+1@mist,1,2,0	script	#Mist Mobs Respawn2	CLEAR_NPC,{
 	end;
 OnInstanceInit:
 	monster instance_mapname("1@mist"),0,0,"Pom Spider",2132,35,instance_npcname("#Mist Mobs Respawn2")+"::OnMyMobDead";
@@ -947,7 +947,7 @@ OnMyMobDead:
 	end;
 }
 
-1@mist,1,3,0	script	#Mist Mobs Respawn3	844,{
+1@mist,1,3,0	script	#Mist Mobs Respawn3	CLEAR_NPC,{
 	end;
 OnInstanceInit:
 	monster instance_mapname("1@mist"),0,0,"Angra Mantis",2133,35,instance_npcname("#Mist Mobs Respawn3")+"::OnMyMobDead";
@@ -960,7 +960,7 @@ OnMyMobDead:
 	end;
 }
 
-1@mist,1,4,0	script	#Mist Mobs Respawn4	844,{
+1@mist,1,4,0	script	#Mist Mobs Respawn4	CLEAR_NPC,{
 	end;
 OnInstanceInit:
 	monster instance_mapname("1@mist"),0,0,"Parus",2134,35,instance_npcname("#Mist Mobs Respawn4")+"::OnMyMobDead";
@@ -973,7 +973,7 @@ OnMyMobDead:
 	end;
 }
 
-1@mist,1,5,0	script	#Mist Mobs Respawn5	844,{
+1@mist,1,5,0	script	#Mist Mobs Respawn5	CLEAR_NPC,{
 	end;
 OnInstanceInit:
 	monster instance_mapname("1@mist"),0,0,"Little Fatum",2136,15,instance_npcname("#Mist Mobs Respawn5")+"::OnMyMobDead";
@@ -986,7 +986,7 @@ OnMyMobDead:
 	end;
 }
 
-1@mist,1,6,0	script	#Fragments of Memory	844,{
+1@mist,1,6,0	script	#Fragments of Memory	CLEAR_NPC,{
 	end;
 OnInstanceInit:
 	disablenpc instance_npcname("#Fragments of Memory");
@@ -996,7 +996,7 @@ OnInstanceInit:
 
 // Warp Portals
 //============================================================
-bif_fild01,38,374,0	script	Mysterious Flower#ep14_1	844,{
+bif_fild01,38,374,0	script	Mysterious Flower#ep14_1	CLEAR_NPC,{
 	mes "It's a giant flower with mysterious energy.";
 	if (countitem(12561)) {
 		mes "It's reacting to the Mysterious Flower Seeds you have with you.";
@@ -1021,7 +1021,7 @@ bif_fild01,38,374,0	script	Mysterious Flower#ep14_1	844,{
 
 1@mist,104,23,0	warp	#to_bif01	1,1,bif_fild01,160,352
 
-1@mist,109,70,0	script	a1_a2	45,1,1,{
+1@mist,109,70,0	script	a1_a2	WARPNPC,1,1,{
 	end;
 OnTouch:
 	if (checkquest(7211,PLAYTIME) == -1)
@@ -1125,7 +1125,7 @@ OnTouch:
 
 // Disable Garden Tree warps.
 // Custom, but saves processing and lines.
-1@mist,1,1,0	script	#mist_warp_init	844,{
+1@mist,1,1,0	script	#mist_warp_init	CLEAR_NPC,{
 	end;
 OnInstanceInit:
 	disablenpc instance_npcname("a25_a18-1");