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

8 files changed, 239 insertions, 239 deletions

diff --git a/npc/custom/battleground/bg_common.txt b/npc/custom/battleground/bg_common.txt
index 49e48c293..6f701d582 100644
--- a/npc/custom/battleground/bg_common.txt
+++ b/npc/custom/battleground/bg_common.txt
@@ -5,7 +5,7 @@
 // BattleGround Warper - Entrance
 // *********************************************************************
 
--	script	Maroll Battle Recruiter::BatRecruit	728,{
+-	script	Maroll Battle Recruiter::BatRecruit	4_F_JOB_KNIGHT,{
 	mes "[Maroll Battle Recruiter]";
 	mes "Good day, adventurer.";
 	mes "I'm a knight from a far country called Maroll Kingdom.";
@@ -26,17 +26,17 @@
 	end;
 }
 
-payon,189,104,3	duplicate(BatRecruit)	Maroll Battle Recruiter::BatRecruit1	728
-prontera,123,83,5	duplicate(BatRecruit)	Maroll Battle Recruiter::BatRecruit2	728
-rachel,149,138,5	duplicate(BatRecruit)	Maroll Battle Recruiter::BatRecruit3	728
-moc_ruins,75,162,5	duplicate(BatRecruit)	Maroll Battle Recruiter::BatRecruit4	728
-aldebaran,146,109,5	duplicate(BatRecruit)	Maroll Battle Recruiter::BatRecruit5	728
-lighthalzen,153,86,5	duplicate(BatRecruit)	Maroll Battle Recruiter::BatRecruit6	728
+payon,189,104,3	duplicate(BatRecruit)	Maroll Battle Recruiter::BatRecruit1	4_F_JOB_KNIGHT
+prontera,123,83,5	duplicate(BatRecruit)	Maroll Battle Recruiter::BatRecruit2	4_F_JOB_KNIGHT
+rachel,149,138,5	duplicate(BatRecruit)	Maroll Battle Recruiter::BatRecruit3	4_F_JOB_KNIGHT
+moc_ruins,75,162,5	duplicate(BatRecruit)	Maroll Battle Recruiter::BatRecruit4	4_F_JOB_KNIGHT
+aldebaran,146,109,5	duplicate(BatRecruit)	Maroll Battle Recruiter::BatRecruit5	4_F_JOB_KNIGHT
+lighthalzen,153,86,5	duplicate(BatRecruit)	Maroll Battle Recruiter::BatRecruit6	4_F_JOB_KNIGHT
 
 // BattleGround Warper - Exit
 // *********************************************************************
 
-bat_room,148,150,4	script	Teleporter#bat	124,{
+bat_room,148,150,4	script	Teleporter#bat	4_F_TELEPORTER,{
 	mes "[Teleporter]";
 	mes "Do you wish to leave the battlefield? Use my service to return to town.";
 	next;
@@ -59,14 +59,14 @@ bat_room,148,150,4	script	Teleporter#bat	124,{
 
 // Kafra
 // *********************************************************************
-bat_room,148,147,4	script	Kafra Staff::kaf_bat	861,{
+bat_room,148,147,4	script	Kafra Staff::kaf_bat	4_F_KAFRA9,{
 	cutin "kafra_09",2;
 	callfunc "F_Kafra",0,2,1,150,0;
 }
 
 // General Guillaume
 // *********************************************************************
-bat_room,160,159,3	script	General Guillaume	420,{
+bat_room,160,159,3	script	General Guillaume	4_M_KY_KIYOM,{
 	cutin "bat_kiyom2",2;
 	mes "[General Guillaume]";
 	mes "Hot-blooded adventurer, we need your ability to win this battle.";
@@ -105,7 +105,7 @@ bat_room,160,159,3	script	General Guillaume	420,{
 
 // General Croix
 // *********************************************************************
-bat_room,160,140,3	script	Prince Croix	416,{
+bat_room,160,140,3	script	Prince Croix	4_M_CRU_CRUA,{
 	cutin "bat_crua1",2;
 	mes "[Prince Croix]";
 	mes "Wise adventurer, why don't you lend us your power for victory?";
@@ -171,7 +171,7 @@ function	script	Time2Str	{
 
 // Guillaume Knight - Tierra Valley
 // *********************************************************************
-bat_room,159,178,5	script	Guillaume Knight#1	417,{
+bat_room,159,178,5	script	Guillaume Knight#1	4_M_KY_SOLD,{
 	mes "[Guillaume Knight]";
 	mes "Tierra Gorge is a very steep canyon with two forts residing in the north and south ends of the map.";
 	next;
@@ -190,7 +190,7 @@ bat_room,159,178,5	script	Guillaume Knight#1	417,{
 
 // Tierra Officer - Guillaume
 // *********************************************************************
-bat_room,156,178,5	script	Tierra Valley Officer#1	418,{
+bat_room,156,178,5	script	Tierra Valley Officer#1	4_M_KY_KNT,{
 	mes "[Tierra Officer]";
 	if( Bat_Team == 2 )
 	{
@@ -241,7 +241,7 @@ bat_room,156,178,5	script	Tierra Valley Officer#1	418,{
 
 // Croix Knight - Tierra Valley
 // *********************************************************************
-bat_room,159,121,1	script	Croix Knight#1	413,{
+bat_room,159,121,1	script	Croix Knight#1	4_M_CRU_SOLD,{
 	mes "[Croix Knight]";
 	mes "Tierra Gorge is a very steep canyon with two forts residing in the north and south ends of the map.";
 	next;
@@ -260,7 +260,7 @@ bat_room,159,121,1	script	Croix Knight#1	413,{
 
 // Tierra Officer - Croix
 // *********************************************************************
-bat_room,156,121,1	script	Tierra Valley Officer#2	414,{
+bat_room,156,121,1	script	Tierra Valley Officer#2	4_M_CRU_KNT,{
 	mes "[Tierra Officer]";
 	if( Bat_Team == 1 )
 	{
@@ -311,7 +311,7 @@ bat_room,156,121,1	script	Tierra Valley Officer#2	414,{
 
 // Guillaume Knight - Tierra
 // *********************************************************************
-bat_room,167,178,5	script	Guillaume Knight#2	417,{
+bat_room,167,178,5	script	Guillaume Knight#2	4_M_KY_SOLD,{
 	mes "[Guillaume Knight]";
 	mes "Tierra Gorge is a very steep canyon with two forts residing in the north and south ends of the map.";
 	next;
@@ -330,7 +330,7 @@ bat_room,167,178,5	script	Guillaume Knight#2	417,{
 
 // Tierra Officer - Guillaume
 // *********************************************************************
-bat_room,164,178,5	script	Tierra Valley Officer#3	418,{
+bat_room,164,178,5	script	Tierra Valley Officer#3	4_M_KY_KNT,{
 	mes "[Tierra Officer]";
 	if( Bat_Team == 2 )
 	{
@@ -381,7 +381,7 @@ bat_room,164,178,5	script	Tierra Valley Officer#3	418,{
 
 // Croix Knight - Tierra
 // *********************************************************************
-bat_room,167,121,1	script	Croix Knight#2	413,{
+bat_room,167,121,1	script	Croix Knight#2	4_M_CRU_SOLD,{
 	mes "[Croix Knight]";
 	mes "Tierra Gorge is a very steep canyon with two forts residing in the north and south ends of the map.";
 	next;
@@ -400,7 +400,7 @@ bat_room,167,121,1	script	Croix Knight#2	413,{
 
 // Tierra Officer - Croix
 // *********************************************************************
-bat_room,164,121,1	script	Tierra Valley Officer#4	414,{
+bat_room,164,121,1	script	Tierra Valley Officer#4	4_M_CRU_KNT,{
 	mes "[Tierra Officer]";
 	if( Bat_Team == 1 )
 	{
@@ -451,7 +451,7 @@ bat_room,164,121,1	script	Tierra Valley Officer#4	414,{
 
 // Guillaune Knight - Flavius
 // *********************************************************************
-bat_room,175,178,5	script	Guillaume Knight#3	417,{
+bat_room,175,178,5	script	Guillaume Knight#3	4_M_KY_SOLD,{
 	mes "[Guillaume Knight]";
 	mes "The objective of the Flavius Battle is to score 2 points before your enemy by destroying their crystal.";
 	next;
@@ -471,7 +471,7 @@ bat_room,175,178,5	script	Guillaume Knight#3	417,{
 
 // Flavius Officer - Guillaume
 // *********************************************************************
-bat_room,172,178,5	script	Flavius Officer#1	418,{
+bat_room,172,178,5	script	Flavius Officer#1	4_M_KY_KNT,{
 	mes "[Flavius Officer]";
 	if( Bat_Team == 2 )
 	{
@@ -522,7 +522,7 @@ bat_room,172,178,5	script	Flavius Officer#1	418,{
 
 // Croix Knight - Flavius
 // *********************************************************************
-bat_room,175,121,1	script	Croix Knight#3	413,{
+bat_room,175,121,1	script	Croix Knight#3	4_M_CRU_SOLD,{
 	mes "[Croix Knight]";
 	mes "The objective of the Flavius Battle is to score 2 points before your enemy by destroying their crystal.";
 	next;
@@ -542,7 +542,7 @@ bat_room,175,121,1	script	Croix Knight#3	413,{
 
 // Flavius Officerer - Croix
 // *********************************************************************
-bat_room,172,121,1	script	Flavius Officer#2	414,{
+bat_room,172,121,1	script	Flavius Officer#2	4_M_CRU_KNT,{
 	mes "[Flavius Officer]";
 	if( Bat_Team == 1 )
 	{
@@ -593,7 +593,7 @@ bat_room,172,121,1	script	Flavius Officer#2	414,{
 
 // Guillaune Knight - Flavius
 // *********************************************************************
-bat_room,151,178,5	script	Guillaume Knight#4	417,{
+bat_room,151,178,5	script	Guillaume Knight#4	4_M_KY_SOLD,{
 	mes "[Guillaume Knight]";
 	mes "The objective of the Flavius Battle is to score 2 points before your enemy by destroying their crystal.";
 	next;
@@ -613,7 +613,7 @@ bat_room,151,178,5	script	Guillaume Knight#4	417,{
 
 // Flavius Officerer - Guillaume
 // *********************************************************************
-bat_room,148,178,5	script	Flavius Officer#3	418,{
+bat_room,148,178,5	script	Flavius Officer#3	4_M_KY_KNT,{
 	mes "[Flavius Officer]";
 	if( Bat_Team == 2 )
 	{
@@ -664,7 +664,7 @@ bat_room,148,178,5	script	Flavius Officer#3	418,{
 
 // Croix Knight - Flavius
 // *********************************************************************
-bat_room,151,121,1	script	Croix Knight#4	413,{
+bat_room,151,121,1	script	Croix Knight#4	4_M_CRU_SOLD,{
 	mes "[Croix Knight]";
 	mes "The objective of the Flavius Battle is to score 2 points before your enemy by destroying their crystal.";
 	next;
@@ -684,7 +684,7 @@ bat_room,151,121,1	script	Croix Knight#4	413,{
 
 // Flavius Officerer - Croix
 // *********************************************************************
-bat_room,148,121,1	script	Flavius Officer#4	414,{
+bat_room,148,121,1	script	Flavius Officer#4	4_M_CRU_KNT,{
 	mes "[Flavius Officer]";
 	if( Bat_Team == 1 )
 	{
@@ -735,7 +735,7 @@ bat_room,148,121,1	script	Flavius Officer#4	414,{
 
 // Guillaume Knight - KvM
 // *********************************************************************
-bat_room,143,178,5	script	Guillaume Knight#5	417,{
+bat_room,143,178,5	script	Guillaume Knight#5	4_M_KY_SOLD,{
 	mes "[Guillaume Knight]";
 	mes "To win the Battle of Kriger Von Midgard you and your team must kill all the other opponents before all of you die.";
 	next;
@@ -752,7 +752,7 @@ bat_room,143,178,5	script	Guillaume Knight#5	417,{
 
 // KvM Officerer - Guillaume
 // *********************************************************************
-bat_room,140,178,5	script	KVM [80-99] Officer#1	418,{
+bat_room,140,178,5	script	KVM [80-99] Officer#1	4_M_KY_KNT,{
 	mes "[KVM Officer]";
 	if( Bat_Team == 2 )
 	{
@@ -803,7 +803,7 @@ bat_room,140,178,5	script	KVM [80-99] Officer#1	418,{
 
 // Croix Knight - KvM
 // *********************************************************************
-bat_room,143,121,1	script	Croix Knight#5	413,{
+bat_room,143,121,1	script	Croix Knight#5	4_M_CRU_SOLD,{
 	mes "[Croix Knight]";
 	mes "To win the Battle of Kriger Von Midgard you and your team must kill all the other opponents before all of you die.";
 	next;
@@ -820,7 +820,7 @@ bat_room,143,121,1	script	Croix Knight#5	413,{
 
 // KvM Officer - Croix
 // *********************************************************************
-bat_room,140,121,1	script	KVM [80-99] Officer#2	414,{
+bat_room,140,121,1	script	KVM [80-99] Officer#2	4_M_CRU_KNT,{
 	mes "[KVM Officer]";
 	if( Bat_Team == 1 )
 	{
@@ -871,7 +871,7 @@ bat_room,140,121,1	script	KVM [80-99] Officer#2	414,{
 
 // Guillaume Knight - KvM
 // *********************************************************************
-bat_room,135,178,5	script	Guillaume Knight#6	417,{
+bat_room,135,178,5	script	Guillaume Knight#6	4_M_KY_SOLD,{
 	mes "[Guillaume Knight]";
 	mes "To win the Battle of Kriger Von Midgard you and your team must kill all the other opponents before all of you die.";
 	next;
@@ -888,7 +888,7 @@ bat_room,135,178,5	script	Guillaume Knight#6	417,{
 
 // KvM Officerer - Guillaume
 // *********************************************************************
-bat_room,132,178,5	script	KVM [60-79] Officer#1	418,{
+bat_room,132,178,5	script	KVM [60-79] Officer#1	4_M_KY_KNT,{
 	mes "[KVM Officer]";
 	if( Bat_Team == 2 )
 	{
@@ -939,7 +939,7 @@ bat_room,132,178,5	script	KVM [60-79] Officer#1	418,{
 
 // Croix Knight - KvM
 // *********************************************************************
-bat_room,135,121,1	script	Croix Knight#6	413,{
+bat_room,135,121,1	script	Croix Knight#6	4_M_CRU_SOLD,{
 	mes "[Croix Knight]";
 	mes "To win the Battle of Kriger Von Midgard you and your team must kill all the other opponents before all of you die.";
 	next;
@@ -956,7 +956,7 @@ bat_room,135,121,1	script	Croix Knight#6	413,{
 
 // KvM Officer - Croix
 // *********************************************************************
-bat_room,132,121,1	script	KVM [60-79] Officer#2	414,{
+bat_room,132,121,1	script	KVM [60-79] Officer#2	4_M_CRU_KNT,{
 	mes "[KVM Officer]";
 	if( Bat_Team == 1 )
 	{
@@ -1007,7 +1007,7 @@ bat_room,132,121,1	script	KVM [60-79] Officer#2	414,{
 
 // Guillaume Knight - KvM
 // *********************************************************************
-bat_room,127,178,5	script	Guillaume Knight#7	417,{
+bat_room,127,178,5	script	Guillaume Knight#7	4_M_KY_SOLD,{
 	mes "[Guillaume Knight]";
 	mes "To win the Battle of Kriger Von Midgard you and your team must kill all the other opponents before all of you die.";
 	next;
@@ -1024,7 +1024,7 @@ bat_room,127,178,5	script	Guillaume Knight#7	417,{
 
 // KvM Officerer - Guillaume
 // *********************************************************************
-bat_room,124,178,5	script	KVM [1-59] Officer#1	418,{
+bat_room,124,178,5	script	KVM [1-59] Officer#1	4_M_KY_KNT,{
 	mes "[KVM Officer]";
 	if( Bat_Team == 2 )
 	{
@@ -1075,7 +1075,7 @@ bat_room,124,178,5	script	KVM [1-59] Officer#1	418,{
 
 // Croix Knight - KvM
 // *********************************************************************
-bat_room,127,121,1	script	Croix Knight#7	413,{
+bat_room,127,121,1	script	Croix Knight#7	4_M_CRU_SOLD,{
 	mes "[Croix Knight]";
 	mes "To win the Battle of Kriger Von Midgard you and your team must kill all the other opponents before all of you die.";
 	next;
@@ -1092,7 +1092,7 @@ bat_room,127,121,1	script	Croix Knight#7	413,{
 
 // KvM Officer - Croix
 // *********************************************************************
-bat_room,124,121,1	script	KVM [1-59] Officer#2	414,{
+bat_room,124,121,1	script	KVM [1-59] Officer#2	4_M_CRU_KNT,{
 	mes "[KVM Officer]";
 	if( Bat_Team == 1 )
 	{
@@ -1144,16 +1144,16 @@ bat_room,124,121,1	script	KVM [1-59] Officer#2	414,{
 // Guard Dummy
 // *********************************************************************
 
-bat_room,161,141,3	script	Prince Croix's Aid::bat_aid	415,{ end; }
-bat_room,161,139,3	duplicate(bat_aid)	Prince Croix's Aid::bat_aid2	415
-bat_room,161,160,3	duplicate(bat_aid)	General Guillaume's Aid::bat_aid3	419
-bat_room,161,158,3	duplicate(bat_aid)	General Guillaume's Aid::bat_aid4	419
+bat_room,161,141,3	script	Prince Croix's Aid::bat_aid	4_M_CRU_HEAD,{ end; }
+bat_room,161,139,3	duplicate(bat_aid)	Prince Croix's Aid::bat_aid2	4_M_CRU_HEAD
+bat_room,161,160,3	duplicate(bat_aid)	General Guillaume's Aid::bat_aid3	4_M_KY_HEAD
+bat_room,161,158,3	duplicate(bat_aid)	General Guillaume's Aid::bat_aid4	4_M_KY_HEAD
 
 // Flags
 // *********************************************************************
 
--	script	Guillaume camp#bat	973,{ end; }
--	script	Croix camp#bat	974,{ end; }
+-	script	Guillaume camp#bat	1_FLAG_LION,{ end; }
+-	script	Croix camp#bat	1_FLAG_EAGLE,{ end; }
 
 // Exit from Registration
 // *********************************************************************
@@ -1167,58 +1167,58 @@ OnTouch:
 }
 
 // Flavius bat_b02
-bat_room,57,81,0	duplicate(warp2bat_room)	bat1	45,1,1
-bat_room,57,90,0	duplicate(warp2bat_room)	bat2	45,1,1
+bat_room,57,81,0	duplicate(warp2bat_room)	bat1	WARPNPC,1,1
+bat_room,57,90,0	duplicate(warp2bat_room)	bat2	WARPNPC,1,1
 // Free BG
-bat_room,57,220,0	duplicate(warp2bat_room)	bat3	45,1,1
-bat_room,57,211,0	duplicate(warp2bat_room)	bat4	45,1,1
+bat_room,57,220,0	duplicate(warp2bat_room)	bat3	WARPNPC,1,1
+bat_room,57,211,0	duplicate(warp2bat_room)	bat4	WARPNPC,1,1
 // Tierra Valley bat_a02
-bat_room,85,81,0	duplicate(warp2bat_room)	bat5	45,1,1
-bat_room,85,90,0	duplicate(warp2bat_room)	bat6	45,1,1
+bat_room,85,81,0	duplicate(warp2bat_room)	bat5	WARPNPC,1,1
+bat_room,85,90,0	duplicate(warp2bat_room)	bat6	WARPNPC,1,1
 // Tierra Valley bat_a01
-bat_room,85,220,0	duplicate(warp2bat_room)	bat7	45,1,1
-bat_room,85,211,0	duplicate(warp2bat_room)	bat8	45,1,1
+bat_room,85,220,0	duplicate(warp2bat_room)	bat7	WARPNPC,1,1
+bat_room,85,211,0	duplicate(warp2bat_room)	bat8	WARPNPC,1,1
 // Free BG
-bat_room,113,81,0	duplicate(warp2bat_room)	bat9	45,1,1
-bat_room,113,90,0	duplicate(warp2bat_room)	bat10	45,1,1
+bat_room,113,81,0	duplicate(warp2bat_room)	bat9	WARPNPC,1,1
+bat_room,113,90,0	duplicate(warp2bat_room)	bat10	WARPNPC,1,1
 // Free BG
-bat_room,113,220,0	duplicate(warp2bat_room)	bat11	45,1,1
-bat_room,113,211,0	duplicate(warp2bat_room)	bat12	45,1,1
+bat_room,113,220,0	duplicate(warp2bat_room)	bat11	WARPNPC,1,1
+bat_room,113,211,0	duplicate(warp2bat_room)	bat12	WARPNPC,1,1
 // Free BG
-bat_room,141,81,0	duplicate(warp2bat_room)	bat13	45,1,1
-bat_room,141,90,0	duplicate(warp2bat_room)	bat14	45,1,1
+bat_room,141,81,0	duplicate(warp2bat_room)	bat13	WARPNPC,1,1
+bat_room,141,90,0	duplicate(warp2bat_room)	bat14	WARPNPC,1,1
 // Free BG
-bat_room,141,220,0	duplicate(warp2bat_room)	bat15	45,1,1
-bat_room,141,211,0	duplicate(warp2bat_room)	bat16	45,1,1
+bat_room,141,220,0	duplicate(warp2bat_room)	bat15	WARPNPC,1,1
+bat_room,141,211,0	duplicate(warp2bat_room)	bat16	WARPNPC,1,1
 // Free BG
-bat_room,169,81,0	duplicate(warp2bat_room)	bat17	45,1,1
-bat_room,169,90,0	duplicate(warp2bat_room)	bat18	45,1,1
+bat_room,169,81,0	duplicate(warp2bat_room)	bat17	WARPNPC,1,1
+bat_room,169,90,0	duplicate(warp2bat_room)	bat18	WARPNPC,1,1
 // Free BG
-bat_room,169,220,0	duplicate(warp2bat_room)	bat19	45,1,1
-bat_room,169,211,0	duplicate(warp2bat_room)	bat20	45,1,1
+bat_room,169,220,0	duplicate(warp2bat_room)	bat19	WARPNPC,1,1
+bat_room,169,211,0	duplicate(warp2bat_room)	bat20	WARPNPC,1,1
 // Free BG
-bat_room,197,81,0	duplicate(warp2bat_room)	bat21	45,1,1
-bat_room,197,90,0	duplicate(warp2bat_room)	bat22	45,1,1
+bat_room,197,81,0	duplicate(warp2bat_room)	bat21	WARPNPC,1,1
+bat_room,197,90,0	duplicate(warp2bat_room)	bat22	WARPNPC,1,1
 // KvM bat_c03
-bat_room,197,220,0	duplicate(warp2bat_room)	bat23	45,1,1
-bat_room,197,211,0	duplicate(warp2bat_room)	bat24	45,1,1
+bat_room,197,220,0	duplicate(warp2bat_room)	bat23	WARPNPC,1,1
+bat_room,197,211,0	duplicate(warp2bat_room)	bat24	WARPNPC,1,1
 // Free BG
-bat_room,225,81,0	duplicate(warp2bat_room)	bat25	45,1,1
-bat_room,225,90,0	duplicate(warp2bat_room)	bat26	45,1,1
+bat_room,225,81,0	duplicate(warp2bat_room)	bat25	WARPNPC,1,1
+bat_room,225,90,0	duplicate(warp2bat_room)	bat26	WARPNPC,1,1
 // KvM bat_c02
-bat_room,225,220,0	duplicate(warp2bat_room)	bat27	45,1,1
-bat_room,225,211,0	duplicate(warp2bat_room)	bat28	45,1,1
+bat_room,225,220,0	duplicate(warp2bat_room)	bat27	WARPNPC,1,1
+bat_room,225,211,0	duplicate(warp2bat_room)	bat28	WARPNPC,1,1
 // Flavius bat_b01
-bat_room,253,81,0	duplicate(warp2bat_room)	bat29	45,1,1
-bat_room,253,90,0	duplicate(warp2bat_room)	bat30	45,1,1
+bat_room,253,81,0	duplicate(warp2bat_room)	bat29	WARPNPC,1,1
+bat_room,253,90,0	duplicate(warp2bat_room)	bat30	WARPNPC,1,1
 // KvM bat_c01
-bat_room,253,220,0	duplicate(warp2bat_room)	bat31	45,1,1
-bat_room,253,211,0	duplicate(warp2bat_room)	bat32	45,1,1
+bat_room,253,220,0	duplicate(warp2bat_room)	bat31	WARPNPC,1,1
+bat_room,253,211,0	duplicate(warp2bat_room)	bat32	WARPNPC,1,1
 
 // Badges Repairman
 // *********************************************************************
 
-bat_room,138,144,5	script	Repairman#bg	99,{
+bat_room,138,144,5	script	Repairman#bg	4W_M_03,{
 	callfunc "repairmain","Repairman";
 	end;
 }
@@ -1226,7 +1226,7 @@ bat_room,138,144,5	script	Repairman#bg	99,{
 // Badges Exchange
 // *********************************************************************
 
-bat_room,160,150,3	script	Erundek	109,{
+bat_room,160,150,3	script	Erundek	4_M_MANAGER,{
 	mes "[Erundek]";
 	mes "Welcome, mighty warrior.";
 	mes "What can I do for you today ?";
diff --git a/npc/custom/battleground/bg_flavius_01.txt b/npc/custom/battleground/bg_flavius_01.txt
index 4bb6fa7be..0d2ee8a7e 100644
--- a/npc/custom/battleground/bg_flavius_01.txt
+++ b/npc/custom/battleground/bg_flavius_01.txt
@@ -5,7 +5,7 @@
 // Registration NPC's
 // *********************************************************************
 
-bat_room,86,227,4	script	Registration::Fl1R_Guillaume	418,{
+bat_room,86,227,4	script	Registration::Fl1R_Guillaume	4_M_KY_KNT,{
 	end;
 OnInit:
 	waitingroom "Battle Station 10 Players",10,"Flavius_BG1::OnGuillaumeJoin",1;
@@ -15,7 +15,7 @@ OnEnterBG:
 	end;
 }
 
-bat_room,85,204,0	script	Registration::Fl1R_Croix	414,{
+bat_room,85,204,0	script	Registration::Fl1R_Croix	4_M_CRU_KNT,{
 	end;
 OnInit:
 	waitingroom "Battle Station 10 Players",10,"Flavius_BG1::OnCroixJoin",1;
@@ -268,7 +268,7 @@ OnReset:
 // Battleground rewards
 // *********************************************************************
 
-bat_b01,390,13,5	script	Guillaume Vintenar#fl1	419,{
+bat_b01,390,13,5	script	Guillaume Vintenar#fl1	4_M_KY_HEAD,{
 	if( $@FlaviusBG1_Victory )
 	{
 		if( $@FlaviusBG1_Victory == Bat_Team )
@@ -299,7 +299,7 @@ bat_b01,390,13,5	script	Guillaume Vintenar#fl1	419,{
 	end;
 }
 
-bat_b01,10,293,5	script	Croix Vintenar#fl1	415,{
+bat_b01,10,293,5	script	Croix Vintenar#fl1	4_M_CRU_HEAD,{
 	if( $@FlaviusBG1_Victory )
 	{
 		if( $@FlaviusBG1_Victory == Bat_Team )
@@ -333,7 +333,7 @@ bat_b01,10,293,5	script	Croix Vintenar#fl1	415,{
 // Battleground Therapist
 // *********************************************************************
 
-bat_b01,390,13,5	script	Therapist in battle#fl12	95,{
+bat_b01,390,13,5	script	Therapist in battle#fl12	4_F_SISTER,{
 	mes "[Therapist in battle]";
 	mes "Just close your eyes, and take a deep breathe.";
 	mes "You can be free from pain.";
@@ -341,7 +341,7 @@ bat_b01,390,13,5	script	Therapist in battle#fl12	95,{
 	close;
 }
 
-bat_b01,10,293,5	script	Therapist in battle#fl11	95,{
+bat_b01,10,293,5	script	Therapist in battle#fl11	4_F_SISTER,{
 	mes "[Therapist in battle]";
 	mes "Just close your eyes, and take a deep breathe.";
 	mes "You can be free from pain.";
@@ -352,7 +352,7 @@ bat_b01,10,293,5	script	Therapist in battle#fl11	95,{
 // Battleground Respawn
 // *********************************************************************
 
-bat_b01,390,10,0	script	#gfl1_respawn	139,{
+bat_b01,390,10,0	script	#gfl1_respawn	HIDDEN_WARP_NPC,{
 	end;
 
 OnBGStart:
@@ -374,7 +374,7 @@ OnTimer25000:
 	end;
 }
 
-bat_b01,10,290,0	script	#cfl1_respawn	139,{
+bat_b01,10,290,0	script	#cfl1_respawn	HIDDEN_WARP_NPC,{
 	end;
 
 OnBGStart:
@@ -399,30 +399,30 @@ OnTimer25000:
 // Flags
 // *********************************************************************
 
-bat_b01,304,231,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat1	973
-bat_b01,319,231,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat2	973
-bat_b01,304,218,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat3	973
-bat_b01,319,218,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat4	973
-bat_b01,304,231,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat5	973
-bat_b01,304,231,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat6	973
-bat_b01,335,142,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat7	973
-bat_b01,335,157,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat8	973
-bat_b01,390,16,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat9	973
-bat_b01,292,163,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat19	973
-bat_b01,292,136,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat20	973
-bat_b01,241,185,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat21	973
-bat_b01,247,179,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat22	973
-
-bat_b01,96,81,1	duplicate(Croix camp#bat)	Croix camp#bat1	974
-bat_b01,96,68,1	duplicate(Croix camp#bat)	Croix camp#bat2	974
-bat_b01,79,81,1	duplicate(Croix camp#bat)	Croix camp#bat3	974
-bat_b01,79,68,1	duplicate(Croix camp#bat)	Croix camp#bat4	974
-bat_b01,96,81,1	duplicate(Croix camp#bat)	Croix camp#bat5	974
-bat_b01,96,81,1	duplicate(Croix camp#bat)	Croix camp#bat6	974
-bat_b01,59,164,1	duplicate(Croix camp#bat)	Croix camp#bat7	974
-bat_b01,59,137,1	duplicate(Croix camp#bat)	Croix camp#bat8	974
-bat_b01,10,296,1	duplicate(Croix camp#bat)	Croix camp#bat9	974
-bat_b01,110,162,1	duplicate(Croix camp#bat)	Croix camp#bat18	974
-bat_b01,110,137,1	duplicate(Croix camp#bat)	Croix camp#bat19	974
-bat_b01,152,120,1	duplicate(Croix camp#bat)	Croix camp#bat20	974
-bat_b01,158,114,1	duplicate(Croix camp#bat)	Croix camp#bat21	974
+bat_b01,304,231,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat1	1_FLAG_LION
+bat_b01,319,231,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat2	1_FLAG_LION
+bat_b01,304,218,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat3	1_FLAG_LION
+bat_b01,319,218,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat4	1_FLAG_LION
+bat_b01,304,231,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat5	1_FLAG_LION
+bat_b01,304,231,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat6	1_FLAG_LION
+bat_b01,335,142,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat7	1_FLAG_LION
+bat_b01,335,157,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat8	1_FLAG_LION
+bat_b01,390,16,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat9	1_FLAG_LION
+bat_b01,292,163,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat19	1_FLAG_LION
+bat_b01,292,136,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat20	1_FLAG_LION
+bat_b01,241,185,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat21	1_FLAG_LION
+bat_b01,247,179,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat22	1_FLAG_LION
+
+bat_b01,96,81,1	duplicate(Croix camp#bat)	Croix camp#bat1	1_FLAG_EAGLE
+bat_b01,96,68,1	duplicate(Croix camp#bat)	Croix camp#bat2	1_FLAG_EAGLE
+bat_b01,79,81,1	duplicate(Croix camp#bat)	Croix camp#bat3	1_FLAG_EAGLE
+bat_b01,79,68,1	duplicate(Croix camp#bat)	Croix camp#bat4	1_FLAG_EAGLE
+bat_b01,96,81,1	duplicate(Croix camp#bat)	Croix camp#bat5	1_FLAG_EAGLE
+bat_b01,96,81,1	duplicate(Croix camp#bat)	Croix camp#bat6	1_FLAG_EAGLE
+bat_b01,59,164,1	duplicate(Croix camp#bat)	Croix camp#bat7	1_FLAG_EAGLE
+bat_b01,59,137,1	duplicate(Croix camp#bat)	Croix camp#bat8	1_FLAG_EAGLE
+bat_b01,10,296,1	duplicate(Croix camp#bat)	Croix camp#bat9	1_FLAG_EAGLE
+bat_b01,110,162,1	duplicate(Croix camp#bat)	Croix camp#bat18	1_FLAG_EAGLE
+bat_b01,110,137,1	duplicate(Croix camp#bat)	Croix camp#bat19	1_FLAG_EAGLE
+bat_b01,152,120,1	duplicate(Croix camp#bat)	Croix camp#bat20	1_FLAG_EAGLE
+bat_b01,158,114,1	duplicate(Croix camp#bat)	Croix camp#bat21	1_FLAG_EAGLE
diff --git a/npc/custom/battleground/bg_flavius_02.txt b/npc/custom/battleground/bg_flavius_02.txt
index 4dc180d14..3e5215faa 100644
--- a/npc/custom/battleground/bg_flavius_02.txt
+++ b/npc/custom/battleground/bg_flavius_02.txt
@@ -5,7 +5,7 @@
 // Registration NPC's
 // *********************************************************************
 
-bat_room,142,227,4	script	Registration::Fl2R_Guillaume	418,{
+bat_room,142,227,4	script	Registration::Fl2R_Guillaume	4_M_KY_KNT,{
 	end;
 OnInit:
 	waitingroom "Battle Station 10 Players",10,"Flavius_BG2::OnGuillaumeJoin",1;
@@ -15,7 +15,7 @@ OnEnterBG:
 	end;
 }
 
-bat_room,142,204,0	script	Registration::Fl2R_Croix	414,{
+bat_room,142,204,0	script	Registration::Fl2R_Croix	4_M_CRU_KNT,{
 	end;
 OnInit:
 	waitingroom "Battle Station 10 Players",10,"Flavius_BG2::OnCroixJoin",1;
@@ -268,7 +268,7 @@ OnReset:
 // Battleground rewards
 // *********************************************************************
 
-bat_b02,390,13,5	script	Guillaume Vintenar#fl2	419,{
+bat_b02,390,13,5	script	Guillaume Vintenar#fl2	4_M_KY_HEAD,{
 	if( $@FlaviusBG2_Victory )
 	{
 		if( $@FlaviusBG2_Victory == Bat_Team )
@@ -299,7 +299,7 @@ bat_b02,390,13,5	script	Guillaume Vintenar#fl2	419,{
 	end;
 }
 
-bat_b02,10,293,5	script	Croix Vintenar#fl2	415,{
+bat_b02,10,293,5	script	Croix Vintenar#fl2	4_M_CRU_HEAD,{
 	if( $@FlaviusBG2_Victory )
 	{
 		if( $@FlaviusBG2_Victory == Bat_Team )
@@ -333,7 +333,7 @@ bat_b02,10,293,5	script	Croix Vintenar#fl2	415,{
 // Battleground Therapist
 // *********************************************************************
 
-bat_b02,390,13,5	script	Therapist in battle#fl22	95,{
+bat_b02,390,13,5	script	Therapist in battle#fl22	4_F_SISTER,{
 	mes "[Therapist in battle]";
 	mes "Just close your eyes, and take a deep breathe.";
 	mes "You can be free from pain.";
@@ -341,7 +341,7 @@ bat_b02,390,13,5	script	Therapist in battle#fl22	95,{
 	close;
 }
 
-bat_b02,10,293,5	script	Therapist in battle#fl21	95,{
+bat_b02,10,293,5	script	Therapist in battle#fl21	4_F_SISTER,{
 	mes "[Therapist in battle]";
 	mes "Just close your eyes, and take a deep breathe.";
 	mes "You can be free from pain.";
@@ -352,7 +352,7 @@ bat_b02,10,293,5	script	Therapist in battle#fl21	95,{
 // Battleground Respawn
 // *********************************************************************
 
-bat_b02,390,10,0	script	#gfl2_respawn	139,{
+bat_b02,390,10,0	script	#gfl2_respawn	HIDDEN_WARP_NPC,{
 	end;
 
 OnBGStart:
@@ -374,7 +374,7 @@ OnTimer25000:
 	end;
 }
 
-bat_b02,10,290,0	script	#cfl2_respawn	139,{
+bat_b02,10,290,0	script	#cfl2_respawn	HIDDEN_WARP_NPC,{
 	end;
 
 OnBGStart:
@@ -399,30 +399,30 @@ OnTimer25000:
 // Flags
 // *********************************************************************
 
-bat_b02,304,231,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat32	973
-bat_b02,319,231,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat33	973
-bat_b02,304,218,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat34	973
-bat_b02,319,218,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat35	973
-bat_b02,304,231,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat36	973
-bat_b02,304,231,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat37	973
-bat_b02,335,142,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat38	973
-bat_b02,335,157,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat39	973
-bat_b02,390,16,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat40	973
-bat_b02,292,163,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat41	973
-bat_b02,292,136,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat42	973
-bat_b02,241,185,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat43	973
-bat_b02,247,179,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat44	973
-
-bat_b02,96,81,1	duplicate(Croix camp#bat)	Croix camp#bat30	974
-bat_b02,96,68,1	duplicate(Croix camp#bat)	Croix camp#bat31	974
-bat_b02,79,81,1	duplicate(Croix camp#bat)	Croix camp#bat32	974
-bat_b02,79,68,1	duplicate(Croix camp#bat)	Croix camp#bat33	974
-bat_b02,96,81,1	duplicate(Croix camp#bat)	Croix camp#bat34	974
-bat_b02,96,81,1	duplicate(Croix camp#bat)	Croix camp#bat35	974
-bat_b02,59,164,1	duplicate(Croix camp#bat)	Croix camp#bat36	974
-bat_b02,59,137,1	duplicate(Croix camp#bat)	Croix camp#bat37	974
-bat_b02,10,296,1	duplicate(Croix camp#bat)	Croix camp#bat38	974
-bat_b02,110,162,1	duplicate(Croix camp#bat)	Croix camp#bat39	974
-bat_b02,110,137,1	duplicate(Croix camp#bat)	Croix camp#bat40	974
-bat_b02,152,120,1	duplicate(Croix camp#bat)	Croix camp#bat41	974
-bat_b02,158,114,1	duplicate(Croix camp#bat)	Croix camp#bat42	974
+bat_b02,304,231,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat32	1_FLAG_LION
+bat_b02,319,231,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat33	1_FLAG_LION
+bat_b02,304,218,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat34	1_FLAG_LION
+bat_b02,319,218,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat35	1_FLAG_LION
+bat_b02,304,231,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat36	1_FLAG_LION
+bat_b02,304,231,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat37	1_FLAG_LION
+bat_b02,335,142,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat38	1_FLAG_LION
+bat_b02,335,157,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat39	1_FLAG_LION
+bat_b02,390,16,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat40	1_FLAG_LION
+bat_b02,292,163,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat41	1_FLAG_LION
+bat_b02,292,136,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat42	1_FLAG_LION
+bat_b02,241,185,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat43	1_FLAG_LION
+bat_b02,247,179,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat44	1_FLAG_LION
+
+bat_b02,96,81,1	duplicate(Croix camp#bat)	Croix camp#bat30	1_FLAG_EAGLE
+bat_b02,96,68,1	duplicate(Croix camp#bat)	Croix camp#bat31	1_FLAG_EAGLE
+bat_b02,79,81,1	duplicate(Croix camp#bat)	Croix camp#bat32	1_FLAG_EAGLE
+bat_b02,79,68,1	duplicate(Croix camp#bat)	Croix camp#bat33	1_FLAG_EAGLE
+bat_b02,96,81,1	duplicate(Croix camp#bat)	Croix camp#bat34	1_FLAG_EAGLE
+bat_b02,96,81,1	duplicate(Croix camp#bat)	Croix camp#bat35	1_FLAG_EAGLE
+bat_b02,59,164,1	duplicate(Croix camp#bat)	Croix camp#bat36	1_FLAG_EAGLE
+bat_b02,59,137,1	duplicate(Croix camp#bat)	Croix camp#bat37	1_FLAG_EAGLE
+bat_b02,10,296,1	duplicate(Croix camp#bat)	Croix camp#bat38	1_FLAG_EAGLE
+bat_b02,110,162,1	duplicate(Croix camp#bat)	Croix camp#bat39	1_FLAG_EAGLE
+bat_b02,110,137,1	duplicate(Croix camp#bat)	Croix camp#bat40	1_FLAG_EAGLE
+bat_b02,152,120,1	duplicate(Croix camp#bat)	Croix camp#bat41	1_FLAG_EAGLE
+bat_b02,158,114,1	duplicate(Croix camp#bat)	Croix camp#bat42	1_FLAG_EAGLE
diff --git a/npc/custom/battleground/bg_kvm01.txt b/npc/custom/battleground/bg_kvm01.txt
index 36c758f37..ed8e0ad76 100644
--- a/npc/custom/battleground/bg_kvm01.txt
+++ b/npc/custom/battleground/bg_kvm01.txt
@@ -5,7 +5,7 @@
 // Registration NPC's
 // *********************************************************************
 
-bat_room,253,227,4	script	Registration::KvM01R_Guillaume	418,{ // KvM Guillaume
+bat_room,253,227,4	script	Registration::KvM01R_Guillaume	4_M_KY_KNT,{ // KvM Guillaume
 	end;
 
 OnInit:
@@ -17,7 +17,7 @@ OnEnterBG:
 	end;
 }
 
-bat_room,253,204,0	script	Registration::KvM01R_Croix	414,{ // KvM Croix
+bat_room,253,204,0	script	Registration::KvM01R_Croix	4_M_CRU_KNT,{ // KvM Croix
 	end;
 
 OnInit:
@@ -32,7 +32,7 @@ OnEnterBG:
 // Light Effects
 // *********************************************************************
 
-bat_c01,54,123,0	script	#bat_c01a	111,{
+bat_c01,54,123,0	script	#bat_c01a	HIDDEN_NPC,{
 	end;
 
 OnKvM01LightA: misceffect 54; end;
@@ -40,11 +40,11 @@ OnKvM01LightB: misceffect 55; end;
 OnKvM01LightC: misceffect 56; end;
 }
 
-bat_c01,56,125,0	duplicate(#bat_c01a)	#bat_c01b	111
-bat_c01,58,127,0	duplicate(#bat_c01a)	#bat_c01c	111
-bat_c01,141,56,0	duplicate(#bat_c01a)	#bat_c01d	111
-bat_c01,143,58,0	duplicate(#bat_c01a)	#bat_c01e	111
-bat_c01,145,60,0	duplicate(#bat_c01a)	#bat_c01f	111
+bat_c01,56,125,0	duplicate(#bat_c01a)	#bat_c01b	HIDDEN_NPC
+bat_c01,58,127,0	duplicate(#bat_c01a)	#bat_c01c	HIDDEN_NPC
+bat_c01,141,56,0	duplicate(#bat_c01a)	#bat_c01d	HIDDEN_NPC
+bat_c01,143,58,0	duplicate(#bat_c01a)	#bat_c01e	HIDDEN_NPC
+bat_c01,145,60,0	duplicate(#bat_c01a)	#bat_c01f	HIDDEN_NPC
 
 // Battleground Engine
 // *********************************************************************
@@ -282,7 +282,7 @@ OnTimer60000:
 // Battleground Therapist
 // *********************************************************************
 
-bat_c01,51,130,5	script	Therapist in battle::TherapistKvM01a	95,{
+bat_c01,51,130,5	script	Therapist in battle::TherapistKvM01a	4_F_SISTER,{
 	mes "[Therapist in battle]";
 	mes "Just close your eyes, and take a deep breathe.";
 	mes "You can be free from pain.";
@@ -290,7 +290,7 @@ bat_c01,51,130,5	script	Therapist in battle::TherapistKvM01a	95,{
 	close;
 }
 
-bat_c01,148,53,1	script	Therapist in battle::TherapistKvM01b	95,{
+bat_c01,148,53,1	script	Therapist in battle::TherapistKvM01b	4_F_SISTER,{
 	mes "[Therapist in battle]";
 	mes "Just close your eyes, and take a deep breathe.";
 	mes "You can be free from pain.";
@@ -301,7 +301,7 @@ bat_c01,148,53,1	script	Therapist in battle::TherapistKvM01b	95,{
 // Battleground rewards
 // *********************************************************************
 
-bat_c01,51,130,5	script	Guillaume Vintenar::VintenarKvM01a	419,{
+bat_c01,51,130,5	script	Guillaume Vintenar::VintenarKvM01a	4_M_KY_HEAD,{
 	if( $@KvM01BG_Victory )
 	{
 		if( $@KvM01BG_Victory == 3 )
@@ -339,7 +339,7 @@ bat_c01,51,130,5	script	Guillaume Vintenar::VintenarKvM01a	419,{
 	end;
 }
 
-bat_c01,148,53,1	script	Croix Vintenar::VintenarKvM01b	415,{
+bat_c01,148,53,1	script	Croix Vintenar::VintenarKvM01b	4_M_CRU_HEAD,{
 	if( $@KvM01BG_Victory )
 	{
 		if( $@KvM01BG_Victory == 3 )
diff --git a/npc/custom/battleground/bg_kvm02.txt b/npc/custom/battleground/bg_kvm02.txt
index 5bfbba328..919b7a583 100644
--- a/npc/custom/battleground/bg_kvm02.txt
+++ b/npc/custom/battleground/bg_kvm02.txt
@@ -5,7 +5,7 @@
 // Registration NPC's
 // *********************************************************************
 
-bat_room,225,227,4	script	Registration::KvM02R_Guillaume	418,{ // KvM Guillaume
+bat_room,225,227,4	script	Registration::KvM02R_Guillaume	4_M_KY_KNT,{ // KvM Guillaume
 	end;
 
 OnInit:
@@ -17,7 +17,7 @@ OnEnterBG:
 	end;
 }
 
-bat_room,225,204,0	script	Registration::KvM02R_Croix	414,{ // KvM Croix
+bat_room,225,204,0	script	Registration::KvM02R_Croix	4_M_CRU_KNT,{ // KvM Croix
 	end;
 
 OnInit:
@@ -32,7 +32,7 @@ OnEnterBG:
 // Light Effects
 // *********************************************************************
 
-bat_c02,54,123,0	script	#bat_c02a	111,{
+bat_c02,54,123,0	script	#bat_c02a	HIDDEN_NPC,{
 	end;
 
 OnKvM02LightA: misceffect 54; end;
@@ -40,11 +40,11 @@ OnKvM02LightB: misceffect 55; end;
 OnKvM02LightC: misceffect 56; end;
 }
 
-bat_c02,56,125,0	duplicate(#bat_c02a)	#bat_c02b	111
-bat_c02,58,127,0	duplicate(#bat_c02a)	#bat_c02c	111
-bat_c02,141,56,0	duplicate(#bat_c02a)	#bat_c02d	111
-bat_c02,143,58,0	duplicate(#bat_c02a)	#bat_c02e	111
-bat_c02,145,60,0	duplicate(#bat_c02a)	#bat_c02f	111
+bat_c02,56,125,0	duplicate(#bat_c02a)	#bat_c02b	HIDDEN_NPC
+bat_c02,58,127,0	duplicate(#bat_c02a)	#bat_c02c	HIDDEN_NPC
+bat_c02,141,56,0	duplicate(#bat_c02a)	#bat_c02d	HIDDEN_NPC
+bat_c02,143,58,0	duplicate(#bat_c02a)	#bat_c02e	HIDDEN_NPC
+bat_c02,145,60,0	duplicate(#bat_c02a)	#bat_c02f	HIDDEN_NPC
 
 // Battleground Engine
 // *********************************************************************
@@ -282,7 +282,7 @@ OnTimer60000:
 // Battleground Therapist
 // *********************************************************************
 
-bat_c02,51,130,5	script	Therapist in battle::TherapistKvM02a	95,{
+bat_c02,51,130,5	script	Therapist in battle::TherapistKvM02a	4_F_SISTER,{
 	mes "[Therapist in battle]";
 	mes "Just close your eyes, and take a deep breathe.";
 	mes "You can be free from pain.";
@@ -290,7 +290,7 @@ bat_c02,51,130,5	script	Therapist in battle::TherapistKvM02a	95,{
 	close;
 }
 
-bat_c02,148,53,1	script	Therapist in battle::TherapistKvM02b	95,{
+bat_c02,148,53,1	script	Therapist in battle::TherapistKvM02b	4_F_SISTER,{
 	mes "[Therapist in battle]";
 	mes "Just close your eyes, and take a deep breathe.";
 	mes "You can be free from pain.";
@@ -301,7 +301,7 @@ bat_c02,148,53,1	script	Therapist in battle::TherapistKvM02b	95,{
 // Battleground rewards
 // *********************************************************************
 
-bat_c02,51,130,5	script	Guillaume Vintenar::VintenarKvM02a	419,{
+bat_c02,51,130,5	script	Guillaume Vintenar::VintenarKvM02a	4_M_KY_HEAD,{
 	if( $@KvM02BG_Victory )
 	{
 		if( $@KvM02BG_Victory == 3 )
@@ -339,7 +339,7 @@ bat_c02,51,130,5	script	Guillaume Vintenar::VintenarKvM02a	419,{
 	end;
 }
 
-bat_c02,148,53,1	script	Croix Vintenar::VintenarKvM02b	415,{
+bat_c02,148,53,1	script	Croix Vintenar::VintenarKvM02b	4_M_CRU_HEAD,{
 	if( $@KvM02BG_Victory )
 	{
 		if( $@KvM02BG_Victory == 3 )
diff --git a/npc/custom/battleground/bg_kvm03.txt b/npc/custom/battleground/bg_kvm03.txt
index 6efa99e4c..b13624067 100644
--- a/npc/custom/battleground/bg_kvm03.txt
+++ b/npc/custom/battleground/bg_kvm03.txt
@@ -5,7 +5,7 @@
 // Registration NPC's
 // *********************************************************************
 
-bat_room,197,227,4	script	Registration::KvM03R_Guillaume	418,{ // KvM Guillaume
+bat_room,197,227,4	script	Registration::KvM03R_Guillaume	4_M_KY_KNT,{ // KvM Guillaume
 	end;
 
 OnInit:
@@ -17,7 +17,7 @@ OnEnterBG:
 	end;
 }
 
-bat_room,197,204,0	script	Registration::KvM03R_Croix	414,{ // KvM Croix
+bat_room,197,204,0	script	Registration::KvM03R_Croix	4_M_CRU_KNT,{ // KvM Croix
 	end;
 
 OnInit:
@@ -32,7 +32,7 @@ OnEnterBG:
 // Light Effects
 // *********************************************************************
 
-bat_c03,54,123,0	script	#bat_c03a	111,{
+bat_c03,54,123,0	script	#bat_c03a	HIDDEN_NPC,{
 	end;
 
 OnKvM03LightA: misceffect 54; end;
@@ -40,11 +40,11 @@ OnKvM03LightB: misceffect 55; end;
 OnKvM03LightC: misceffect 56; end;
 }
 
-bat_c03,56,125,0	duplicate(#bat_c03a)	#bat_c03b	111
-bat_c03,58,127,0	duplicate(#bat_c03a)	#bat_c03c	111
-bat_c03,141,56,0	duplicate(#bat_c03a)	#bat_c03d	111
-bat_c03,143,58,0	duplicate(#bat_c03a)	#bat_c03e	111
-bat_c03,145,60,0	duplicate(#bat_c03a)	#bat_c03f	111
+bat_c03,56,125,0	duplicate(#bat_c03a)	#bat_c03b	HIDDEN_NPC
+bat_c03,58,127,0	duplicate(#bat_c03a)	#bat_c03c	HIDDEN_NPC
+bat_c03,141,56,0	duplicate(#bat_c03a)	#bat_c03d	HIDDEN_NPC
+bat_c03,143,58,0	duplicate(#bat_c03a)	#bat_c03e	HIDDEN_NPC
+bat_c03,145,60,0	duplicate(#bat_c03a)	#bat_c03f	HIDDEN_NPC
 
 // Battleground Engine
 // *********************************************************************
@@ -282,7 +282,7 @@ OnTimer60000:
 // Battleground Therapist
 // *********************************************************************
 
-bat_c03,51,130,5	script	Therapist in battle::TherapistKvM03a	95,{
+bat_c03,51,130,5	script	Therapist in battle::TherapistKvM03a	4_F_SISTER,{
 	mes "[Therapist in battle]";
 	mes "Just close your eyes, and take a deep breathe.";
 	mes "You can be free from pain.";
@@ -290,7 +290,7 @@ bat_c03,51,130,5	script	Therapist in battle::TherapistKvM03a	95,{
 	close;
 }
 
-bat_c03,148,53,1	script	Therapist in battle::TherapistKvM03b	95,{
+bat_c03,148,53,1	script	Therapist in battle::TherapistKvM03b	4_F_SISTER,{
 	mes "[Therapist in battle]";
 	mes "Just close your eyes, and take a deep breathe.";
 	mes "You can be free from pain.";
@@ -301,7 +301,7 @@ bat_c03,148,53,1	script	Therapist in battle::TherapistKvM03b	95,{
 // Battleground rewards
 // *********************************************************************
 
-bat_c03,51,130,5	script	Guillaume Vintenar::VintenarKvM03a	419,{
+bat_c03,51,130,5	script	Guillaume Vintenar::VintenarKvM03a	4_M_KY_HEAD,{
 	if( $@KvM03BG_Victory )
 	{
 		if( $@KvM03BG_Victory == 3 )
@@ -339,7 +339,7 @@ bat_c03,51,130,5	script	Guillaume Vintenar::VintenarKvM03a	419,{
 	end;
 }
 
-bat_c03,148,53,1	script	Croix Vintenar::VintenarKvM03b	415,{
+bat_c03,148,53,1	script	Croix Vintenar::VintenarKvM03b	4_M_CRU_HEAD,{
 	if( $@KvM03BG_Victory )
 	{
 		if( $@KvM03BG_Victory == 3 )
diff --git a/npc/custom/battleground/bg_tierra_01.txt b/npc/custom/battleground/bg_tierra_01.txt
index 4c65d0462..c6a6c3b36 100644
--- a/npc/custom/battleground/bg_tierra_01.txt
+++ b/npc/custom/battleground/bg_tierra_01.txt
@@ -5,7 +5,7 @@
 // Registration NPC's
 // *********************************************************************
 
-bat_room,58,227,4	script	Registration::TV1R_Guillaume	418,{
+bat_room,58,227,4	script	Registration::TV1R_Guillaume	4_M_KY_KNT,{
 	end;
 OnInit:
 	waitingroom "Battle Station 10 Players",10,"Tierra_BG1::OnGuillaumeJoin",1;
@@ -15,7 +15,7 @@ OnEnterBG:
 	end;
 }
 
-bat_room,58,204,0	script	Registration::TV1R_Croix	414,{
+bat_room,58,204,0	script	Registration::TV1R_Croix	4_M_CRU_KNT,{
 	end;
 OnInit:
 	waitingroom "Battle Station 10 Players",10,"Tierra_BG1::OnCroixJoin",1;
@@ -241,23 +241,23 @@ OnReset:
 // Other Flags
 // *********************************************************************
 
-bat_a01,148,85,1	duplicate(Croix camp#bat)	Croix camp#bat10	974
-bat_a01,155,85,1	duplicate(Croix camp#bat)	Croix camp#bat11	974
-bat_a01,357,75,1	duplicate(Croix camp#bat)	Croix camp#bat12	974
-bat_a01,348,74,1	duplicate(Croix camp#bat)	Croix camp#bat13	974
-bat_a01,199,49,1	duplicate(Croix camp#bat)	Croix camp#bat14	974
-bat_a01,168,16,1	duplicate(Croix camp#bat)	Croix camp#bat15	974
-bat_a01,138,12,1	duplicate(Croix camp#bat)	Croix camp#bat16	974
-bat_a01,108,35,1	duplicate(Croix camp#bat)	Croix camp#bat17	974
-bat_a01,164,308,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat10	973
-bat_a01,157,308,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat11	973
-bat_a01,359,327,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat12	973
-bat_a01,350,326,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat13	973
-bat_a01,209,344,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat14	973
-bat_a01,173,380,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat15	973
-bat_a01,150,380,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat16	973
-bat_a01,118,357,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat17	973
-bat_a01,119,336,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat18	973
+bat_a01,148,85,1	duplicate(Croix camp#bat)	Croix camp#bat10	1_FLAG_EAGLE
+bat_a01,155,85,1	duplicate(Croix camp#bat)	Croix camp#bat11	1_FLAG_EAGLE
+bat_a01,357,75,1	duplicate(Croix camp#bat)	Croix camp#bat12	1_FLAG_EAGLE
+bat_a01,348,74,1	duplicate(Croix camp#bat)	Croix camp#bat13	1_FLAG_EAGLE
+bat_a01,199,49,1	duplicate(Croix camp#bat)	Croix camp#bat14	1_FLAG_EAGLE
+bat_a01,168,16,1	duplicate(Croix camp#bat)	Croix camp#bat15	1_FLAG_EAGLE
+bat_a01,138,12,1	duplicate(Croix camp#bat)	Croix camp#bat16	1_FLAG_EAGLE
+bat_a01,108,35,1	duplicate(Croix camp#bat)	Croix camp#bat17	1_FLAG_EAGLE
+bat_a01,164,308,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat10	1_FLAG_LION
+bat_a01,157,308,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat11	1_FLAG_LION
+bat_a01,359,327,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat12	1_FLAG_LION
+bat_a01,350,326,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat13	1_FLAG_LION
+bat_a01,209,344,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat14	1_FLAG_LION
+bat_a01,173,380,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat15	1_FLAG_LION
+bat_a01,150,380,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat16	1_FLAG_LION
+bat_a01,118,357,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat17	1_FLAG_LION
+bat_a01,119,336,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat18	1_FLAG_LION
 
 // Barricades
 // *********************************************************************
@@ -317,7 +317,7 @@ OnWall:
 // Battleground rewards
 // *********************************************************************
 
-bat_a01,45,19,3	script	Croix Vintenar#tv1	415,{
+bat_a01,45,19,3	script	Croix Vintenar#tv1	4_M_CRU_HEAD,{
 	if( $@TierraBG1_Victory )
 	{
 		if( $@TierraBG1_Victory == Bat_Team )
@@ -348,7 +348,7 @@ bat_a01,45,19,3	script	Croix Vintenar#tv1	415,{
 	end;
 }
 
-bat_a01,53,377,3	script	Guillaume Vintenar#tv1	419,{
+bat_a01,53,377,3	script	Guillaume Vintenar#tv1	4_M_KY_HEAD,{
 	if( $@TierraBG1_Victory )
 	{
 		if( $@TierraBG1_Victory == Bat_Team )
@@ -382,14 +382,14 @@ bat_a01,53,377,3	script	Guillaume Vintenar#tv1	419,{
 // Battleground Therapist
 // *********************************************************************
 
-bat_a01,60,216,3	script	Ghost#tv13	950,{
+bat_a01,60,216,3	script	Ghost#tv13	4_GHOSTRING,{
 	mes "[Ghost in valley]";
 	mes "Boo...Boo...";
 	specialeffect2 312;
 	close;
 }
 
-bat_a01,53,377,3	script	Therapist in battle#tv12	95,{
+bat_a01,53,377,3	script	Therapist in battle#tv12	4_F_SISTER,{
 	mes "[Therapist in battle]";
 	mes "Just close your eyes, and take a deep breathe.";
 	mes "You can be free from pain.";
@@ -397,7 +397,7 @@ bat_a01,53,377,3	script	Therapist in battle#tv12	95,{
 	close;
 }
 
-bat_a01,45,18,3	script	Therapist in battle#tv11	95,{
+bat_a01,45,18,3	script	Therapist in battle#tv11	4_F_SISTER,{
 	mes "[Therapist in battle]";
 	mes "Just close your eyes, and take a deep breathe.";
 	mes "You can be free from pain.";
@@ -408,7 +408,7 @@ bat_a01,45,18,3	script	Therapist in battle#tv11	95,{
 // Battleground Respawn
 // *********************************************************************
 
-bat_a01,57,213,0	script	#ntv1_respawn	139,{
+bat_a01,57,213,0	script	#ntv1_respawn	HIDDEN_WARP_NPC,{
 	end;
 
 OnBGStart:
@@ -430,7 +430,7 @@ OnTimer20000:
 	end;
 }
 
-bat_a01,50,374,0	script	#gtv1_respawn	139,{
+bat_a01,50,374,0	script	#gtv1_respawn	HIDDEN_WARP_NPC,{
 	end;
 
 OnBGStart:
@@ -452,7 +452,7 @@ OnTimer25000:
 	end;
 }
 
-bat_a01,42,16,0	script	#ctv1_respawn	139,{
+bat_a01,42,16,0	script	#ctv1_respawn	HIDDEN_WARP_NPC,{
 	end;
 
 OnBGStart:
diff --git a/npc/custom/battleground/bg_tierra_02.txt b/npc/custom/battleground/bg_tierra_02.txt
index 7f72cdb3d..23b58dffd 100644
--- a/npc/custom/battleground/bg_tierra_02.txt
+++ b/npc/custom/battleground/bg_tierra_02.txt
@@ -5,7 +5,7 @@
 // Registration NPC's
 // *********************************************************************
 
-bat_room,114,227,4	script	Registration::TV2R_Guillaume	418,{
+bat_room,114,227,4	script	Registration::TV2R_Guillaume	4_M_KY_KNT,{
 	end;
 OnInit:
 	waitingroom "Battle Station 10 Players",10,"Tierra_BG2::OnGuillaumeJoin",1;
@@ -15,7 +15,7 @@ OnEnterBG:
 	end;
 }
 
-bat_room,114,204,0	script	Registration::TV2R_Croix	414,{
+bat_room,114,204,0	script	Registration::TV2R_Croix	4_M_CRU_KNT,{
 	end;
 OnInit:
 	waitingroom "Battle Station 10 Players",10,"Tierra_BG2::OnCroixJoin",1;
@@ -241,23 +241,23 @@ OnReset:
 // Other Flags
 // *********************************************************************
 
-bat_a02,148,85,1	duplicate(Croix camp#bat)	Croix camp#bat22	974
-bat_a02,155,85,1	duplicate(Croix camp#bat)	Croix camp#bat23	974
-bat_a02,357,75,1	duplicate(Croix camp#bat)	Croix camp#bat24	974
-bat_a02,348,74,1	duplicate(Croix camp#bat)	Croix camp#bat25	974
-bat_a02,199,49,1	duplicate(Croix camp#bat)	Croix camp#bat26	974
-bat_a02,168,16,1	duplicate(Croix camp#bat)	Croix camp#bat27	974
-bat_a02,138,12,1	duplicate(Croix camp#bat)	Croix camp#bat28	974
-bat_a02,108,35,1	duplicate(Croix camp#bat)	Croix camp#bat29	974
-bat_a02,164,308,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat23	973
-bat_a02,157,308,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat24	973
-bat_a02,359,327,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat25	973
-bat_a02,350,326,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat26	973
-bat_a02,209,344,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat27	973
-bat_a02,173,380,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat28	973
-bat_a02,150,380,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat29	973
-bat_a02,118,357,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat30	973
-bat_a02,119,336,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat31	973
+bat_a02,148,85,1	duplicate(Croix camp#bat)	Croix camp#bat22	1_FLAG_EAGLE
+bat_a02,155,85,1	duplicate(Croix camp#bat)	Croix camp#bat23	1_FLAG_EAGLE
+bat_a02,357,75,1	duplicate(Croix camp#bat)	Croix camp#bat24	1_FLAG_EAGLE
+bat_a02,348,74,1	duplicate(Croix camp#bat)	Croix camp#bat25	1_FLAG_EAGLE
+bat_a02,199,49,1	duplicate(Croix camp#bat)	Croix camp#bat26	1_FLAG_EAGLE
+bat_a02,168,16,1	duplicate(Croix camp#bat)	Croix camp#bat27	1_FLAG_EAGLE
+bat_a02,138,12,1	duplicate(Croix camp#bat)	Croix camp#bat28	1_FLAG_EAGLE
+bat_a02,108,35,1	duplicate(Croix camp#bat)	Croix camp#bat29	1_FLAG_EAGLE
+bat_a02,164,308,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat23	1_FLAG_LION
+bat_a02,157,308,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat24	1_FLAG_LION
+bat_a02,359,327,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat25	1_FLAG_LION
+bat_a02,350,326,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat26	1_FLAG_LION
+bat_a02,209,344,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat27	1_FLAG_LION
+bat_a02,173,380,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat28	1_FLAG_LION
+bat_a02,150,380,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat29	1_FLAG_LION
+bat_a02,118,357,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat30	1_FLAG_LION
+bat_a02,119,336,1	duplicate(Guillaume camp#bat)	Guillaume camp#bat31	1_FLAG_LION
 
 // Barricades
 // *********************************************************************
@@ -317,7 +317,7 @@ OnWall:
 // Battleground rewards
 // *********************************************************************
 
-bat_a02,45,19,3	script	Croix Vintenar#tv2	415,{
+bat_a02,45,19,3	script	Croix Vintenar#tv2	4_M_CRU_HEAD,{
 	if( $@TierraBG2_Victory )
 	{
 		if( $@TierraBG2_Victory == Bat_Team )
@@ -348,7 +348,7 @@ bat_a02,45,19,3	script	Croix Vintenar#tv2	415,{
 	end;
 }
 
-bat_a02,53,377,3	script	Guillaume Vintenar#tv2	419,{
+bat_a02,53,377,3	script	Guillaume Vintenar#tv2	4_M_KY_HEAD,{
 	if( $@TierraBG2_Victory )
 	{
 		if( $@TierraBG2_Victory == Bat_Team )
@@ -382,14 +382,14 @@ bat_a02,53,377,3	script	Guillaume Vintenar#tv2	419,{
 // Battleground Therapist
 // *********************************************************************
 
-bat_a02,60,216,3	script	Ghost#tv23	950,{
+bat_a02,60,216,3	script	Ghost#tv23	4_GHOSTRING,{
 	mes "[Ghost in valley]";
 	mes "Boo...Boo...";
 	specialeffect2 312;
 	close;
 }
 
-bat_a02,53,377,3	script	Therapist in battle#tv22	95,{
+bat_a02,53,377,3	script	Therapist in battle#tv22	4_F_SISTER,{
 	mes "[Therapist in battle]";
 	mes "Just close your eyes, and take a deep breathe.";
 	mes "You can be free from pain.";
@@ -397,7 +397,7 @@ bat_a02,53,377,3	script	Therapist in battle#tv22	95,{
 	close;
 }
 
-bat_a02,45,18,3	script	Therapist in battle#tv21	95,{
+bat_a02,45,18,3	script	Therapist in battle#tv21	4_F_SISTER,{
 	mes "[Therapist in battle]";
 	mes "Just close your eyes, and take a deep breathe.";
 	mes "You can be free from pain.";
@@ -408,7 +408,7 @@ bat_a02,45,18,3	script	Therapist in battle#tv21	95,{
 // Battleground Respawn
 // *********************************************************************
 
-bat_a02,57,213,0	script	#ntv2_respawn	139,{
+bat_a02,57,213,0	script	#ntv2_respawn	HIDDEN_WARP_NPC,{
 	end;
 
 OnBGStart:
@@ -430,7 +430,7 @@ OnTimer20000:
 	end;
 }
 
-bat_a02,50,374,0	script	#gtv2_respawn	139,{
+bat_a02,50,374,0	script	#gtv2_respawn	HIDDEN_WARP_NPC,{
 	end;
 
 OnBGStart:
@@ -452,7 +452,7 @@ OnTimer25000:
 	end;
 }
 
-bat_a02,42,16,0	script	#ctv2_respawn	139,{
+bat_a02,42,16,0	script	#ctv2_respawn	HIDDEN_WARP_NPC,{
 	end;
 
 OnBGStart: