1 files changed, 30 insertions, 30 deletions

diff --git a/npc/guild2/guild_flags.txt b/npc/guild2/guild_flags.txt
index c5cf9bbc1..bfbca227d 100644
--- a/npc/guild2/guild_flags.txt
+++ b/npc/guild2/guild_flags.txt
@@ -11,93 +11,93 @@
 //============================================================
 
 // Juno
-yuno,109,167,5	script	Himinn	722,{
+yuno,109,167,5	script	Himinn	GUILD_FLAG,{
 	end;
 
 OnAgitInit2:
-OnRecvCastlesc01:
-	FlagEmblem GetCastleData("schg_cas01",1);
+OnRecvCastleSc01:
+	flagemblem getcastledata("schg_cas01",1);
 	end;
 }
 
-yuno,110,171,5	script	Andlangr	722,{
+yuno,110,171,5	script	Andlangr	GUILD_FLAG,{
 	end;
 
 OnAgitInit2:
-OnRecvCastlesc02:
-	FlagEmblem GetCastleData("schg_cas02",1);
+OnRecvCastleSc02:
+	flagemblem getcastledata("schg_cas02",1);
 	end;
 }
 
-yuno,111,175,5	script	Viblainn	722,{
+yuno,111,175,5	script	Viblainn	GUILD_FLAG,{
 	end;
 
 OnAgitInit2:
-OnRecvCastlesc03:
-	FlagEmblem GetCastleData("schg_cas03",1);
+OnRecvCastleSc03:
+	flagemblem getcastledata("schg_cas03",1);
 	end;
 }
 
-yuno,112,179,5	script	Hljod	722,{
+yuno,112,179,5	script	Hljod	GUILD_FLAG,{
 	end;
 
 OnAgitInit2:
-OnRecvCastlesc04:
-	FlagEmblem GetCastleData("schg_cas04",1);
+OnRecvCastleSc04:
+	flagemblem getcastledata("schg_cas04",1);
 	end;
 }
 
-yuno,114,183,5	script	Skidbladnir	722,{
+yuno,114,183,5	script	Skidbladnir	GUILD_FLAG,{
 	end;
 
 OnAgitInit2:
-OnRecvCastlesc05:
-	FlagEmblem GetCastleData("schg_cas05",1);
+OnRecvCastleSc05:
+	flagemblem getcastledata("schg_cas05",1);
 	end;
 }
 
 // Arunafeltz
-rachel,124,120,3	script	Mardol	722,{
+rachel,124,120,3	script	Mardol	GUILD_FLAG,{
 	end;
 
 OnAgitInit2:
-OnRecvCastlear01:
-	FlagEmblem GetCastleData("arug_cas01",1);
+OnRecvCastleAr01:
+	flagemblem getcastledata("arug_cas01",1);
 	end;
 }
 
-rachel,136,120,5	script	Cyr	722,{
+rachel,136,120,5	script	Cyr	GUILD_FLAG,{
 	end;
 
 OnAgitInit2:
-OnRecvCastlear02:
-	FlagEmblem GetCastleData("arug_cas02",1);
+OnRecvCastleAr02:
+	flagemblem getcastledata("arug_cas02",1);
 	end;
 }
 
-rachel,138,126,6	script	Horn	722,{
+rachel,138,126,6	script	Horn	GUILD_FLAG,{
 	end;
 
 OnAgitInit2:
-OnRecvCastlear03:
-	FlagEmblem GetCastleData("arug_cas03",1);
+OnRecvCastleAr03:
+	flagemblem getcastledata("arug_cas03",1);
 	end;
 }
 
-rachel,135,131,7	script	Gefn	722,{
+rachel,135,131,7	script	Gefn	GUILD_FLAG,{
 	end;
 
 OnAgitInit2:
-OnRecvCastlear04:
-	FlagEmblem GetCastleData("arug_cas04",1);
+OnRecvCastleAr04:
+	flagemblem getcastledata("arug_cas04",1);
 	end;
 }
 
-rachel,124,130,1	script	Banadis	722,{
+rachel,124,130,1	script	Banadis	GUILD_FLAG,{
 	end;
 
 OnAgitInit2:
-OnRecvCastlear05:
-	FlagEmblem GetCastleData("arug_cas05",1);
+OnRecvCastleAr05:
+	flagemblem getcastledata("arug_cas05",1);
 	end;
 }