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

1 files changed, 38 insertions, 38 deletions

diff --git a/npc/guild2/arug_cas04.txt b/npc/guild2/arug_cas04.txt
index c46c7ff15..c74ad619f 100644
--- a/npc/guild2/arug_cas04.txt
+++ b/npc/guild2/arug_cas04.txt
@@ -18,38 +18,38 @@
 -	duplicate(RL#template)	RL2#arug_cas04	-1
 -	duplicate(RL#template)	RL3#arug_cas04	-1
 
-arug_cas04,328,98,3	duplicate(Steward#template)	Steward#ar04	55
-arug_cas04,146,315,3	duplicate(Guardian#template)	Nios#ar04	868
-arug_cas04,315,98,5	duplicate(Kafra#template)	Kafra Employee#ar04	117
-arug_cas04,65,171,0	duplicate(Guardian Stone#template)	1st Guardian Stone#ar04	844
-arug_cas04,212,149,0	duplicate(Guardian Stone#template)	2nd Guardian Stone#ar04	844
-arug_cas04,136,158,0	duplicate(Control#template)	Control Device01#ar04	111
-arug_cas04,135,212,0	duplicate(Control#template)	Control Device02#ar04	111
-arug_cas04,134,266,0	duplicate(Control#template)	Control Device03#ar04	111
-arug_cas04,299,277,0	duplicate(Switch#template)	#aru04_switch	111
-arug_cas04,312,154,3	duplicate(Sunflower#template)	Mysterious Sunflower#09	977
+arug_cas04,328,98,3	duplicate(Steward#template)	Steward#ar04	1_M_JOBTESTER
+arug_cas04,146,315,3	duplicate(Guardian#template)	Nios#ar04	4_M_LGTGUARD
+arug_cas04,315,98,5	duplicate(Kafra#template)	Kafra Employee#ar04	4_F_KAFRA1
+arug_cas04,65,171,0	duplicate(Guardian Stone#template)	1st Guardian Stone#ar04	CLEAR_NPC
+arug_cas04,212,149,0	duplicate(Guardian Stone#template)	2nd Guardian Stone#ar04	CLEAR_NPC
+arug_cas04,136,158,0	duplicate(Control#template)	Control Device01#ar04	HIDDEN_NPC
+arug_cas04,135,212,0	duplicate(Control#template)	Control Device02#ar04	HIDDEN_NPC
+arug_cas04,134,266,0	duplicate(Control#template)	Control Device03#ar04	HIDDEN_NPC
+arug_cas04,299,277,0	duplicate(Switch#template)	#aru04_switch	HIDDEN_NPC
+arug_cas04,312,154,3	duplicate(Sunflower#template)	Mysterious Sunflower#09	4_RED_FLOWER
 
-arug_cas04,122,314,0	script	LF-01#arug_cas04	111,{ callfunc "LinkFlag","First Gate House",84,158,"Second Gate House",197,136; }
-arug_cas04,125,314,0	script	LF-02#arug_cas04	111,{ callfunc "LinkFlag","Defense Area 1-1",65,94,"Defense Area 1-2",211,97; }
-arug_cas04,128,314,0	script	LF-03#arug_cas04	111,{ callfunc "LinkFlag","Defense Area 1-3",112,73,"Defense Area 1-4",171,73; }
-arug_cas04,131,314,0	script	LF-04#arug_cas04	111,{ callfunc "LinkFlag","Defense Area 2-1",112,152,"Defense Area 2-2",172,152; }
-arug_cas04,134,314,0	script	LF-05#arug_cas04	111,{ callfunc "LinkFlag","Defense Area 2-3",120,186,"Defense Area 2-4",162,186; }
-arug_cas04,149,314,0	script	LF-06#arug_cas04	111,{ callfunc "LinkFlag","Defense Area 3-1",116,235,"Defense Area 3-2",164,235; }
-arug_cas04,152,314,0	script	LF-07#arug_cas04	111,{ callfunc "LinkFlag","Defense Area 1-1",65,94,"Defense Area 2-1",112,152,"Defense Area 3-1",116,235; }
-arug_cas04,155,314,0	script	LF-08#arug_cas04	111,{ callfunc "LinkFlag","Defense Area 1-2",211,97,"Defense Area 2-2",172,152,"Defense Area 3-2",164,235; }
-arug_cas04,158,314,0	script	LF-09#arug_cas04	111,{ callfunc "LinkFlag","Defense Area 1-4",171,73,"Defense Area 2-4",162,186; }
-arug_cas04,161,314,0	script	LF-10#arug_cas04	111,{ callfunc "LinkFlag","Convenience Facility",321,57; }
-arug_cas04,45,158,0	script	Gefn#LF_ar04_01::LF_ar04_01	111,{ callfunc "LinkFlag","Emperium Center",121,318; }
-arug_cas04,226,156,0	duplicate(LF_ar04_01)	Gefn#LF_ar04_01	111
-arug_cas04,134,62,4	duplicate(LF_ar04_01)	Gefn#LF_ar04_02	111
-arug_cas04,149,62,4	duplicate(LF_ar04_01)	Gefn#LF_ar04_03	111
-arug_cas04,123,154,0	duplicate(LF_ar04_01)	Gefn#LF_ar04_04	111
-arug_cas04,160,154,0	duplicate(LF_ar04_01)	Gefn#LF_ar04_05	111
-arug_cas04,135,205,0	duplicate(LF_ar04_01)	Gefn#LF_ar04_06	111
-arug_cas04,148,205,0	duplicate(LF_ar04_01)	Gefn#LF_ar04_07	111
-arug_cas04,134,260,0	duplicate(LF_ar04_01)	Gefn#LF_ar04_08	111
-//arug_cas04,204,142,0	duplicate(LF_ar04_01)	Gefn#LF_ar04_09	111
-arug_cas04,148,103,4	script	Gefn#LF_ar04_10::LF_ar04_02	722,{
+arug_cas04,122,314,0	script	LF-01#arug_cas04	HIDDEN_NPC,{ callfunc "LinkFlag","First Gate House",84,158,"Second Gate House",197,136; }
+arug_cas04,125,314,0	script	LF-02#arug_cas04	HIDDEN_NPC,{ callfunc "LinkFlag","Defense Area 1-1",65,94,"Defense Area 1-2",211,97; }
+arug_cas04,128,314,0	script	LF-03#arug_cas04	HIDDEN_NPC,{ callfunc "LinkFlag","Defense Area 1-3",112,73,"Defense Area 1-4",171,73; }
+arug_cas04,131,314,0	script	LF-04#arug_cas04	HIDDEN_NPC,{ callfunc "LinkFlag","Defense Area 2-1",112,152,"Defense Area 2-2",172,152; }
+arug_cas04,134,314,0	script	LF-05#arug_cas04	HIDDEN_NPC,{ callfunc "LinkFlag","Defense Area 2-3",120,186,"Defense Area 2-4",162,186; }
+arug_cas04,149,314,0	script	LF-06#arug_cas04	HIDDEN_NPC,{ callfunc "LinkFlag","Defense Area 3-1",116,235,"Defense Area 3-2",164,235; }
+arug_cas04,152,314,0	script	LF-07#arug_cas04	HIDDEN_NPC,{ callfunc "LinkFlag","Defense Area 1-1",65,94,"Defense Area 2-1",112,152,"Defense Area 3-1",116,235; }
+arug_cas04,155,314,0	script	LF-08#arug_cas04	HIDDEN_NPC,{ callfunc "LinkFlag","Defense Area 1-2",211,97,"Defense Area 2-2",172,152,"Defense Area 3-2",164,235; }
+arug_cas04,158,314,0	script	LF-09#arug_cas04	HIDDEN_NPC,{ callfunc "LinkFlag","Defense Area 1-4",171,73,"Defense Area 2-4",162,186; }
+arug_cas04,161,314,0	script	LF-10#arug_cas04	HIDDEN_NPC,{ callfunc "LinkFlag","Convenience Facility",321,57; }
+arug_cas04,45,158,0	script	Gefn#LF_ar04_01::LF_ar04_01	HIDDEN_NPC,{ callfunc "LinkFlag","Emperium Center",121,318; }
+arug_cas04,226,156,0	duplicate(LF_ar04_01)	Gefn#LF_ar04_01	HIDDEN_NPC
+arug_cas04,134,62,4	duplicate(LF_ar04_01)	Gefn#LF_ar04_02	HIDDEN_NPC
+arug_cas04,149,62,4	duplicate(LF_ar04_01)	Gefn#LF_ar04_03	HIDDEN_NPC
+arug_cas04,123,154,0	duplicate(LF_ar04_01)	Gefn#LF_ar04_04	HIDDEN_NPC
+arug_cas04,160,154,0	duplicate(LF_ar04_01)	Gefn#LF_ar04_05	HIDDEN_NPC
+arug_cas04,135,205,0	duplicate(LF_ar04_01)	Gefn#LF_ar04_06	HIDDEN_NPC
+arug_cas04,148,205,0	duplicate(LF_ar04_01)	Gefn#LF_ar04_07	HIDDEN_NPC
+arug_cas04,134,260,0	duplicate(LF_ar04_01)	Gefn#LF_ar04_08	HIDDEN_NPC
+//arug_cas04,204,142,0	duplicate(LF_ar04_01)	Gefn#LF_ar04_09	HIDDEN_NPC
+arug_cas04,148,103,4	script	Gefn#LF_ar04_10::LF_ar04_02	GUILD_FLAG,{
 	callfunc "LinkFlag","Emperium Center",121,318;
 	end;
 OnAgitInit2:
@@ -57,11 +57,11 @@ OnRecvCastlear04:
 	FlagEmblem GetCastleData("arug_cas04",1);
 	end;
 }
-arug_cas04,135,103,4	duplicate(LF_ar04_02)	Gefn#LF_ar04_11	722
-arug_cas04,63,51,7	duplicate(LF_ar04_02)	Gefn#LF_ar04_12	722
-arug_cas04,214,51,1	duplicate(LF_ar04_02)	Gefn#LF_ar04_13	722
+arug_cas04,135,103,4	duplicate(LF_ar04_02)	Gefn#LF_ar04_11	GUILD_FLAG
+arug_cas04,63,51,7	duplicate(LF_ar04_02)	Gefn#LF_ar04_12	GUILD_FLAG
+arug_cas04,214,51,1	duplicate(LF_ar04_02)	Gefn#LF_ar04_13	GUILD_FLAG
 
-aru_gld,306,359,6	script	Gefn#flag_ar04_1::ar04_Flag	722,{
+aru_gld,306,359,6	script	Gefn#flag_ar04_1::ar04_Flag	GUILD_FLAG,{
 	callfunc "ReturnFlag","arug_cas04",1;
 	end;
 OnAgitInit2:
@@ -69,8 +69,8 @@ OnRecvCastlear04:
 	FlagEmblem GetCastleData("arug_cas04",1);
 	end;
 }
-aru_gld,306,348,6	duplicate(ar04_Flag)	Gefn#flag_ar04_2	722
-aru_gld,301,318,4	script	Gefn#flag_ar04_3::ar04_Flag2	722,{
+aru_gld,306,348,6	duplicate(ar04_Flag)	Gefn#flag_ar04_2	GUILD_FLAG
+aru_gld,301,318,4	script	Gefn#flag_ar04_3::ar04_Flag2	GUILD_FLAG,{
 	callfunc "ReturnFlag","arug_cas04",0;
 	end;
 OnAgitInit2:
@@ -78,4 +78,4 @@ OnRecvCastlear04:
 	FlagEmblem GetCastleData("arug_cas04",1);
 	end;
 }
-aru_gld,313,318,4	duplicate(ar04_Flag2)	Gefn#flag_ar04_4	722
\ No newline at end of file
+aru_gld,313,318,4	duplicate(ar04_Flag2)	Gefn#flag_ar04_4	GUILD_FLAG
\ No newline at end of file