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

2 files changed, 28 insertions, 28 deletions

diff --git a/npc/re/warps/cities/dicastes.txt b/npc/re/warps/cities/dicastes.txt
index 8d43c8edd..6ad933aa3 100644
--- a/npc/re/warps/cities/dicastes.txt
+++ b/npc/re/warps/cities/dicastes.txt
@@ -30,7 +30,7 @@ dicastes02,120,237,0	warp	eldicastes0013	1,1,dic_in01,45,246
 dic_in01,45,244,0	warp	eldicastes0014	1,1,dicastes02,119,235
 dic_in01,299,248,0	warp	eldicastes0015	1,1,dic_in01,262,191
 
-dic_in01,242,182,0	script	#eldicastes0016	844,{
+dic_in01,242,182,0	script	#eldicastes0016	CLEAR_NPC,{
 	if (isequipped(2782)) select("Administrative Office");
 	else select("¡÷¡ú¡ð");
 	warp "dic_in01",138,221;
@@ -57,16 +57,16 @@ dic_in01,242,182,0	script	#eldicastes0016	844,{
 	warp "dic_in01",.@xy[.@m*2],.@xy[.@m*2+1];
 	end;
 }
-dic_in01,46,288,0	duplicate(Elevator#main)	Elevator#1	844
-dic_in01,122,284,0	duplicate(Elevator#main)	Elevator#2	844
-dic_in01,121,203,0	duplicate(Elevator#main)	Elevator#3	844
-dic_in01,35,214,0	duplicate(Elevator#main)	Elevator#4	844
-dic_in01,44,116,0	duplicate(Elevator#main)	Elevator#5	844
-dic_in01,112,108,0	duplicate(Elevator#main)	Elevator#6	844
-dic_in01,180,108,0	duplicate(Elevator#main)	Elevator#7	844
-dic_in01,261,115,0	duplicate(Elevator#main)	Elevator#8	844
-dic_in01,57,48,0	duplicate(Elevator#main)	Elevator#9	844
-dic_in01,137,46,0	duplicate(Elevator#main)	Elevator#10	844
-dic_in01,222,46,0	duplicate(Elevator#main)	Elevator#11	844
-dic_in01,388,272,0	duplicate(Elevator#main)	Elevator#12	844
-dic_in01,389,208,0	duplicate(Elevator#main)	Elevator#13	844
\ No newline at end of file
+dic_in01,46,288,0	duplicate(Elevator#main)	Elevator#1	CLEAR_NPC
+dic_in01,122,284,0	duplicate(Elevator#main)	Elevator#2	CLEAR_NPC
+dic_in01,121,203,0	duplicate(Elevator#main)	Elevator#3	CLEAR_NPC
+dic_in01,35,214,0	duplicate(Elevator#main)	Elevator#4	CLEAR_NPC
+dic_in01,44,116,0	duplicate(Elevator#main)	Elevator#5	CLEAR_NPC
+dic_in01,112,108,0	duplicate(Elevator#main)	Elevator#6	CLEAR_NPC
+dic_in01,180,108,0	duplicate(Elevator#main)	Elevator#7	CLEAR_NPC
+dic_in01,261,115,0	duplicate(Elevator#main)	Elevator#8	CLEAR_NPC
+dic_in01,57,48,0	duplicate(Elevator#main)	Elevator#9	CLEAR_NPC
+dic_in01,137,46,0	duplicate(Elevator#main)	Elevator#10	CLEAR_NPC
+dic_in01,222,46,0	duplicate(Elevator#main)	Elevator#11	CLEAR_NPC
+dic_in01,388,272,0	duplicate(Elevator#main)	Elevator#12	CLEAR_NPC
+dic_in01,389,208,0	duplicate(Elevator#main)	Elevator#13	CLEAR_NPC
\ No newline at end of file
diff --git a/npc/re/warps/cities/malaya.txt b/npc/re/warps/cities/malaya.txt
index b18a1f52d..190f1831a 100644
--- a/npc/re/warps/cities/malaya.txt
+++ b/npc/re/warps/cities/malaya.txt
@@ -32,7 +32,7 @@ ma_in01,105,160,0	warp	mf_in_minga_mf_minga	1,1,ma_fild01,248,190
 
 // Locked Warps
 //============================================================
-malaya,178,211,0	script	malaya_inn	45,1,1,{
+malaya,178,211,0	script	malaya_inn	WARPNPC,1,1,{
 	end;
 OnTouch:
 	if (malaya_hi < 10) {
@@ -43,7 +43,7 @@ OnTouch:
 	end;
 }
 
-malaya,112,212,0	script	malaya_ws	45,1,1,{
+malaya,112,212,0	script	malaya_ws	WARPNPC,1,1,{
 	end;
 OnTouch:
 	if (malaya_hi < 20) {
@@ -54,7 +54,7 @@ OnTouch:
 	end;
 }
 
-malaya,299,167,0	script	malaya_ts	45,1,1,{
+malaya,299,167,0	script	malaya_ts	WARPNPC,1,1,{
 	end;
 OnTouch:
 	if (malaya_hi < 20) {
@@ -65,7 +65,7 @@ OnTouch:
 	end;
 }
 
-malaya,261,240,0	script	malaya_shop	45,1,1,{
+malaya,261,240,0	script	malaya_shop	WARPNPC,1,1,{
 	end;
 OnTouch:
 	if (malaya_hi < 20) {
@@ -76,7 +76,7 @@ OnTouch:
 	end;
 }
 
-malaya,300,211,0	script	malaya_house01	45,1,1,{
+malaya,300,211,0	script	malaya_house01	WARPNPC,1,1,{
 	end;
 OnTouch:
 	if (malaya_hi < 10) {
@@ -123,17 +123,17 @@ function	script	F_Malaya_Warp	{
 	end;
 }
 
-ma_zif01,30,22,0	script	Town Warp#zif01	45,1,1,{ callfunc "F_Malaya_Warp","Center","Southwest","Southeast",1; }
-ma_zif02,30,22,0	script	Town Warp#zif02	45,1,1,{ callfunc "F_Malaya_Warp","Southwest","Center","Southeast",1; }
-ma_zif03,30,22,0	script	Town Warp#zif03	45,1,1,{ callfunc "F_Malaya_Warp","Southeast","Center","Southwest",1; }
+ma_zif01,30,22,0	script	Town Warp#zif01	WARPNPC,1,1,{ callfunc "F_Malaya_Warp","Center","Southwest","Southeast",1; }
+ma_zif02,30,22,0	script	Town Warp#zif02	WARPNPC,1,1,{ callfunc "F_Malaya_Warp","Southwest","Center","Southeast",1; }
+ma_zif03,30,22,0	script	Town Warp#zif03	WARPNPC,1,1,{ callfunc "F_Malaya_Warp","Southeast","Center","Southwest",1; }
 
-ma_zif04,30,22,0	script	Town Warp#zif04	45,1,1,{ callfunc "F_Malaya_Warp","Northwest","Southeast","Northeast",2; }
-ma_zif05,30,22,0	script	Town Warp#zif05	45,1,1,{ callfunc "F_Malaya_Warp","Southeast","Northwest","Northeast",2; }
-ma_zif06,30,22,0	script	Town Warp#zif06	45,1,1,{ callfunc "F_Malaya_Warp","Northeast","Northwest","Southeast",2; }
+ma_zif04,30,22,0	script	Town Warp#zif04	WARPNPC,1,1,{ callfunc "F_Malaya_Warp","Northwest","Southeast","Northeast",2; }
+ma_zif05,30,22,0	script	Town Warp#zif05	WARPNPC,1,1,{ callfunc "F_Malaya_Warp","Southeast","Northwest","Northeast",2; }
+ma_zif06,30,22,0	script	Town Warp#zif06	WARPNPC,1,1,{ callfunc "F_Malaya_Warp","Northeast","Northwest","Southeast",2; }
 
-ma_zif07,30,22,0	script	Town Warp#zif07	45,1,1,{ callfunc "F_Malaya_Warp","Center","Northwest","Southeast",3; }
-ma_zif08,30,22,0	script	Town Warp#zif08	45,1,1,{ callfunc "F_Malaya_Warp","Northwest","Center","Southeast",3; }
-ma_zif09,30,22,0	script	Town Warp#zif09	45,1,1,{ callfunc "F_Malaya_Warp","Southeast","Center","Northwest",3; }
+ma_zif07,30,22,0	script	Town Warp#zif07	WARPNPC,1,1,{ callfunc "F_Malaya_Warp","Center","Northwest","Southeast",3; }
+ma_zif08,30,22,0	script	Town Warp#zif08	WARPNPC,1,1,{ callfunc "F_Malaya_Warp","Northwest","Center","Southeast",3; }
+ma_zif09,30,22,0	script	Town Warp#zif09	WARPNPC,1,1,{ callfunc "F_Malaya_Warp","Southeast","Center","Northwest",3; }
 
 //ma_zif01,30,22,0	warp	malaya_car0001	1,1,malaya,241,238
 //ma_zif02,30,22,0	warp	malaya_car0002	1,1,malaya,71,43