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

12 files changed, 282 insertions, 282 deletions

diff --git a/npc/battleground/bg_common.txt b/npc/battleground/bg_common.txt
index 76eed3733..2c286e8f5 100644
--- a/npc/battleground/bg_common.txt
+++ b/npc/battleground/bg_common.txt
@@ -22,10 +22,10 @@
 
 // Generals
 //============================================================
-bat_room,161,158,3	script	Gen. Guillaume's Aide#01	419,{ end; }
-bat_room,161,160,3	script	Gen. Guillaume's Aide#03	419,{ end; }
+bat_room,161,158,3	script	Gen. Guillaume's Aide#01	4_M_KY_HEAD,{ end; }
+bat_room,161,160,3	script	Gen. Guillaume's Aide#03	4_M_KY_HEAD,{ end; }
 
-bat_room,160,141,3	script	Prince Croix	416,{
+bat_room,160,141,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?";
@@ -89,10 +89,10 @@ bat_room,160,141,3	script	Prince Croix	416,{
 	end;
 }
 
-bat_room,161,140,3	script	Prince Croix's Aide#01	415,{ end; }
-bat_room,161,142,3	script	Prince Croix's Aide#02	415,{ end; }
+bat_room,161,140,3	script	Prince Croix's Aide#01	4_M_CRU_HEAD,{ end; }
+bat_room,161,142,3	script	Prince Croix's Aide#02	4_M_CRU_HEAD,{ end; }
 
-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.";
@@ -172,14 +172,14 @@ bat_room,160,159,3	script	General Guillaume	420,{
 
 // Flags
 //============================================================
-//bat_room,140,160,3	script	Guillaume Base#roomflag1	973,{ end; }
-//bat_room,167,160,3	script	Guillaume Base#roomflag2	973,{ end; }
-//bat_room,140,139,3	script	Croix Base#roomflag1	974,{ end; }
-//bat_room,167,139,3	script	Croix Base#roomflag2	974,{ end; }
+//bat_room,140,160,3	script	Guillaume Base#roomflag1	1_FLAG_LION,{ end; }
+//bat_room,167,160,3	script	Guillaume Base#roomflag2	1_FLAG_LION,{ end; }
+//bat_room,140,139,3	script	Croix Base#roomflag1	1_FLAG_EAGLE,{ end; }
+//bat_room,167,139,3	script	Croix Base#roomflag2	1_FLAG_EAGLE,{ end; }
 
 // BattleGround Warper
 //============================================================
-bat_room,148,150,5	script	Teleporter#Battlefield	124,{
+bat_room,148,150,5	script	Teleporter#Battlefield	4_F_TELEPORTER,{
 	mes "[Teleporter]";
 	mes "Do you wish to leave the battlefield? Use my services to return to town.";
 	next;
@@ -229,7 +229,7 @@ bat_room,148,150,5	script	Teleporter#Battlefield	124,{
 	end;
 }
 
--	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.";
@@ -270,13 +270,13 @@ bat_room,148,150,5	script	Teleporter#Battlefield	124,{
 	end;
 }
 
-prontera,123,83,3	duplicate(BatRecruit)	Maroll Battle Recruiter::BatRecruit1	728
-moc_ruins,75,162,3	duplicate(BatRecruit)	Maroll Battle Recruiter::BatRecruit2	728
-aldebaran,146,109,3	duplicate(BatRecruit)	Maroll Battle Recruiter::BatRecruit3	728
-geffen,109,66,3	duplicate(BatRecruit)	Maroll Battle Recruiter::BatRecruit4	728
-payon,189,105,3	duplicate(BatRecruit)	Maroll Battle Recruiter::BatRecruit5	728
-lighthalzen,153,86,5	duplicate(BatRecruit)	Maroll Battle Recruiter::BatRecruit6	728
-rachel,149,138,3	duplicate(BatRecruit)	Maroll Battle Recruiter::BatRecruit7	728
+prontera,123,83,3	duplicate(BatRecruit)	Maroll Battle Recruiter::BatRecruit1	4_F_JOB_KNIGHT
+moc_ruins,75,162,3	duplicate(BatRecruit)	Maroll Battle Recruiter::BatRecruit2	4_F_JOB_KNIGHT
+aldebaran,146,109,3	duplicate(BatRecruit)	Maroll Battle Recruiter::BatRecruit3	4_F_JOB_KNIGHT
+geffen,109,66,3	duplicate(BatRecruit)	Maroll Battle Recruiter::BatRecruit4	4_F_JOB_KNIGHT
+payon,189,105,3	duplicate(BatRecruit)	Maroll Battle Recruiter::BatRecruit5	4_F_JOB_KNIGHT
+lighthalzen,153,86,5	duplicate(BatRecruit)	Maroll Battle Recruiter::BatRecruit6	4_F_JOB_KNIGHT
+rachel,149,138,3	duplicate(BatRecruit)	Maroll Battle Recruiter::BatRecruit7	4_F_JOB_KNIGHT
 
 // Additional warps
 // Empty
@@ -309,21 +309,21 @@ bat_room,253,211,0	warp	bat32	1,1,bat_room,154,149
 
 // 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;
 }
 
 // Repairman
 //============================================================
-bat_room,138,144,4	script	Repairman#bg	86,{
+bat_room,138,144,4	script	Repairman#bg	4_M_04,{
 	callfunc "repairmain","Repairman";
 	end;
 }
 
 // GM Management NPC
 //============================================================
-bat_room,1,151,3	script	Switch#batgnd	81,{
+bat_room,1,151,3	script	Switch#batgnd	4_DOG01,{
 	set .@i, callfunc("F_GM_NPC",1854,0);
 	if (.@i == -1) {
 		mes "The command has been cancelled.";
@@ -374,7 +374,7 @@ bat_room,1,151,3	script	Switch#batgnd	81,{
 
 // Badges Exchange
 //============================================================
-bat_room,160,150,3	script	Erundek	109,{
+bat_room,160,150,3	script	Erundek	4_M_MANAGER,{
 	if (checkweight(1201,1) == 0) {
 		mes "- Wait a minute !! -";
 		mes "- Currently you're carrying -";
diff --git a/npc/battleground/flavius/flavius01.txt b/npc/battleground/flavius/flavius01.txt
index 4a5c00a9b..18f153d87 100644
--- a/npc/battleground/flavius/flavius01.txt
+++ b/npc/battleground/flavius/flavius01.txt
@@ -20,7 +20,7 @@
 
 // Waiting Room NPCs
 //============================================================
-bat_room,86,227,4	script	Lieutenant Ator	418,{
+bat_room,86,227,4	script	Lieutenant Ator	4_M_KY_KNT,{
 	end;
 OnInit:
 	waitingroom "Battle Station",11,"start#bat_b01::OnReadyCheck",1,0,80;
@@ -30,7 +30,7 @@ OnEnterBG:
 	end;
 }
 
-bat_room,85,204,0	script	Lieutenant Thelokus	414,{
+bat_room,85,204,0	script	Lieutenant Thelokus	4_M_CRU_KNT,{
 	end;
 OnInit:
 	waitingroom "Battle Station",11,"start#bat_b01::OnReadyCheck",1,0,80;
@@ -43,7 +43,7 @@ OnEnterBG:
 bat_room,85,220,0	warp	back_bgroomb01a	1,1,bat_room,154,150
 bat_room,85,211,0	warp	back_bgroomb01b	1,1,bat_room,154,150
 
-bat_room,2,151,3	script	#bat_b01_timer	844,{
+bat_room,2,151,3	script	#bat_b01_timer	CLEAR_NPC,{
 	end;
 
 OnInit:
@@ -71,7 +71,7 @@ OnTimer1000:
 
 // Flavius Battleground Engine
 //============================================================
-bat_b01,15,15,3	script	start#bat_b01	844,{
+bat_b01,15,15,3	script	start#bat_b01	CLEAR_NPC,{
 OnInit:
 	mapwarp "bat_b01","bat_room",154,150;
 	end;
@@ -147,7 +147,7 @@ OnTimer10000:
 	end;
 }
 
-bat_b01,1,1,3	script	OBJ#bat_b01_a	844,{
+bat_b01,1,1,3	script	OBJ#bat_b01_a	CLEAR_NPC,{
 OnEnable:
 	bg_monster $@FlaviusBG1_id1,"bat_b01",61,150,"Pink Crystal",1915,"OBJ#bat_b01_a::OnMyMobDead";
 	end;
@@ -180,7 +180,7 @@ OnMyMobDead:
 	end;
 }
 
-bat_b01,1,2,3	script	OBJ#bat_b01_b	844,{
+bat_b01,1,2,3	script	OBJ#bat_b01_b	CLEAR_NPC,{
 OnEnable:
 	bg_monster $@FlaviusBG1_id2,"bat_b01",328,150,"Blue Crystal",1914,"OBJ#bat_b01_b::OnMyMobDead";
 	end;
@@ -213,7 +213,7 @@ OnMyMobDead:
 	end;
 }
 
-bat_b01,1,3,3	script	guardian#bat_b01_a	844,{
+bat_b01,1,3,3	script	guardian#bat_b01_a	CLEAR_NPC,{
 OnEnable:
 	bg_monster $@FlaviusBG1_id1,"bat_b01",108,159,"Guillaume Camp Guardian",1949,"guardian#bat_b01_a::OnMyMobDead";
 	bg_monster $@FlaviusBG1_id1,"bat_b01",108,141,"Guillaume Camp Guardian",1949,"guardian#bat_b01_a::OnMyMobDead";
@@ -231,7 +231,7 @@ OnMyMobDead:
 	end;
 }
 
-bat_b01,1,3,3	script	guardian#bat_b01_b	844,{
+bat_b01,1,3,3	script	guardian#bat_b01_b	CLEAR_NPC,{
 OnEnable:
 	bg_monster $@FlaviusBG1_id2,"bat_b01",307,160,"Croix Camp Guardian",1949,"guardian#bat_b01_b::OnMyMobDead";
 	bg_monster $@FlaviusBG1_id2,"bat_b01",307,138,"Croix Camp Guardian",1949,"guardian#bat_b01_b::OnMyMobDead";
@@ -249,7 +249,7 @@ OnMyMobDead:
 	end;
 }
 
-bat_b01,1,4,3	script	cell#bat_b01_a	844,{
+bat_b01,1,4,3	script	cell#bat_b01_a	CLEAR_NPC,{
 OnRed:
 	setcell "bat_b01",62,149,60,151,cell_basilica,1;
 	setcell "bat_b01",62,149,60,151,cell_walkable,0;
@@ -261,7 +261,7 @@ OnGreen:
 	end;
 }
 
-bat_b01,1,5,3	script	cell#bat_b01_b	844,{
+bat_b01,1,5,3	script	cell#bat_b01_b	CLEAR_NPC,{
 OnRed:
 	setcell "bat_b01",327,151,329,149,cell_basilica,1;
 	setcell "bat_b01",327,151,329,149,cell_walkable,0;
@@ -273,7 +273,7 @@ OnGreen:
 	end;
 }
 
-bat_b01,1,6,1	script	time#bat_b01	844,{
+bat_b01,1,6,1	script	time#bat_b01	CLEAR_NPC,{
 OnEnable:
 	donpcevent "Battle Therapist#b01_a::OnEnable";
 	donpcevent "Battle Therapist#b01_b::OnEnable";
@@ -285,7 +285,7 @@ OnStop:
 	end;
 }
 
-bat_b01,10,294,3	script	Battle Therapist#b01_a	95,{
+bat_b01,10,294,3	script	Battle Therapist#b01_a	4_F_SISTER,{
 	specialeffect2 EF_HEAL;
 	mes "[Battle Therapist]";
 	mes "Just close your eyes,";
@@ -319,7 +319,7 @@ OnStop:
 	end;
 }
 
-bat_b01,10,290,0	script	bat_b01_rp1_a_warp	45,10,10,{
+bat_b01,10,290,0	script	bat_b01_rp1_a_warp	WARPNPC,10,10,{
 OnInit:
 	disablenpc "bat_b01_rp1_a_warp";
 	end;
@@ -330,7 +330,7 @@ OnTouch:
 	end;
 }
 
-bat_b01,389,14,3	script	Battle Therapist#b01_b	95,{
+bat_b01,389,14,3	script	Battle Therapist#b01_b	4_F_SISTER,{
 	specialeffect2 EF_HEAL;
 	mes "[Battle Therapist]";
 	mes "Just close your eyes,";
@@ -364,7 +364,7 @@ OnStop:
 	end;
 }
 
-bat_b01,389,10,0	script	bat_b01_rp1_b_warp	45,9,9,{
+bat_b01,389,10,0	script	bat_b01_rp1_b_warp	WARPNPC,9,9,{
 OnInit:
 	disablenpc "bat_b01_rp1_a_warp";
 	end;
@@ -389,7 +389,7 @@ OnTouch:
 	end;
 }
 
-bat_b01,10,294,3	script	Guillaume Vintenar#b01_a	934,{
+bat_b01,10,294,3	script	Guillaume Vintenar#b01_a	4_M_RASWORD,{
 	if ($@FlaviusBG1_id1 == getcharid(4)) {
 		if ($@FlaviusBG1_Victory == 1) {
 			set .@your_medal,countitem(7829);
@@ -441,7 +441,7 @@ OnInit:
 	end;
 }
 
-bat_b01,389,14,3	script	Croix Vintenar#b01_b	934,{
+bat_b01,389,14,3	script	Croix Vintenar#b01_b	4_M_RASWORD,{
 	if ($@FlaviusBG1_id2 == getcharid(4)) {
 		if ($@FlaviusBG1_Victory == 2) {
 			set .@your_medal,countitem(7829);
@@ -493,7 +493,7 @@ OnInit:
 	end;
 }
 
-bat_b01,1,5,3	script	countdown#bat_b01	844,{
+bat_b01,1,5,3	script	countdown#bat_b01	CLEAR_NPC,{
 OnInit:
 	stopnpctimer;
 	end;
@@ -549,31 +549,31 @@ OnTimer1900000:
 	end;
 }
 
-bat_b01,81,83,3	script	Guillaume Camp#flag21	973,{ end; }
-bat_b01,94,83,3	script	Guillaume Camp#flag22	973,{ end; }
-bat_b01,81,66,3	script	Guillaume Camp#flag23	973,{ end; }
-bat_b01,94,66,3	script	Guillaume Camp#flag24	973,{ end; }
-bat_b01,139,142,3	script	Guillaume Camp#flag25	973,{ end; }
-bat_b01,139,158,3	script	Guillaume Camp#flag26	973,{ end; }
-bat_b01,110,161,3	script	Guillaume Camp#flag27	973,{ end; }
-bat_b01,110,137,3	script	Guillaume Camp#flag28	973,{ end; }
-bat_b01,63,135,3	script	Guillaume Camp#flag29	973,{ end; }
-bat_b01,63,165,3	script	Guillaume Camp#flag30	973,{ end; }
-bat_b01,10,296,3	script	Guillaume Camp#flag31	973,{ end; }
-
-bat_b01,306,233,3	script	Croix Camp#flag21	974,{ end; }
-bat_b01,317,233,3	script	Croix Camp#flag22	974,{ end; }
-bat_b01,306,216,3	script	Croix Camp#flag23	974,{ end; }
-bat_b01,317,216,3	script	Croix Camp#flag24	974,{ end; }
-bat_b01,257,158,3	script	Croix Camp#flag25	974,{ end; }
-bat_b01,257,141,3	script	Croix Camp#flag26	974,{ end; }
-bat_b01,297,164,3	script	Croix Camp#flag27	974,{ end; }
-bat_b01,297,136,3	script	Croix Camp#flag28	974,{ end; }
-bat_b01,336,161,3	script	Croix Camp#flag29	974,{ end; }
-bat_b01,336,139,3	script	Croix Camp#flag30	974,{ end; }
-bat_b01,389,16,3	script	Croix Camp#flag31	974,{ end; }
-
-bat_b01,10,294,3	script	Vintenar#bat_b01_aover	419,{
+bat_b01,81,83,3	script	Guillaume Camp#flag21	1_FLAG_LION,{ end; }
+bat_b01,94,83,3	script	Guillaume Camp#flag22	1_FLAG_LION,{ end; }
+bat_b01,81,66,3	script	Guillaume Camp#flag23	1_FLAG_LION,{ end; }
+bat_b01,94,66,3	script	Guillaume Camp#flag24	1_FLAG_LION,{ end; }
+bat_b01,139,142,3	script	Guillaume Camp#flag25	1_FLAG_LION,{ end; }
+bat_b01,139,158,3	script	Guillaume Camp#flag26	1_FLAG_LION,{ end; }
+bat_b01,110,161,3	script	Guillaume Camp#flag27	1_FLAG_LION,{ end; }
+bat_b01,110,137,3	script	Guillaume Camp#flag28	1_FLAG_LION,{ end; }
+bat_b01,63,135,3	script	Guillaume Camp#flag29	1_FLAG_LION,{ end; }
+bat_b01,63,165,3	script	Guillaume Camp#flag30	1_FLAG_LION,{ end; }
+bat_b01,10,296,3	script	Guillaume Camp#flag31	1_FLAG_LION,{ end; }
+
+bat_b01,306,233,3	script	Croix Camp#flag21	1_FLAG_EAGLE,{ end; }
+bat_b01,317,233,3	script	Croix Camp#flag22	1_FLAG_EAGLE,{ end; }
+bat_b01,306,216,3	script	Croix Camp#flag23	1_FLAG_EAGLE,{ end; }
+bat_b01,317,216,3	script	Croix Camp#flag24	1_FLAG_EAGLE,{ end; }
+bat_b01,257,158,3	script	Croix Camp#flag25	1_FLAG_EAGLE,{ end; }
+bat_b01,257,141,3	script	Croix Camp#flag26	1_FLAG_EAGLE,{ end; }
+bat_b01,297,164,3	script	Croix Camp#flag27	1_FLAG_EAGLE,{ end; }
+bat_b01,297,136,3	script	Croix Camp#flag28	1_FLAG_EAGLE,{ end; }
+bat_b01,336,161,3	script	Croix Camp#flag29	1_FLAG_EAGLE,{ end; }
+bat_b01,336,139,3	script	Croix Camp#flag30	1_FLAG_EAGLE,{ end; }
+bat_b01,389,16,3	script	Croix Camp#flag31	1_FLAG_EAGLE,{ end; }
+
+bat_b01,10,294,3	script	Vintenar#bat_b01_aover	4_M_KY_HEAD,{
 	set .@A_B_gap,$@Guill_ScoreBG1 - $@Croix_ScoreBG1;
 	if ($@FlaviusBG1_id1 == getcharid(4)) {
 		if (.@A_B_gap > 0) {
@@ -651,7 +651,7 @@ OnInit:
 	end;
 }
 
-bat_b01,389,14,3	script	Vintenar#bat_b01_bover	415,{
+bat_b01,389,14,3	script	Vintenar#bat_b01_bover	4_M_CRU_HEAD,{
 	set .@A_B_gap,$@Guill_ScoreBG1 - $@Croix_ScoreBG1;
 	if ($@FlaviusBG1_id2 == getcharid(4)) {
 		if (.@A_B_gap > 0) {
@@ -729,7 +729,7 @@ OnInit:
 	end;
 }
 
-bat_b01,1,10,3	script	Release all#b01	81,{
+bat_b01,1,10,3	script	Release all#b01	4_DOG01,{
 	set .@i, callfunc("F_GM_NPC",1854,0);
 	if (.@i == -1) {
 		mes "Cancelled.";
diff --git a/npc/battleground/flavius/flavius02.txt b/npc/battleground/flavius/flavius02.txt
index aebeab4f2..0a88b9919 100644
--- a/npc/battleground/flavius/flavius02.txt
+++ b/npc/battleground/flavius/flavius02.txt
@@ -21,7 +21,7 @@
 
 // Waiting Room NPCs
 //============================================================
-bat_room,142,227,4	script	Lieutenant Huvas	418,{
+bat_room,142,227,4	script	Lieutenant Huvas	4_M_KY_KNT,{
 	end;
 OnInit:
 	waitingroom "Battle Station",11,"start#bat_b02::OnReadyCheck",1,0,80;
@@ -31,7 +31,7 @@ OnEnterBG:
 	end;
 }
 
-bat_room,142,204,0	script	Lieutenant Yukon	414,{
+bat_room,142,204,0	script	Lieutenant Yukon	4_M_CRU_KNT,{
 	end;
 OnInit:
 	waitingroom "Battle Station",11,"start#bat_b02::OnReadyCheck",1,0,80;
@@ -44,7 +44,7 @@ OnEnterBG:
 bat_room,141,220,0	warp	back_bgroomb02a	1,1,bat_room,154,150
 bat_room,141,211,0	warp	back_bgroomb02b	1,1,bat_room,154,150
 
-bat_room,2,151,3	script	#bat_b02_timer	844,{
+bat_room,2,151,3	script	#bat_b02_timer	CLEAR_NPC,{
 	end;
 
 OnInit:
@@ -72,7 +72,7 @@ OnTimer1000:
 
 // Flavius Battleground Engine
 //============================================================
-bat_b02,15,15,3	script	start#bat_b02	844,{
+bat_b02,15,15,3	script	start#bat_b02	CLEAR_NPC,{
 OnInit:
 	mapwarp "bat_b02","bat_room",154,150;
 	end;
@@ -148,7 +148,7 @@ OnTimer10000:
 	end;
 }
 
-bat_b02,1,1,3	script	OBJ#bat_b02_a	844,{
+bat_b02,1,1,3	script	OBJ#bat_b02_a	CLEAR_NPC,{
 OnEnable:
 	bg_monster $@FlaviusBG2_id1,"bat_b02",61,150,"Pink Crystal",1915,"OBJ#bat_b02_a::OnMyMobDead";
 	end;
@@ -181,7 +181,7 @@ OnMyMobDead:
 	end;
 }
 
-bat_b02,1,2,3	script	OBJ#bat_b02_b	844,{
+bat_b02,1,2,3	script	OBJ#bat_b02_b	CLEAR_NPC,{
 OnEnable:
 	bg_monster $@FlaviusBG2_id2,"bat_b02",328,150,"Blue Crystal",1914,"OBJ#bat_b02_b::OnMyMobDead";
 	end;
@@ -214,7 +214,7 @@ OnMyMobDead:
 	end;
 }
 
-bat_b02,1,3,3	script	guardian#bat_b02_a	844,{
+bat_b02,1,3,3	script	guardian#bat_b02_a	CLEAR_NPC,{
 OnEnable:
 	bg_monster $@FlaviusBG2_id1,"bat_b02",108,159,"Guillaume Camp Guardian",1949,"guardian#bat_b02_a::OnMyMobDead";
 	bg_monster $@FlaviusBG2_id1,"bat_b02",108,141,"Guillaume Camp Guardian",1949,"guardian#bat_b02_a::OnMyMobDead";
@@ -232,7 +232,7 @@ OnMyMobDead:
 	end;
 }
 
-bat_b02,1,3,3	script	guardian#bat_b02_b	844,{
+bat_b02,1,3,3	script	guardian#bat_b02_b	CLEAR_NPC,{
 OnEnable:
 	bg_monster $@FlaviusBG2_id2,"bat_b02",307,160,"Croix Camp Guardian",1949,"guardian#bat_b02_b::OnMyMobDead";
 	bg_monster $@FlaviusBG2_id2,"bat_b02",307,138,"Croix Camp Guardian",1949,"guardian#bat_b02_b::OnMyMobDead";
@@ -250,7 +250,7 @@ OnMyMobDead:
 	end;
 }
 
-bat_b02,1,4,3	script	cell#bat_b02_a	844,{
+bat_b02,1,4,3	script	cell#bat_b02_a	CLEAR_NPC,{
 OnRed:
 	setcell "bat_b02",62,149,60,151,cell_basilica,1;
 	setcell "bat_b02",62,149,60,151,cell_walkable,0;
@@ -262,7 +262,7 @@ OnGreen:
 	end;
 }
 
-bat_b02,1,5,3	script	cell#bat_b02_b	844,{
+bat_b02,1,5,3	script	cell#bat_b02_b	CLEAR_NPC,{
 OnRed:
 	setcell "bat_b02",327,151,329,149,cell_basilica,1;
 	setcell "bat_b02",327,151,329,149,cell_walkable,0;
@@ -274,7 +274,7 @@ OnGreen:
 	end;
 }
 
-bat_b02,1,6,1	script	time#bat_b02	844,{
+bat_b02,1,6,1	script	time#bat_b02	CLEAR_NPC,{
 OnEnable:
 	donpcevent "Battle Therapist#b02_a::OnEnable";
 	donpcevent "Battle Therapist#b02_b::OnEnable";
@@ -286,7 +286,7 @@ OnStop:
 	end;
 }
 
-bat_b02,10,294,3	script	Battle Therapist#b02_a	95,{
+bat_b02,10,294,3	script	Battle Therapist#b02_a	4_F_SISTER,{
 	specialeffect2 EF_HEAL;
 	mes "[Battle Therapist]";
 	mes "Just close your eyes,";
@@ -320,7 +320,7 @@ OnStop:
 	end;
 }
 
-bat_b02,10,290,0	script	bat_b02_rp1_a_warp	45,10,10,{
+bat_b02,10,290,0	script	bat_b02_rp1_a_warp	WARPNPC,10,10,{
 OnInit:
 	disablenpc "bat_b02_rp1_a_warp";
 	end;
@@ -331,7 +331,7 @@ OnTouch:
 	end;
 }
 
-bat_b02,389,14,3	script	Battle Therapist#b02_b	95,{
+bat_b02,389,14,3	script	Battle Therapist#b02_b	4_F_SISTER,{
 	specialeffect2 EF_HEAL;
 	mes "[Battle Therapist]";
 	mes "Just close your eyes,";
@@ -365,7 +365,7 @@ OnStop:
 	end;
 }
 
-bat_b02,389,10,0	script	bat_b02_rp1_b_warp	45,9,9,{
+bat_b02,389,10,0	script	bat_b02_rp1_b_warp	WARPNPC,9,9,{
 OnInit:
 	disablenpc "bat_b02_rp1_a_warp";
 	end;
@@ -390,7 +390,7 @@ OnTouch:
 	end;
 }
 
-bat_b02,10,294,3	script	Guillaume Vintenar#b02_a	934,{
+bat_b02,10,294,3	script	Guillaume Vintenar#b02_a	4_M_RASWORD,{
 	if ($@FlaviusBG2_id1 == getcharid(4)) {
 		if ($@FlaviusBG2_Victory == 1) {
 			set .@your_medal,countitem(7829);
@@ -442,7 +442,7 @@ OnInit:
 	end;
 }
 
-bat_b02,389,14,3	script	Croix Vintenar#b02_b	934,{
+bat_b02,389,14,3	script	Croix Vintenar#b02_b	4_M_RASWORD,{
 	if ($@FlaviusBG2_id2 == getcharid(4)) {
 		if ($@FlaviusBG2_Victory == 2) {
 			set .@your_medal,countitem(7829);
@@ -494,7 +494,7 @@ OnInit:
 	end;
 }
 
-bat_b02,1,5,3	script	countdown#bat_b02	844,{
+bat_b02,1,5,3	script	countdown#bat_b02	CLEAR_NPC,{
 OnInit:
 	stopnpctimer;
 	end;
@@ -550,31 +550,31 @@ OnTimer1900000:
 	end;
 }
 
-bat_b02,81,83,3	script	Guillaume Camp#flag32	973,{ end; }
-bat_b02,94,83,3	script	Guillaume Camp#flag33	973,{ end; }
-bat_b02,81,66,3	script	Guillaume Camp#flag34	973,{ end; }
-bat_b02,94,66,3	script	Guillaume Camp#flag35	973,{ end; }
-bat_b02,139,142,3	script	Guillaume Camp#flag36	973,{ end; }
-bat_b02,139,158,3	script	Guillaume Camp#flag37	973,{ end; }
-bat_b02,110,161,3	script	Guillaume Camp#flag38	973,{ end; }
-bat_b02,110,137,3	script	Guillaume Camp#flag39	973,{ end; }
-bat_b02,63,135,3	script	Guillaume Camp#flag40	973,{ end; }
-bat_b02,63,165,3	script	Guillaume Camp#flag41	973,{ end; }
-bat_b02,10,296,3	script	Guillaume Camp#flag42	973,{ end; }
-
-bat_b02,306,233,3	script	Croix Camp#flag32	974,{ end; }
-bat_b02,317,233,3	script	Croix Camp#flag33	974,{ end; }
-bat_b02,306,216,3	script	Croix Camp#flag34	974,{ end; }
-bat_b02,317,216,3	script	Croix Camp#flag35	974,{ end; }
-bat_b02,257,158,3	script	Croix Camp#flag36	974,{ end; }
-bat_b02,257,141,3	script	Croix Camp#flag37	974,{ end; }
-bat_b02,297,164,3	script	Croix Camp#flag38	974,{ end; }
-bat_b02,297,136,3	script	Croix Camp#flag39	974,{ end; }
-bat_b02,336,161,3	script	Croix Camp#flag40	974,{ end; }
-bat_b02,336,139,3	script	Croix Camp#flag41	974,{ end; }
-bat_b02,389,16,3	script	Croix Camp#flag42	974,{ end; }
-
-bat_b02,10,294,3	script	Vintenar#bat_b02_aover	419,{
+bat_b02,81,83,3	script	Guillaume Camp#flag32	1_FLAG_LION,{ end; }
+bat_b02,94,83,3	script	Guillaume Camp#flag33	1_FLAG_LION,{ end; }
+bat_b02,81,66,3	script	Guillaume Camp#flag34	1_FLAG_LION,{ end; }
+bat_b02,94,66,3	script	Guillaume Camp#flag35	1_FLAG_LION,{ end; }
+bat_b02,139,142,3	script	Guillaume Camp#flag36	1_FLAG_LION,{ end; }
+bat_b02,139,158,3	script	Guillaume Camp#flag37	1_FLAG_LION,{ end; }
+bat_b02,110,161,3	script	Guillaume Camp#flag38	1_FLAG_LION,{ end; }
+bat_b02,110,137,3	script	Guillaume Camp#flag39	1_FLAG_LION,{ end; }
+bat_b02,63,135,3	script	Guillaume Camp#flag40	1_FLAG_LION,{ end; }
+bat_b02,63,165,3	script	Guillaume Camp#flag41	1_FLAG_LION,{ end; }
+bat_b02,10,296,3	script	Guillaume Camp#flag42	1_FLAG_LION,{ end; }
+
+bat_b02,306,233,3	script	Croix Camp#flag32	1_FLAG_EAGLE,{ end; }
+bat_b02,317,233,3	script	Croix Camp#flag33	1_FLAG_EAGLE,{ end; }
+bat_b02,306,216,3	script	Croix Camp#flag34	1_FLAG_EAGLE,{ end; }
+bat_b02,317,216,3	script	Croix Camp#flag35	1_FLAG_EAGLE,{ end; }
+bat_b02,257,158,3	script	Croix Camp#flag36	1_FLAG_EAGLE,{ end; }
+bat_b02,257,141,3	script	Croix Camp#flag37	1_FLAG_EAGLE,{ end; }
+bat_b02,297,164,3	script	Croix Camp#flag38	1_FLAG_EAGLE,{ end; }
+bat_b02,297,136,3	script	Croix Camp#flag39	1_FLAG_EAGLE,{ end; }
+bat_b02,336,161,3	script	Croix Camp#flag40	1_FLAG_EAGLE,{ end; }
+bat_b02,336,139,3	script	Croix Camp#flag41	1_FLAG_EAGLE,{ end; }
+bat_b02,389,16,3	script	Croix Camp#flag42	1_FLAG_EAGLE,{ end; }
+
+bat_b02,10,294,3	script	Vintenar#bat_b02_aover	4_M_KY_HEAD,{
 	set .@A_B_gap,$@Guill_ScoreBG2 - $@Croix_ScoreBG2;
 	if ($@FlaviusBG2_id1 == getcharid(4)) {
 		if (.@A_B_gap > 0) {
@@ -652,7 +652,7 @@ OnInit:
 	end;
 }
 
-bat_b02,389,14,3	script	Vintenar#bat_b02_bover	415,{
+bat_b02,389,14,3	script	Vintenar#bat_b02_bover	4_M_CRU_HEAD,{
 	set .@A_B_gap,$@Guill_ScoreBG2 - $@Croix_ScoreBG2;
 	if ($@FlaviusBG2_id2 == getcharid(4)) {
 		if (.@A_B_gap > 0) {
@@ -730,7 +730,7 @@ OnInit:
 	end;
 }
 
-bat_b02,1,10,3	script	Release all#b02	81,{
+bat_b02,1,10,3	script	Release all#b02	4_DOG01,{
 	set .@i, callfunc("F_GM_NPC",1854,0);
 	if (.@i == -1) {
 		mes "Cancelled.";
diff --git a/npc/battleground/flavius/flavius_enter.txt b/npc/battleground/flavius/flavius_enter.txt
index 92dae7b9e..026b4402f 100644
--- a/npc/battleground/flavius/flavius_enter.txt
+++ b/npc/battleground/flavius/flavius_enter.txt
@@ -13,7 +13,7 @@
 
 // Flavius Officer - Guillaume
 //============================================================
-bat_room,133,178,5	script	Flavius Officer#01a	418,{
+bat_room,133,178,5	script	Flavius Officer#01a	4_M_KY_KNT,{
 	if (checkweight(1201,1) == 0) {
 		mes "- Wait a minute !! -";
 		mes "- Currently you're carrying -";
@@ -80,7 +80,7 @@ bat_room,133,178,5	script	Flavius Officer#01a	418,{
 	close;
 }
 
-bat_room,133,121,1	script	Flavius Officer#01b	414,{
+bat_room,133,121,1	script	Flavius Officer#01b	4_M_CRU_KNT,{
 	if (checkweight(1201,1) == 0) {
 		mes "- Wait a minute !! -";
 		mes "- Currently you're carrying -";
@@ -147,7 +147,7 @@ bat_room,133,121,1	script	Flavius Officer#01b	414,{
 	close;
 }
 
-bat_room,135,178,5	script	Guillaume Knight#3	417,{
+bat_room,135,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;
@@ -169,7 +169,7 @@ bat_room,135,178,5	script	Guillaume Knight#3	417,{
 	close;
 }
 
-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;
@@ -191,7 +191,7 @@ bat_room,151,178,5	script	Guillaume Knight#4	417,{
 	close;
 }
 
-bat_room,135,121,1	script	Croix Knight#3	413,{
+bat_room,135,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;
@@ -213,7 +213,7 @@ bat_room,135,121,1	script	Croix Knight#3	413,{
 	close;
 }
 
-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;
@@ -237,7 +237,7 @@ bat_room,151,121,1	script	Croix Knight#4	413,{
 
 // Flavius Officer - Croix
 //============================================================
-bat_room,148,178,5	script	Flavius Officer#02a	418,{
+bat_room,148,178,5	script	Flavius Officer#02a	4_M_KY_KNT,{
 	if (checkweight(1201,1) == 0) {
 		mes "- Wait a minute !! -";
 		mes "- Currently you're carrying -";
@@ -304,7 +304,7 @@ bat_room,148,178,5	script	Flavius Officer#02a	418,{
 	close;
 }
 
-bat_room,148,121,1	script	Flavius Officer#02b	414,{
+bat_room,148,121,1	script	Flavius Officer#02b	4_M_CRU_KNT,{
 	if (checkweight(1201,1) == 0) {
 		mes "- Wait a minute !! -";
 		mes "- Currently you're carrying -";
diff --git a/npc/battleground/kvm/kvm01.txt b/npc/battleground/kvm/kvm01.txt
index 01119b97e..4fb84ddc3 100644
--- a/npc/battleground/kvm/kvm01.txt
+++ b/npc/battleground/kvm/kvm01.txt
@@ -19,7 +19,7 @@
 
 // Waiting Room NPCs
 //============================================================
-bat_room,169,226,5	script	KVM Waiting Room#a::KvM01R_Guillaume	418,{
+bat_room,169,226,5	script	KVM Waiting Room#a::KvM01R_Guillaume	4_M_KY_KNT,{
 	end;
 
 OnInit:
@@ -33,7 +33,7 @@ OnEnterBG:
 
 bat_room,169,220,0	warp	#kvm801	2,2,bat_room,154,150
 
-bat_room,169,205,3	script	KVM Waiting Room#b::KvM01R_Croix	414,{
+bat_room,169,205,3	script	KVM Waiting Room#b::KvM01R_Croix	4_M_CRU_KNT,{
 	end;
 
 OnInit:
@@ -61,23 +61,23 @@ OnKvM01Two:
 	end;
 }
 
-bat_c01,54,124,3	duplicate(CellEffect)	#RedcellA1-1	139
-bat_c01,55,124,3	duplicate(CellEffect)	#RedcellA2-1	139
-bat_c01,56,124,3	duplicate(CellEffect)	#RedcellA3-1	139
-bat_c01,57,124,3	duplicate(CellEffect)	#RedcellA4-1	139
-bat_c01,57,125,3	duplicate(CellEffect)	#RedcellA5-1	139
-bat_c01,57,126,3	duplicate(CellEffect)	#RedcellA6-1	139
-bat_c01,57,127,3	duplicate(CellEffect)	#RedcellA7-1	139
+bat_c01,54,124,3	duplicate(CellEffect)	#RedcellA1-1	HIDDEN_WARP_NPC
+bat_c01,55,124,3	duplicate(CellEffect)	#RedcellA2-1	HIDDEN_WARP_NPC
+bat_c01,56,124,3	duplicate(CellEffect)	#RedcellA3-1	HIDDEN_WARP_NPC
+bat_c01,57,124,3	duplicate(CellEffect)	#RedcellA4-1	HIDDEN_WARP_NPC
+bat_c01,57,125,3	duplicate(CellEffect)	#RedcellA5-1	HIDDEN_WARP_NPC
+bat_c01,57,126,3	duplicate(CellEffect)	#RedcellA6-1	HIDDEN_WARP_NPC
+bat_c01,57,127,3	duplicate(CellEffect)	#RedcellA7-1	HIDDEN_WARP_NPC
 
-bat_c01,145,59,3	duplicate(CellEffect)	#RedcellB1-1	139
-bat_c01,144,59,3	duplicate(CellEffect)	#RedcellB2-1	139
-bat_c01,143,59,3	duplicate(CellEffect)	#RedcellB3-1	139
-bat_c01,142,59,3	duplicate(CellEffect)	#RedcellB4-1	139
-bat_c01,142,56,3	duplicate(CellEffect)	#RedcellB5-1	139
-bat_c01,142,57,3	duplicate(CellEffect)	#RedcellB6-1	139
-bat_c01,142,58,3	duplicate(CellEffect)	#RedcellB7-1	139
+bat_c01,145,59,3	duplicate(CellEffect)	#RedcellB1-1	HIDDEN_WARP_NPC
+bat_c01,144,59,3	duplicate(CellEffect)	#RedcellB2-1	HIDDEN_WARP_NPC
+bat_c01,143,59,3	duplicate(CellEffect)	#RedcellB3-1	HIDDEN_WARP_NPC
+bat_c01,142,59,3	duplicate(CellEffect)	#RedcellB4-1	HIDDEN_WARP_NPC
+bat_c01,142,56,3	duplicate(CellEffect)	#RedcellB5-1	HIDDEN_WARP_NPC
+bat_c01,142,57,3	duplicate(CellEffect)	#RedcellB6-1	HIDDEN_WARP_NPC
+bat_c01,142,58,3	duplicate(CellEffect)	#RedcellB7-1	HIDDEN_WARP_NPC
 
-bat_c01,54,128,3	script	#A_camp_start01	139,4,4,{
+bat_c01,54,128,3	script	#A_camp_start01	HIDDEN_WARP_NPC,4,4,{
 	end;
 
 OnInit:
@@ -98,7 +98,7 @@ OnTouch:
 	end;
 }
 
-bat_c01,146,56,3	script	#B_camp_start01	139,4,4,{
+bat_c01,146,56,3	script	#B_camp_start01	HIDDEN_WARP_NPC,4,4,{
 	end;
 
 OnInit:
@@ -369,7 +369,7 @@ OnTimer60000:
 
 // Battleground rewards
 //============================================================
-bat_c01,51,130,5	script	KVM Officer#KVM01A	419,{
+bat_c01,51,130,5	script	KVM Officer#KVM01A	4_M_KY_HEAD,{
 	if( $@KvM01BG_Victory )
 	{
 		if( $@KvM01BG_Victory == Bat_Team )
@@ -398,7 +398,7 @@ bat_c01,51,130,5	script	KVM Officer#KVM01A	419,{
 	end;
 }
 
-bat_c01,148,53,1	script	KVM Officer#KVM01B	415,{
+bat_c01,148,53,1	script	KVM Officer#KVM01B	4_M_CRU_HEAD,{
 	if( $@KvM01BG_Victory )
 	{
 		if( $@KvM01BG_Victory == Bat_Team )
diff --git a/npc/battleground/kvm/kvm02.txt b/npc/battleground/kvm/kvm02.txt
index bb5991b1c..33982a2c5 100644
--- a/npc/battleground/kvm/kvm02.txt
+++ b/npc/battleground/kvm/kvm02.txt
@@ -21,7 +21,7 @@
 
 // Waiting Room NPCs
 //============================================================
-bat_room,197,226,5	script	KVM Waiting Room#a2::KvM02R_Guillaume	418,{
+bat_room,197,226,5	script	KVM Waiting Room#a2::KvM02R_Guillaume	4_M_KY_KNT,{
 	end;
 
 OnInit:
@@ -35,7 +35,7 @@ OnEnterBG:
 
 bat_room,197,220,0	warp	#kvm601	2,2,bat_room,154,150
 
-bat_room,197,205,3	script	KVM Waiting Room#b2::KvM02R_Croix	414,{
+bat_room,197,205,3	script	KVM Waiting Room#b2::KvM02R_Croix	4_M_CRU_KNT,{
 	end;
 
 OnInit:
@@ -63,23 +63,23 @@ OnKvM02Two:
 	end;
 }
 
-bat_c02,54,124,3	duplicate(CellEffect2)	#RedcellA1-2	139
-bat_c02,55,124,3	duplicate(CellEffect2)	#RedcellA2-2	139
-bat_c02,56,124,3	duplicate(CellEffect2)	#RedcellA3-2	139
-bat_c02,57,124,3	duplicate(CellEffect2)	#RedcellA4-2	139
-bat_c02,57,125,3	duplicate(CellEffect2)	#RedcellA5-2	139
-bat_c02,57,126,3	duplicate(CellEffect2)	#RedcellA6-2	139
-bat_c02,57,127,3	duplicate(CellEffect2)	#RedcellA7-2	139
+bat_c02,54,124,3	duplicate(CellEffect2)	#RedcellA1-2	HIDDEN_WARP_NPC
+bat_c02,55,124,3	duplicate(CellEffect2)	#RedcellA2-2	HIDDEN_WARP_NPC
+bat_c02,56,124,3	duplicate(CellEffect2)	#RedcellA3-2	HIDDEN_WARP_NPC
+bat_c02,57,124,3	duplicate(CellEffect2)	#RedcellA4-2	HIDDEN_WARP_NPC
+bat_c02,57,125,3	duplicate(CellEffect2)	#RedcellA5-2	HIDDEN_WARP_NPC
+bat_c02,57,126,3	duplicate(CellEffect2)	#RedcellA6-2	HIDDEN_WARP_NPC
+bat_c02,57,127,3	duplicate(CellEffect2)	#RedcellA7-2	HIDDEN_WARP_NPC
 
-bat_c02,145,59,3	duplicate(CellEffect2)	#RedcellB1-2	139
-bat_c02,144,59,3	duplicate(CellEffect2)	#RedcellB2-2	139
-bat_c02,143,59,3	duplicate(CellEffect2)	#RedcellB3-2	139
-bat_c02,142,59,3	duplicate(CellEffect2)	#RedcellB4-2	139
-bat_c02,142,56,3	duplicate(CellEffect2)	#RedcellB5-2	139
-bat_c02,142,57,3	duplicate(CellEffect2)	#RedcellB6-2	139
-bat_c02,142,58,3	duplicate(CellEffect2)	#RedcellB7-2	139
+bat_c02,145,59,3	duplicate(CellEffect2)	#RedcellB1-2	HIDDEN_WARP_NPC
+bat_c02,144,59,3	duplicate(CellEffect2)	#RedcellB2-2	HIDDEN_WARP_NPC
+bat_c02,143,59,3	duplicate(CellEffect2)	#RedcellB3-2	HIDDEN_WARP_NPC
+bat_c02,142,59,3	duplicate(CellEffect2)	#RedcellB4-2	HIDDEN_WARP_NPC
+bat_c02,142,56,3	duplicate(CellEffect2)	#RedcellB5-2	HIDDEN_WARP_NPC
+bat_c02,142,57,3	duplicate(CellEffect2)	#RedcellB6-2	HIDDEN_WARP_NPC
+bat_c02,142,58,3	duplicate(CellEffect2)	#RedcellB7-2	HIDDEN_WARP_NPC
 
-bat_c02,54,128,3	script	#A_camp_start02	139,4,4,{
+bat_c02,54,128,3	script	#A_camp_start02	HIDDEN_WARP_NPC,4,4,{
 	end;
 
 OnInit:
@@ -100,7 +100,7 @@ OnTouch:
 	end;
 }
 
-bat_c02,146,56,3	script	#B_camp_start02	139,4,4,{
+bat_c02,146,56,3	script	#B_camp_start02	HIDDEN_WARP_NPC,4,4,{
 	end;
 
 OnInit:
@@ -371,7 +371,7 @@ OnTimer60000:
 
 // Battleground rewards
 //============================================================
-bat_c02,51,130,5	script	KVM Officer#KVM02A	419,{
+bat_c02,51,130,5	script	KVM Officer#KVM02A	4_M_KY_HEAD,{
 	if( $@KvM01BG_Victory )
 	{
 		if( $@KvM02BG_Victory == Bat_Team )
@@ -399,7 +399,7 @@ bat_c02,51,130,5	script	KVM Officer#KVM02A	419,{
 	end;
 }
 
-bat_c02,148,53,1	script	KVM Officer#KVM02B	415,{
+bat_c02,148,53,1	script	KVM Officer#KVM02B	4_M_CRU_HEAD,{
 	if( $@KvM01BG_Victory )
 	{
 		if( $@KvM02BG_Victory == Bat_Team )
diff --git a/npc/battleground/kvm/kvm03.txt b/npc/battleground/kvm/kvm03.txt
index 20abbdeb6..6866a7147 100644
--- a/npc/battleground/kvm/kvm03.txt
+++ b/npc/battleground/kvm/kvm03.txt
@@ -20,7 +20,7 @@
 
 // Waiting Room NPCs
 //============================================================
-bat_room,225,226,5	script	KVM Waiting Room#a3::KvM03R_Guillaume	418,{
+bat_room,225,226,5	script	KVM Waiting Room#a3::KvM03R_Guillaume	4_M_KY_KNT,{
 	end;
 
 OnInit:
@@ -34,7 +34,7 @@ OnEnterBG:
 
 bat_room,225,220,0	warp	#kvm701	2,2,bat_room,154,150
 
-bat_room,225,205,3	script	KVM Waiting Room#b3::KvM03R_Croix	414,{
+bat_room,225,205,3	script	KVM Waiting Room#b3::KvM03R_Croix	4_M_CRU_KNT,{
 	end;
 
 OnInit:
@@ -62,23 +62,23 @@ OnKvM03Two:
 	end;
 }
 
-bat_c03,54,124,3	duplicate(CellEffect3)	#RedcellA1-3	139
-bat_c03,55,124,3	duplicate(CellEffect3)	#RedcellA2-3	139
-bat_c03,56,124,3	duplicate(CellEffect3)	#RedcellA3-3	139
-bat_c03,57,124,3	duplicate(CellEffect3)	#RedcellA4-3	139
-bat_c03,57,125,3	duplicate(CellEffect3)	#RedcellA5-3	139
-bat_c03,57,126,3	duplicate(CellEffect3)	#RedcellA6-3	139
-bat_c03,57,127,3	duplicate(CellEffect3)	#RedcellA7-3	139
+bat_c03,54,124,3	duplicate(CellEffect3)	#RedcellA1-3	HIDDEN_WARP_NPC
+bat_c03,55,124,3	duplicate(CellEffect3)	#RedcellA2-3	HIDDEN_WARP_NPC
+bat_c03,56,124,3	duplicate(CellEffect3)	#RedcellA3-3	HIDDEN_WARP_NPC
+bat_c03,57,124,3	duplicate(CellEffect3)	#RedcellA4-3	HIDDEN_WARP_NPC
+bat_c03,57,125,3	duplicate(CellEffect3)	#RedcellA5-3	HIDDEN_WARP_NPC
+bat_c03,57,126,3	duplicate(CellEffect3)	#RedcellA6-3	HIDDEN_WARP_NPC
+bat_c03,57,127,3	duplicate(CellEffect3)	#RedcellA7-3	HIDDEN_WARP_NPC
 
-bat_c03,145,59,3	duplicate(CellEffect3)	#RedcellB1-3	139
-bat_c03,144,59,3	duplicate(CellEffect3)	#RedcellB2-3	139
-bat_c03,143,59,3	duplicate(CellEffect3)	#RedcellB3-3	139
-bat_c03,142,59,3	duplicate(CellEffect3)	#RedcellB4-3	139
-bat_c03,142,56,3	duplicate(CellEffect3)	#RedcellB5-3	139
-bat_c03,142,57,3	duplicate(CellEffect3)	#RedcellB6-3	139
-bat_c03,142,58,3	duplicate(CellEffect3)	#RedcellB7-3	139
+bat_c03,145,59,3	duplicate(CellEffect3)	#RedcellB1-3	HIDDEN_WARP_NPC
+bat_c03,144,59,3	duplicate(CellEffect3)	#RedcellB2-3	HIDDEN_WARP_NPC
+bat_c03,143,59,3	duplicate(CellEffect3)	#RedcellB3-3	HIDDEN_WARP_NPC
+bat_c03,142,59,3	duplicate(CellEffect3)	#RedcellB4-3	HIDDEN_WARP_NPC
+bat_c03,142,56,3	duplicate(CellEffect3)	#RedcellB5-3	HIDDEN_WARP_NPC
+bat_c03,142,57,3	duplicate(CellEffect3)	#RedcellB6-3	HIDDEN_WARP_NPC
+bat_c03,142,58,3	duplicate(CellEffect3)	#RedcellB7-3	HIDDEN_WARP_NPC
 
-bat_c03,54,128,3	script	#A_camp_start03	139,4,4,{
+bat_c03,54,128,3	script	#A_camp_start03	HIDDEN_WARP_NPC,4,4,{
 	end;
 
 OnInit:
@@ -99,7 +99,7 @@ OnTouch:
 	end;
 }
 
-bat_c03,146,56,3	script	#B_camp_start03	139,4,4,{
+bat_c03,146,56,3	script	#B_camp_start03	HIDDEN_WARP_NPC,4,4,{
 	end;
 
 OnInit:
@@ -370,7 +370,7 @@ OnTimer60000:
 
 // Battleground rewards
 //============================================================
-bat_c03,51,130,5	script	KVM Officer#KVM03A	419,{
+bat_c03,51,130,5	script	KVM Officer#KVM03A	4_M_KY_HEAD,{
 	if( $@KvM01BG_Victory )
 	{
 		if( $@KvM03BG_Victory == Bat_Team )
@@ -399,7 +399,7 @@ bat_c03,51,130,5	script	KVM Officer#KVM03A	419,{
 	end;
 }
 
-bat_c03,148,53,1	script	KVM Officer#KVM03B	415,{
+bat_c03,148,53,1	script	KVM Officer#KVM03B	4_M_CRU_HEAD,{
 	if( $@KvM01BG_Victory )
 	{
 		if( $@KvM03BG_Victory == Bat_Team )
diff --git a/npc/battleground/kvm/kvm_enter.txt b/npc/battleground/kvm/kvm_enter.txt
index f1d3128a3..1b5e9062c 100644
--- a/npc/battleground/kvm/kvm_enter.txt
+++ b/npc/battleground/kvm/kvm_enter.txt
@@ -17,7 +17,7 @@
 
 // KvM Officer - Guillaume
 //============================================================
-bat_room,164,178,5	script	KVM Mercenary Officer#1	418,{
+bat_room,164,178,5	script	KVM Mercenary Officer#1	4_M_KY_KNT,{
 	/*
 	set .@kvm,checkquest(6026,PLAYTIME);
 	if ((.@kvm == 0) || (.@kvm == 1)) {
@@ -57,7 +57,7 @@ bat_room,164,178,5	script	KVM Mercenary Officer#1	418,{
 
 // Guillaume Knight - KvM
 //============================================================
-bat_room,167,178,5	script	Guillaume Knight#kvm	417,{
+bat_room,167,178,5	script	Guillaume Knight#kvm	4_M_KY_SOLD,{
 	mes "[Guillaume Knight]";
 	mes "Hello.";
 	mes "What do you want to know?";
@@ -117,7 +117,7 @@ bat_room,167,178,5	script	Guillaume Knight#kvm	417,{
 
 // KvM Officer - Croix
 //============================================================
-bat_room,164,121,1	script	KVM Mercenary Officer#2	414,{
+bat_room,164,121,1	script	KVM Mercenary Officer#2	4_M_CRU_KNT,{
 	/*
 	set .@kvm,checkquest(6025,PLAYTIME);
 	if ((.@kvm == 0) || (.@kvm == 1)) {
@@ -157,7 +157,7 @@ bat_room,164,121,1	script	KVM Mercenary Officer#2	414,{
 
 // Croix Knight - KvM
 //============================================================
-bat_room,167,121,1	script	Croix Knight#kvm	413,{
+bat_room,167,121,1	script	Croix Knight#kvm	4_M_CRU_SOLD,{
 	mes "[Croix Knight]";
 	mes "Hello.";
 	mes "What do you want to know?";
diff --git a/npc/battleground/kvm/kvm_item_pay.txt b/npc/battleground/kvm/kvm_item_pay.txt
index 6ddb5b3f8..92d3032e5 100644
--- a/npc/battleground/kvm/kvm_item_pay.txt
+++ b/npc/battleground/kvm/kvm_item_pay.txt
@@ -16,7 +16,7 @@
 //= 1.0 First Version.
 //============================================================
 
-bat_room,151,144,3	script	KVM Logistic Officer#a	734,{
+bat_room,151,144,3	script	KVM Logistic Officer#a	4_M_JOB_KNIGHT2,{
 	if (countitem(7773)) {
 		set .@pointstoadd,countitem(7773);
 		delitem 7773,.@pointstoadd;
diff --git a/npc/battleground/tierra/tierra01.txt b/npc/battleground/tierra/tierra01.txt
index edb2f3c91..5daa6429f 100644
--- a/npc/battleground/tierra/tierra01.txt
+++ b/npc/battleground/tierra/tierra01.txt
@@ -20,7 +20,7 @@
 
 // Waiting Room NPCs
 //============================================================
-bat_room,57,227,5	script	Lieutenant Kalos	418,{
+bat_room,57,227,5	script	Lieutenant Kalos	4_M_KY_KNT,{
 	end;
 
 OnInit:
@@ -32,7 +32,7 @@ OnEnterBG:
 	end;
 }
 
-bat_room,58,204,1	script	Lieutenant Eyor	414,{
+bat_room,58,204,1	script	Lieutenant Eyor	4_M_CRU_KNT,{
 	end;
 
 OnInit:
@@ -44,7 +44,7 @@ OnEnterBG:
 	end;
 }
 
-bat_room,1,151,3	script	#bat_a01_timer	844,{
+bat_room,1,151,3	script	#bat_a01_timer	CLEAR_NPC,{
 	end;
 
 OnInit:
@@ -92,7 +92,7 @@ bat_room,57,211,0	warp	back_bgrooma01b	1,1,bat_room,154,150
 
 // Tierra Gorge Battleground Engine
 //============================================================
-bat_a01,15,15,3	script	start#bat_a01	844,{
+bat_a01,15,15,3	script	start#bat_a01	CLEAR_NPC,{
 OnInit:
 	mapwarp "bat_a01","bat_room",154,150;
 	end;
@@ -150,7 +150,7 @@ OnTimer10000:
 	end;
 }
 
-bat_a01,15,16,3	script	OBJ#bat_a01_a	844,{
+bat_a01,15,16,3	script	OBJ#bat_a01_a	CLEAR_NPC,{
 OnEnable:
 	bg_monster $@TierraBG1_id1,"bat_a01",177,345,"Food Storage",1909,"OBJ#bat_a01_a::OnMyMobDead";
 	end;
@@ -173,7 +173,7 @@ OnMyMobDead:
 	end;
 }
 
-bat_a01,15,17,3	script	OBJ#bat_a01_b	844,{
+bat_a01,15,17,3	script	OBJ#bat_a01_b	CLEAR_NPC,{
 OnEnable:
 	bg_monster $@TierraBG1_id2,"bat_a01",167,50,"Food Depot",1910,"OBJ#bat_a01_b::OnMyMobDead";
 	end;
@@ -196,7 +196,7 @@ OnMyMobDead:
 	end;
 }
 
-bat_a01,15,18,3	script	barricade#bat_a01_a	844,{
+bat_a01,15,18,3	script	barricade#bat_a01_a	CLEAR_NPC,{
 OnEnable:
 	for( set .@i,185; .@i < 202; set .@i,.@i+1 )
 		bg_monster $@TierraBG1_id1,"bat_a01",.@i,266,"Barricade",1906,"barricade#bat_a01_a::OnMyMobDead";
@@ -218,7 +218,7 @@ OnMyMobDead:
 	end;
 }
 
-bat_a01,15,19,3	script	barricade#bat_a01_b	844,{
+bat_a01,15,19,3	script	barricade#bat_a01_b	CLEAR_NPC,{
 OnEnable:
 	for( set .@i,169; .@i < 186; set .@i,.@i+1 )
 		bg_monster $@TierraBG1_id2,"bat_a01",.@i,129,"Barricade",1906,"barricade#bat_a01_b::OnMyMobDead";
@@ -240,7 +240,7 @@ OnMyMobDead:
 	end;
 }
 
-bat_a01,15,20,3	script	OBJ#bat_a01_n	844,{
+bat_a01,15,20,3	script	OBJ#bat_a01_n	CLEAR_NPC,{
 OnEnable:
 	monster "bat_a01",273,203,"Neutrality Flag",1911,1,"OBJ#bat_a01_n::OnMyMobDead";
 	end;
@@ -264,7 +264,7 @@ OnMyMobDead:
 	end;
 }
 
-bat_a01,15,21,3	script	NOBJ_mob#bat_a01_a	844,{
+bat_a01,15,21,3	script	NOBJ_mob#bat_a01_a	CLEAR_NPC,{
 OnEnable:
 	donpcevent "NOBJ_mob#bat_a01_b::OnKill";
 	bg_monster $@TierraBG1_id1,"bat_a01",272,204,"Guillaume Camp Guardian",1949,"NOBJ_mob#bat_a01_a::OnMyMobDead";
@@ -280,7 +280,7 @@ OnMyMobDead:
 	end;
 }
 
-bat_a01,15,22,3	script	NOBJ_mob#bat_a01_b	844,{
+bat_a01,15,22,3	script	NOBJ_mob#bat_a01_b	CLEAR_NPC,{
 OnEnable:
 	donpcevent "NOBJ_mob#bat_a01_a::OnKill";
 	bg_monster $@TierraBG1_id2,"bat_a01",272,204,"Croix Camp Guardian",1949,"NOBJ_mob#bat_a01_a::OnMyMobDead";
@@ -296,7 +296,7 @@ OnMyMobDead:
 	end;
 }
 
-bat_a01,185,270,1	script	Guillaume Blacksmith#a01	851,{
+bat_a01,185,270,1	script	Guillaume Blacksmith#a01	4_M_REPAIR,{
 	if (getcharid(4) == $@TierraBG1_id1) {
 		mes "[Guillaume Blacksmith]";
 		mes "We are in urgency! The Barricade has been destroyed!";
@@ -380,7 +380,7 @@ OnInit:
 	end;
 }
 
-bat_a01,170,121,5	script	Croix Blacksmith#bat_a01	851,{
+bat_a01,170,121,5	script	Croix Blacksmith#bat_a01	4_M_REPAIR,{
 	if (getcharid(4) == $@TierraBG1_id2) {
 		mes "[Croix Blacksmith]";
 		mes "We are in urgency! The Barricade has been destroyed!";
@@ -464,7 +464,7 @@ OnInit:
 	end;
 }
 
-bat_a01,53,377,3	script	Battle Therapist#a01_a	95,{
+bat_a01,53,377,3	script	Battle Therapist#a01_a	4_F_SISTER,{
 	specialeffect2 EF_HEAL;
 	mes "[Battle Therapist]";
 	mes "Just close your eyes,";
@@ -514,7 +514,7 @@ OnTouch_:
 	end;
 }
 
-bat_a01,45,19,3	script	Battle Therapist#a01_b	95,{
+bat_a01,45,19,3	script	Battle Therapist#a01_b	4_F_SISTER,{
 	specialeffect2 EF_HEAL;
 	mes "[Battle Therapist]";
 	mes "Just close your eyes,";
@@ -564,7 +564,7 @@ OnTouch:
 	end;
 }
 
-bat_a01,60,216,3	script	Valley Ghost#bat_a01_n	950,{
+bat_a01,60,216,3	script	Valley Ghost#bat_a01_n	4_GHOSTRING,{
 	specialeffect2 EF_HEAL;
 	mes "[Valley Ghost]";
 	mes "Boo...Boo...";
@@ -648,39 +648,39 @@ OnTouch:
 	end;
 }
 
-bat_a01,169,227,0	script	underladd#bat_a01_1	45,1,1,{
+bat_a01,169,227,0	script	underladd#bat_a01_1	WARPNPC,1,1,{
 OnTouch_:
 	warp "bat_a01",178,228;
 	end;
 }
 
-bat_a01,208,164,0	script	underladd#bat_a01_2	45,1,1,{
+bat_a01,208,164,0	script	underladd#bat_a01_2	WARPNPC,1,1,{
 OnTouch_:
 	warp "bat_a01",200,171;
 	end;
 }
 
-bat_a01,171,309,3	script	Guillaume Camp#flag1	973,{ end; }
-bat_a01,149,310,3	script	Guillaume Camp#flag2	973,{ end; }
-bat_a01,119,336,3	script	Guillaume Camp#flag3	973,{ end; }
-bat_a01,118,357,3	script	Guillaume Camp#flag4	973,{ end; }
-bat_a01,150,380,3	script	Guillaume Camp#flag5	973,{ end; }
-bat_a01,173,380,3	script	Guillaume Camp#flag6	973,{ end; }
-bat_a01,210,344,3	script	Guillaume Camp#flag7	973,{ end; }
-bat_a01,350,325,3	script	Guillaume Camp#flag8	973,{ end; }
-bat_a01,358,325,3	script	Guillaume Camp#flag9	973,{ end; }
-
-bat_a01,138,12,3	script	Croix Camp#flag1	974,{ end; }
-bat_a01,108,36,3	script	Croix Camp#flag2	974,{ end; }
-bat_a01,108,63,3	script	Croix Camp#flag3	974,{ end; }
-bat_a01,136,87,3	script	Croix Camp#flag4	974,{ end; }
-bat_a01,167,86,3	script	Croix Camp#flag5	974,{ end; }
-bat_a01,199,49,3	script	Croix Camp#flag6	974,{ end; }
-bat_a01,168,16,3	script	Croix Camp#flag7	974,{ end; }
-bat_a01,357,74,3	script	Croix Camp#flag8	974,{ end; }
-bat_a01,348,74,3	script	Croix Camp#flag9	974,{ end; }
-
-bat_a01,53,377,3	script	Guillaume Vintenar#a01_a	419,{
+bat_a01,171,309,3	script	Guillaume Camp#flag1	1_FLAG_LION,{ end; }
+bat_a01,149,310,3	script	Guillaume Camp#flag2	1_FLAG_LION,{ end; }
+bat_a01,119,336,3	script	Guillaume Camp#flag3	1_FLAG_LION,{ end; }
+bat_a01,118,357,3	script	Guillaume Camp#flag4	1_FLAG_LION,{ end; }
+bat_a01,150,380,3	script	Guillaume Camp#flag5	1_FLAG_LION,{ end; }
+bat_a01,173,380,3	script	Guillaume Camp#flag6	1_FLAG_LION,{ end; }
+bat_a01,210,344,3	script	Guillaume Camp#flag7	1_FLAG_LION,{ end; }
+bat_a01,350,325,3	script	Guillaume Camp#flag8	1_FLAG_LION,{ end; }
+bat_a01,358,325,3	script	Guillaume Camp#flag9	1_FLAG_LION,{ end; }
+
+bat_a01,138,12,3	script	Croix Camp#flag1	1_FLAG_EAGLE,{ end; }
+bat_a01,108,36,3	script	Croix Camp#flag2	1_FLAG_EAGLE,{ end; }
+bat_a01,108,63,3	script	Croix Camp#flag3	1_FLAG_EAGLE,{ end; }
+bat_a01,136,87,3	script	Croix Camp#flag4	1_FLAG_EAGLE,{ end; }
+bat_a01,167,86,3	script	Croix Camp#flag5	1_FLAG_EAGLE,{ end; }
+bat_a01,199,49,3	script	Croix Camp#flag6	1_FLAG_EAGLE,{ end; }
+bat_a01,168,16,3	script	Croix Camp#flag7	1_FLAG_EAGLE,{ end; }
+bat_a01,357,74,3	script	Croix Camp#flag8	1_FLAG_EAGLE,{ end; }
+bat_a01,348,74,3	script	Croix Camp#flag9	1_FLAG_EAGLE,{ end; }
+
+bat_a01,53,377,3	script	Guillaume Vintenar#a01_a	4_M_KY_HEAD,{
 	if (getcharid(4) == $@TierraBG1_id1) {
 		if ($@TierraBG1_Victory == 1) {
 			set .@your_medal,countitem(7828);
@@ -774,7 +774,7 @@ OnInit:
 	end;
 }
 
-bat_a01,45,19,3	script	Croix Vintenar#a01_b	415,{
+bat_a01,45,19,3	script	Croix Vintenar#a01_b	4_M_CRU_HEAD,{
 	if (getcharid(4) == $@TierraBG1_id2) {
 		if ($@TierraBG1_Victory == 2) {
 			set .@your_medal,countitem(7828);
@@ -868,7 +868,7 @@ OnInit:
 	end;
 }
 
-bat_a01,1,5,3	script	countdown#bat_a01	844,{
+bat_a01,1,5,3	script	countdown#bat_a01	CLEAR_NPC,{
 OnEnable:
 	initnpctimer;
 	end;
@@ -912,18 +912,18 @@ OnTimer1830000:
 }
 
 /*
-bat_a01,351,75,3	script	Croix Camp Soldier#bat_a01_guide	934,{
+bat_a01,351,75,3	script	Croix Camp Soldier#bat_a01_guide	4_M_RASWORD,{
 	mes "Loading...";
 	close;
 }
 
-bat_a01,356,326,3	script	Guillaume Camp Soldier#bat_a01_guide	934,{
+bat_a01,356,326,3	script	Guillaume Camp Soldier#bat_a01_guide	4_M_RASWORD,{
 	mes "Loading...";
 	close;
 }
 */
 
-bat_a01,1,1,3	script	Release all#a01	81,{
+bat_a01,1,1,3	script	Release all#a01	4_DOG01,{
 	set .@i, callfunc("F_GM_NPC",1854,0);
 	if (.@i == -1) {
 		mes "Cancelled.";
diff --git a/npc/battleground/tierra/tierra02.txt b/npc/battleground/tierra/tierra02.txt
index 008944955..05c6eaa0d 100644
--- a/npc/battleground/tierra/tierra02.txt
+++ b/npc/battleground/tierra/tierra02.txt
@@ -19,7 +19,7 @@
 
 // Waiting Room NPCs
 //============================================================
-bat_room,114,227,5	script	Lieutenant Rundel	418,{
+bat_room,114,227,5	script	Lieutenant Rundel	4_M_KY_KNT,{
 	end;
 
 OnInit:
@@ -31,7 +31,7 @@ OnEnterBG:
 	end;
 }
 
-bat_room,114,204,1	script	Lieutenant Guerrit	414,{
+bat_room,114,204,1	script	Lieutenant Guerrit	4_M_CRU_KNT,{
 	end;
 
 OnInit:
@@ -43,7 +43,7 @@ OnEnterBG:
 	end;
 }
 
-bat_room,1,151,3	script	#bat_a02_timer	844,{
+bat_room,1,151,3	script	#bat_a02_timer	CLEAR_NPC,{
 	end;
 
 OnInit:
@@ -91,7 +91,7 @@ bat_room,113,211,0	warp	back_bgrooma02b	1,1,bat_room,154,150
 
 // Tierra Gorge Battleground Engine
 //============================================================
-bat_a02,15,15,3	script	start#bat_a02	844,{
+bat_a02,15,15,3	script	start#bat_a02	CLEAR_NPC,{
 OnInit:
 	mapwarp "bat_a02","bat_room",154,150;
 	end;
@@ -149,7 +149,7 @@ OnTimer10000:
 	end;
 }
 
-bat_a02,15,16,3	script	OBJ#bat_a02_a	844,{
+bat_a02,15,16,3	script	OBJ#bat_a02_a	CLEAR_NPC,{
 OnEnable:
 	bg_monster $@TierraBG2_id1,"bat_a02",177,345,"Food Storage",1909,"OBJ#bat_a02_a::OnMyMobDead";
 	end;
@@ -172,7 +172,7 @@ OnMyMobDead:
 	end;
 }
 
-bat_a02,15,17,3	script	OBJ#bat_a02_b	844,{
+bat_a02,15,17,3	script	OBJ#bat_a02_b	CLEAR_NPC,{
 OnEnable:
 	bg_monster $@TierraBG2_id2,"bat_a02",167,50,"Food Depot",1910,"OBJ#bat_a02_b::OnMyMobDead";
 	end;
@@ -195,7 +195,7 @@ OnMyMobDead:
 	end;
 }
 
-bat_a02,15,18,3	script	barricade#bat_a02_a	844,{
+bat_a02,15,18,3	script	barricade#bat_a02_a	CLEAR_NPC,{
 OnEnable:
 	for( set .@i,185; .@i < 202; set .@i,.@i+1 )
 		bg_monster $@TierraBG2_id1,"bat_a02",.@i,266,"Barricade",1906,"barricade#bat_a02_a::OnMyMobDead";
@@ -217,7 +217,7 @@ OnMyMobDead:
 	end;
 }
 
-bat_a02,15,19,3	script	barricade#bat_a02_b	844,{
+bat_a02,15,19,3	script	barricade#bat_a02_b	CLEAR_NPC,{
 OnEnable:
 	for( set .@i,169; .@i < 186; set .@i,.@i+1 )
 		bg_monster $@TierraBG2_id2,"bat_a02",.@i,129,"Barricade",1906,"barricade#bat_a02_b::OnMyMobDead";
@@ -239,7 +239,7 @@ OnMyMobDead:
 	end;
 }
 
-bat_a02,15,20,3	script	OBJ#bat_a02_n	844,{
+bat_a02,15,20,3	script	OBJ#bat_a02_n	CLEAR_NPC,{
 OnEnable:
 	monster "bat_a02",273,203,"Neutrality Flag",1911,1,"OBJ#bat_a02_n::OnMyMobDead";
 	end;
@@ -263,7 +263,7 @@ OnMyMobDead:
 	end;
 }
 
-bat_a02,15,21,3	script	NOBJ_mob#bat_a02_a	844,{
+bat_a02,15,21,3	script	NOBJ_mob#bat_a02_a	CLEAR_NPC,{
 OnEnable:
 	donpcevent "NOBJ_mob#bat_a02_b::OnKill";
 	bg_monster $@TierraBG2_id1,"bat_a02",272,204,"Guillaume Camp Guardian",1949,"NOBJ_mob#bat_a02_a::OnMyMobDead";
@@ -279,7 +279,7 @@ OnMyMobDead:
 	end;
 }
 
-bat_a02,15,22,3	script	NOBJ_mob#bat_a02_b	844,{
+bat_a02,15,22,3	script	NOBJ_mob#bat_a02_b	CLEAR_NPC,{
 OnEnable:
 	donpcevent "NOBJ_mob#bat_a02_a::OnKill";
 	bg_monster $@TierraBG2_id2,"bat_a02",272,204,"Croix Camp Guardian",1949,"NOBJ_mob#bat_a02_a::OnMyMobDead";
@@ -295,7 +295,7 @@ OnMyMobDead:
 	end;
 }
 
-bat_a02,185,270,1	script	Guillaume Blacksmith#a02	851,{
+bat_a02,185,270,1	script	Guillaume Blacksmith#a02	4_M_REPAIR,{
 	if (getcharid(4) == $@TierraBG2_id1) {
 		mes "[Guillaume Blacksmith]";
 		mes "We are in urgency! The Barricade has been destroyed!";
@@ -379,7 +379,7 @@ OnInit:
 	end;
 }
 
-bat_a02,170,121,5	script	Croix Blacksmith#bat_a02	851,{
+bat_a02,170,121,5	script	Croix Blacksmith#bat_a02	4_M_REPAIR,{
 	if (getcharid(4) == $@TierraBG2_id2) {
 		mes "[Croix Blacksmith]";
 		mes "We are in urgency! The Barricade has been destroyed!";
@@ -463,7 +463,7 @@ OnInit:
 	end;
 }
 
-bat_a02,53,377,3	script	Battle Therapist#a02_a	95,{
+bat_a02,53,377,3	script	Battle Therapist#a02_a	4_F_SISTER,{
 	specialeffect2 EF_HEAL;
 	mes "[Battle Therapist]";
 	mes "Just close your eyes,";
@@ -513,7 +513,7 @@ OnTouch_:
 	end;
 }
 
-bat_a02,45,19,3	script	Battle Therapist#a02_b	95,{
+bat_a02,45,19,3	script	Battle Therapist#a02_b	4_F_SISTER,{
 	specialeffect2 EF_HEAL;
 	mes "[Battle Therapist]";
 	mes "Just close your eyes,";
@@ -563,7 +563,7 @@ OnTouch:
 	end;
 }
 
-bat_a02,60,216,3	script	Valley Ghost#bat_a02_n	950,{
+bat_a02,60,216,3	script	Valley Ghost#bat_a02_n	4_GHOSTRING,{
 	specialeffect2 EF_HEAL;
 	mes "[Valley Ghost]";
 	mes "Boo...Boo...";
@@ -647,39 +647,39 @@ OnTouch:
 	end;
 }
 
-bat_a02,169,227,0	script	underladd#bat_a02_1	45,1,1,{
+bat_a02,169,227,0	script	underladd#bat_a02_1	WARPNPC,1,1,{
 OnTouch_:
 	warp "bat_a02",178,228;
 	end;
 }
 
-bat_a02,208,164,0	script	underladd#bat_a02_2	45,1,1,{
+bat_a02,208,164,0	script	underladd#bat_a02_2	WARPNPC,1,1,{
 OnTouch_:
 	warp "bat_a02",200,171;
 	end;
 }
 
-bat_a02,171,309,3	script	Guillaume Camp#flag11	973,{ end; }
-bat_a02,149,310,3	script	Guillaume Camp#flag12	973,{ end; }
-bat_a02,119,336,3	script	Guillaume Camp#flag13	973,{ end; }
-bat_a02,118,357,3	script	Guillaume Camp#flag14	973,{ end; }
-bat_a02,150,380,3	script	Guillaume Camp#flag15	973,{ end; }
-bat_a02,173,380,3	script	Guillaume Camp#flag16	973,{ end; }
-bat_a02,210,344,3	script	Guillaume Camp#flag17	973,{ end; }
-bat_a02,350,325,3	script	Guillaume Camp#flag18	973,{ end; }
-bat_a02,358,325,3	script	Guillaume Camp#flag19	973,{ end; }
-
-bat_a02,138,12,3	script	Croix Camp#flag11	974,{ end; }
-bat_a02,108,36,3	script	Croix Camp#flag12	974,{ end; }
-bat_a02,108,63,3	script	Croix Camp#flag13	974,{ end; }
-bat_a02,136,87,3	script	Croix Camp#flag14	974,{ end; }
-bat_a02,167,86,3	script	Croix Camp#flag15	974,{ end; }
-bat_a02,199,49,3	script	Croix Camp#flag16	974,{ end; }
-bat_a02,168,16,3	script	Croix Camp#flag17	974,{ end; }
-bat_a02,357,74,3	script	Croix Camp#flag18	974,{ end; }
-bat_a02,348,74,3	script	Croix Camp#flag19	974,{ end; }
-
-bat_a02,53,377,3	script	Guillaume Vintenar#a02_a	419,{
+bat_a02,171,309,3	script	Guillaume Camp#flag11	1_FLAG_LION,{ end; }
+bat_a02,149,310,3	script	Guillaume Camp#flag12	1_FLAG_LION,{ end; }
+bat_a02,119,336,3	script	Guillaume Camp#flag13	1_FLAG_LION,{ end; }
+bat_a02,118,357,3	script	Guillaume Camp#flag14	1_FLAG_LION,{ end; }
+bat_a02,150,380,3	script	Guillaume Camp#flag15	1_FLAG_LION,{ end; }
+bat_a02,173,380,3	script	Guillaume Camp#flag16	1_FLAG_LION,{ end; }
+bat_a02,210,344,3	script	Guillaume Camp#flag17	1_FLAG_LION,{ end; }
+bat_a02,350,325,3	script	Guillaume Camp#flag18	1_FLAG_LION,{ end; }
+bat_a02,358,325,3	script	Guillaume Camp#flag19	1_FLAG_LION,{ end; }
+
+bat_a02,138,12,3	script	Croix Camp#flag11	1_FLAG_EAGLE,{ end; }
+bat_a02,108,36,3	script	Croix Camp#flag12	1_FLAG_EAGLE,{ end; }
+bat_a02,108,63,3	script	Croix Camp#flag13	1_FLAG_EAGLE,{ end; }
+bat_a02,136,87,3	script	Croix Camp#flag14	1_FLAG_EAGLE,{ end; }
+bat_a02,167,86,3	script	Croix Camp#flag15	1_FLAG_EAGLE,{ end; }
+bat_a02,199,49,3	script	Croix Camp#flag16	1_FLAG_EAGLE,{ end; }
+bat_a02,168,16,3	script	Croix Camp#flag17	1_FLAG_EAGLE,{ end; }
+bat_a02,357,74,3	script	Croix Camp#flag18	1_FLAG_EAGLE,{ end; }
+bat_a02,348,74,3	script	Croix Camp#flag19	1_FLAG_EAGLE,{ end; }
+
+bat_a02,53,377,3	script	Guillaume Vintenar#a02_a	4_M_KY_HEAD,{
 	if (getcharid(4) == $@TierraBG2_id1) {
 		if ($@TierraBG2_Victory == 1) {
 			set .@your_medal,countitem(7828);
@@ -773,7 +773,7 @@ OnInit:
 	end;
 }
 
-bat_a02,45,19,3	script	Croix Vintenar#a02_b	415,{
+bat_a02,45,19,3	script	Croix Vintenar#a02_b	4_M_CRU_HEAD,{
 	if (getcharid(4) == $@TierraBG2_id2) {
 		if ($@TierraBG2_Victory == 2) {
 			set .@your_medal,countitem(7828);
@@ -867,7 +867,7 @@ OnInit:
 	end;
 }
 
-bat_a02,1,5,3	script	countdown#bat_a02	844,{
+bat_a02,1,5,3	script	countdown#bat_a02	CLEAR_NPC,{
 OnEnable:
 	initnpctimer;
 	end;
@@ -911,18 +911,18 @@ OnTimer1830000:
 }
 
 /*
-bat_a02,351,75,3	script	Croix Camp Soldier#bat_a02_guide	934,{
+bat_a02,351,75,3	script	Croix Camp Soldier#bat_a02_guide	4_M_RASWORD,{
 	mes "Loading...";
 	close;
 }
 
-bat_a02,356,326,3	script	Guillaume Camp Soldier#bat_a02_guide	934,{
+bat_a02,356,326,3	script	Guillaume Camp Soldier#bat_a02_guide	4_M_RASWORD,{
 	mes "Loading...";
 	close;
 }
 */
 
-bat_a02,1,1,3	script	Release all#a02	81,{
+bat_a02,1,1,3	script	Release all#a02	4_DOG01,{
 	set .@i, callfunc("F_GM_NPC",1854,0);
 	if (.@i == -1) {
 		mes "Cancelled.";
diff --git a/npc/battleground/tierra/tierra_enter.txt b/npc/battleground/tierra/tierra_enter.txt
index 0262f9fcd..9089017a0 100644
--- a/npc/battleground/tierra/tierra_enter.txt
+++ b/npc/battleground/tierra/tierra_enter.txt
@@ -14,7 +14,7 @@
 
 // First Tierra Gorge Officers - Guillaume
 //============================================================
-bat_room,124,178,5	script	Tierra Gorge Officer#01a	418,{
+bat_room,124,178,5	script	Tierra Gorge Officer#01a	4_M_KY_KNT,{
 	if (checkweight(1201,1) == 0) {
 		mes "- Wait a minute !! -";
 		mes "- Currently you're carrying -";
@@ -81,7 +81,7 @@ bat_room,124,178,5	script	Tierra Gorge Officer#01a	418,{
 	close;
 }
 
-bat_room,140,178,5	script	Tierra Gorge Officer#02a	418,{
+bat_room,140,178,5	script	Tierra Gorge Officer#02a	4_M_KY_KNT,{
 	if (checkweight(1201,1) == 0) {
 		mes "- Wait a minute !! -";
 		mes "- Currently you're carrying -";
@@ -148,7 +148,7 @@ bat_room,140,178,5	script	Tierra Gorge Officer#02a	418,{
 	close;
 }
 
-bat_room,127,178,5	script	Guillaume Knight#1	417,{
+bat_room,127,178,5	script	Guillaume Knight#1	4_M_KY_SOLD,{
 	mes "[Guillaume Knight]";
 	mes "Tierra Gorge consists of two steep sides placed vertically, and has ration depots for the Guillaume and Croix Armies at the 11 and 7 o'clock directions.";
 	next;
@@ -172,7 +172,7 @@ bat_room,127,178,5	script	Guillaume Knight#1	417,{
 	close;
 }
 
-bat_room,143,178,5	script	Guillaume Knight#2	417,{
+bat_room,143,178,5	script	Guillaume Knight#2	4_M_KY_SOLD,{
 	mes "[Guillaume Knight]";
 	mes "Tierra Gorge consists of two steep sides placed vertically, and has ration depots for the Guillaume and Croix Armies at the 11 and 7 o'clock directions.";
 	next;
@@ -196,7 +196,7 @@ bat_room,143,178,5	script	Guillaume Knight#2	417,{
 	close;
 }
 
-bat_room,127,121,1	script	Croix Knight#1	413,{
+bat_room,127,121,1	script	Croix Knight#1	4_M_CRU_SOLD,{
 	mes "[Croix Knight]";
 	mes "Tierra Gorge consists of two steep sides placed vertically, and has ration depots for the Guillaume and Croix Armies at the 11 and 7 o'clock directions.";
 	next;
@@ -220,7 +220,7 @@ bat_room,127,121,1	script	Croix Knight#1	413,{
 	close;
 }
 
-bat_room,143,121,1	script	Croix Knight#2	413,{
+bat_room,143,121,1	script	Croix Knight#2	4_M_CRU_SOLD,{
 	mes "[Croix Knight]";
 	mes "Tierra Gorge consists of two steep sides placed vertically, and has ration depots for the Guillaume and Croix Armies at the 11 and 7 o'clock directions.";
 	next;
@@ -246,7 +246,7 @@ bat_room,143,121,1	script	Croix Knight#2	413,{
 
 // Second Tierra Gorge Officers - Croix
 //============================================================
-bat_room,125,121,1	script	Tierra Gorge Officer#01b	414,{
+bat_room,125,121,1	script	Tierra Gorge Officer#01b	4_M_CRU_KNT,{
 	if (checkweight(1201,1) == 0) {
 		mes "- Wait a minute !! -";
 		mes "- Currently you're carrying -";
@@ -313,7 +313,7 @@ bat_room,125,121,1	script	Tierra Gorge Officer#01b	414,{
 	close;
 }
 
-bat_room,140,121,1	script	Tierra Gorge Officer#02b	414,{
+bat_room,140,121,1	script	Tierra Gorge Officer#02b	4_M_CRU_KNT,{
 	if (checkweight(1201,1) == 0) {
 		mes "- Wait a minute !! -";
 		mes "- Currently you're carrying -";