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

8 files changed, 91 insertions, 91 deletions

diff --git a/npc/other/arena/arena_aco.txt b/npc/other/arena/arena_aco.txt
index 315d61165..725e8c58f 100644
--- a/npc/other/arena/arena_aco.txt
+++ b/npc/other/arena/arena_aco.txt
@@ -15,7 +15,7 @@
 //= 1.5 Added GM management function. [Euphy]
 //============================================================
 
-arena_room,114,102,0	script	onlyaco#arena	45,1,1,{
+arena_room,114,102,0	script	onlyaco#arena	WARPNPC,1,1,{
 OnTouch:
 	if (BaseClass == Job_Acolyte) {
 		warp "arena_room",135,129;
@@ -27,7 +27,7 @@ OnTouch:
 	}
 }
 
-arena_room,136,138,3	script	Acolyte Waiting Room	124,{
+arena_room,136,138,3	script	Acolyte Waiting Room	4_F_TELEPORTER,{
 	end;
 
 OnInit:
@@ -1024,7 +1024,7 @@ OnMyMobDead:
 	end;
 }
 
-force_5-1,62,26,0	script	force_08_01#aco	45,1,1,{
+force_5-1,62,26,0	script	force_08_01#aco	WARPNPC,1,1,{
 OnTouch:
 	warp "force_5-1",40,26;
 	if (BaseJob == Job_Acolyte) {
@@ -1036,7 +1036,7 @@ OnTouch:
 	end;
 }
 
-force_5-1,99,124,0	script	force_exit#aco	45,1,1,{
+force_5-1,99,124,0	script	force_exit#aco	WARPNPC,1,1,{
 OnTouch:
 	donpcevent "Trocco#aco1::OnTimerOff";
 	donpcevent "#arn_timer_aco::OnEnable";
@@ -1044,7 +1044,7 @@ OnTouch:
 	end;
 }
 
-prt_are_in,181,83,3	script	Staff#aco-1	67,{
+prt_are_in,181,83,3	script	Staff#aco-1	1_F_02,{
 	mes "[Staff]";
 	mes "Nice work!";
 	mes "You might have failed";
@@ -1075,7 +1075,7 @@ prt_are_in,181,83,3	script	Staff#aco-1	67,{
 	end;
 }
 
-prt_are_in,25,31,3	script	Staff#aco-2	67,{
+prt_are_in,25,31,3	script	Staff#aco-2	1_F_02,{
 	set .@start_timeaco, $@arn_1;
 	set .@hour_startaco, .@start_timeaco / 10000;
 	set .@min_startaco, ((.@start_timeaco % 10000) / 100);
@@ -1552,7 +1552,7 @@ OnEnable:
 	end;
 }
 
-arena_room,94,82,7	script	Arena Record Staff#aco	79,{
+arena_room,94,82,7	script	Arena Record Staff#aco	1_F_PRIEST,{
 	mes "[Mathea]";
 	mes "Hello, I'm in charge of";
 	mes "the Acolyte Class Records";
@@ -1648,7 +1648,7 @@ OnLineRec_pri90:
 	end;
 }
 
-arena_room,140,136,3	script	Guide Alias	729,{
+arena_room,140,136,3	script	Guide Alias	4_F_NOVICE,{
 	mes "[Alias]";
 	mes "Hello there, I'm here";
 	mes "to inform you about";
@@ -1708,7 +1708,7 @@ arena_room,140,136,3	script	Guide Alias	729,{
 	close;
 }
 
-arena_room,195,5,3	script	log-on-aco#arena	802,{
+arena_room,195,5,3	script	log-on-aco#arena	4_NFWISP,{
 	set .@i, callfunc("F_GM_NPC",1357,0);
 	if (.@i == -1) {
 		mes "^3355FFIncorrect Password.^000000";
@@ -1752,7 +1752,7 @@ arena_room,195,5,3	script	log-on-aco#arena	802,{
 	}
 }
 
-arena_room,195,10,3	script	acolink#arena	802,{
+arena_room,195,10,3	script	acolink#arena	4_NFWISP,{
 	set .@i, callfunc("F_GM_NPC",1357,0);
 	if (.@i == -1) {
 		mes "Command has";
diff --git a/npc/other/arena/arena_lvl50.txt b/npc/other/arena/arena_lvl50.txt
index f45ca16ee..e1e98d3b2 100644
--- a/npc/other/arena/arena_lvl50.txt
+++ b/npc/other/arena/arena_lvl50.txt
@@ -13,7 +13,7 @@
 //= 1.3 Script updates. [Euphy]
 //============================================================
 
-arena_room,64,138,5	script	Lv50 Waiting Room	124,{
+arena_room,64,138,5	script	Lv50 Waiting Room	4_F_TELEPORTER,{
 	end;
 
 OnInit:
@@ -32,7 +32,7 @@ OnStart:
 	end;
 }
 
-force_1-1,99,20,4	script	Heel and Toe#arena	124,{
+force_1-1,99,20,4	script	Heel and Toe#arena	4_F_TELEPORTER,{
 	end;
 
 OnStart:
@@ -289,21 +289,21 @@ OnReset_All:
 	end;
 }
 
-force_1-1,62,26,1	script	force_08_01#50	45,1,1,{
+force_1-1,62,26,1	script	force_08_01#50	WARPNPC,1,1,{
 OnTouch:
 	donpcevent "Heel and Toe#arena::On01_Start";
 	warp "force_1-1",40,26;
 	end;
 }
 
-force_1-1,25,44,1	script	force_01_02#50	45,1,1,{
+force_1-1,25,44,1	script	force_01_02#50	WARPNPC,1,1,{
 OnTouch:
 	donpcevent "Heel and Toe#arena::On02_Start";
 	warp "force_1-1",25,69;
 	end;
 }
 
-force_1-1,25,134,1	script	force_02_03#50	45,1,1,{
+force_1-1,25,134,1	script	force_02_03#50	WARPNPC,1,1,{
 OnTouch:
 	donpcevent "arena#50::OnReset_02";
 	donpcevent "Heel and Toe#arena::On03_Start";
@@ -311,35 +311,35 @@ OnTouch:
 	end;
 }
 
-force_1-1,44,174,1	script	force_03_04#50	45,1,1,{
+force_1-1,44,174,1	script	force_03_04#50	WARPNPC,1,1,{
 OnTouch:
 	donpcevent "Heel and Toe#arena::On04_Start";
 	warp "force_1-1",69,174;
 	end;
 }
 
-force_1-1,134,174,1	script	force_04_05#50	45,1,1,{
+force_1-1,134,174,1	script	force_04_05#50	WARPNPC,1,1,{
 OnTouch:
 	donpcevent "Heel and Toe#arena::On05_Start";
 	warp "force_1-1",159,174;
 	end;
 }
 
-force_1-1,174,155,1	script	force_05_06#50	45,1,1,{
+force_1-1,174,155,1	script	force_05_06#50	WARPNPC,1,1,{
 OnTouch:
 	donpcevent "Heel and Toe#arena::On06_Start";
 	warp "force_1-1",174,130;
 	end;
 }
 
-force_1-1,174,65,1	script	force_06_07#50	45,1,1,{
+force_1-1,174,65,1	script	force_06_07#50	WARPNPC,1,1,{
 OnTouch:
 	donpcevent "Heel and Toe#arena::On07_Start";
 	warp "force_1-1",174,40;
 	end;
 }
 
-force_1-1,155,26,1	script	force_07_08#50	45,1,1,{
+force_1-1,155,26,1	script	force_07_08#50	WARPNPC,1,1,{
 OnTouch:
 	donpcevent "Heel and Toe#arena::On08_Start";
 	warp "force_1-1",132,26;
@@ -347,14 +347,14 @@ OnTouch:
 	end;
 }
 
-force_1-1,99,54,1	script	force_08_09#50	45,1,1,{
+force_1-1,99,54,1	script	force_08_09#50	WARPNPC,1,1,{
 OnTouch:
 	donpcevent "Heel and Toe#arena::On09_Start";
 	warp "force_1-1",99,82;
 	end;
 }
 
-force_1-1,99,124,1	script	force_exit#50	45,1,1,{
+force_1-1,99,124,1	script	force_exit#50	WARPNPC,1,1,{
 OnTouch:
 	donpcevent "Heel and Toe#arena::OnTimerOff";
 	donpcevent "#arn_timer_50::OnEnable";
@@ -780,7 +780,7 @@ OnMyMobDead:
 	end;
 }
 
-prt_are_in,129,188,3	script	Staff#50-1	67,{
+prt_are_in,129,188,3	script	Staff#50-1	1_F_02,{
 	mes "[Staff]";
 	mes "You did a good job.";
 	mes "Even if you have failed to clear a time attack battle, I will reward you with a small amount of arena points.";
@@ -801,7 +801,7 @@ prt_are_in,129,188,3	script	Staff#50-1	67,{
 	end;
 }
 
-prt_are_in,25,188,3	script	Staff#50-2	67,{
+prt_are_in,25,188,3	script	Staff#50-2	1_F_02,{
 	if($arena_min50end < $arena_min50st) {
 		if($arena_sec50end < $arena_sec50st) {
 			set @record_min50,60 - $arena_min50st + $arena_min50end -1;
diff --git a/npc/other/arena/arena_lvl60.txt b/npc/other/arena/arena_lvl60.txt
index e100b76f6..8ccd45cf0 100644
--- a/npc/other/arena/arena_lvl60.txt
+++ b/npc/other/arena/arena_lvl60.txt
@@ -14,7 +14,7 @@
 //= 1.4 Script updates. [Euphy]
 //============================================================
 
-arena_room,38,88,5	script	Lv60 Waiting Room	124,{
+arena_room,38,88,5	script	Lv60 Waiting Room	4_F_TELEPORTER,{
 	end;
 
 OnInit:
@@ -33,7 +33,7 @@ OnStart:
 	end;
 }
 
-force_2-1,99,20,4	script	Minilover#arena	124,{
+force_2-1,99,20,4	script	Minilover#arena	4_F_TELEPORTER,{
 	end;
 
 OnStart:
@@ -299,21 +299,21 @@ OnReset_All:
 	end;
 }
 
-force_2-1,62,26,1	script	force_08_01#60	45,1,1,{
+force_2-1,62,26,1	script	force_08_01#60	WARPNPC,1,1,{
 OnTouch:
 	donpcevent "Minilover#arena::On01_Start";
 	warp "force_2-1",40,26;
 	end;
 }
 
-force_2-1,25,44,1	script	force_01_02#60	45,1,1,{
+force_2-1,25,44,1	script	force_01_02#60	WARPNPC,1,1,{
 OnTouch:
 	donpcevent "Minilover#arena::On02_Start";
 	warp "force_2-1",25,69;
 	end;
 }
 
-force_2-1,25,134,1	script	force_02_03#60	45,1,1,{
+force_2-1,25,134,1	script	force_02_03#60	WARPNPC,1,1,{
 OnTouch:
 	donpcevent "arena#60::OnReset_02";
 	donpcevent "Minilover#arena::On03_Start";
@@ -321,35 +321,35 @@ OnTouch:
 	end;
 }
 
-force_2-1,44,174,1	script	force_03_04#60	45,1,1,{
+force_2-1,44,174,1	script	force_03_04#60	WARPNPC,1,1,{
 OnTouch:
 	donpcevent "Minilover#arena::On04_Start";
 	warp "force_2-1",69,174;
 	end;
 }
 
-force_2-1,134,174,1	script	force_04_05#60	45,1,1,{
+force_2-1,134,174,1	script	force_04_05#60	WARPNPC,1,1,{
 OnTouch:
 	donpcevent "Minilover#arena::On05_Start";
 	warp "force_2-1",159,174;
 	end;
 }
 
-force_2-1,174,155,1	script	force_05_06#60	45,1,1,{
+force_2-1,174,155,1	script	force_05_06#60	WARPNPC,1,1,{
 OnTouch:
 	donpcevent "Minilover#arena::On06_Start";
 	warp "force_2-1",174,130;
 	end;
 }
 
-force_2-1,174,65,1	script	force_06_07#60	45,1,1,{
+force_2-1,174,65,1	script	force_06_07#60	WARPNPC,1,1,{
 OnTouch:
 	donpcevent "Minilover#arena::On07_Start";
 	warp "force_2-1",174,40;
 	end;
 }
 
-force_2-1,155,26,1	script	force_07_08#60	45,1,1,{
+force_2-1,155,26,1	script	force_07_08#60	WARPNPC,1,1,{
 OnTouch:
 	donpcevent "Minilover#arena::On08_Start";
 	warp "force_2-1",132,26;
@@ -357,14 +357,14 @@ OnTouch:
 	end;
 }
 
-force_2-1,99,54,1	script	force_08_09#60	45,1,1,{
+force_2-1,99,54,1	script	force_08_09#60	WARPNPC,1,1,{
 OnTouch:
 	donpcevent "Minilover#arena::On09_Start";
 	warp "force_2-1",99,82;
 	end;
 }
 
-force_2-1,99,124,1	script	force_exit#60	45,1,1,{
+force_2-1,99,124,1	script	force_exit#60	WARPNPC,1,1,{
 OnTouch:
 	donpcevent "Minilover#arena::OnTimerOff";
 	donpcevent "#arn_timer_60::OnEnable";
@@ -790,7 +790,7 @@ OnMyMobDead:
 	end;
 }
 
-prt_are_in,129,135,3	script	Staff#60-1	67,{
+prt_are_in,129,135,3	script	Staff#60-1	1_F_02,{
 	mes "[Staff]";
 	mes "You did a good job.";
 	mes "Even if you have failed to clear a time attack battle, I will reward you with a small amount of arena points.";
@@ -811,7 +811,7 @@ prt_are_in,129,135,3	script	Staff#60-1	67,{
 	end;
 }
 
-prt_are_in,25,135,3	script	Staff#60-2	67,{
+prt_are_in,25,135,3	script	Staff#60-2	1_F_02,{
 	if($arena_min60end < $arena_min60st) {
 		if($arena_sec60end < $arena_sec60st) {
 			set @record_min60,60 - $arena_min60st + $arena_min60end -1;
diff --git a/npc/other/arena/arena_lvl70.txt b/npc/other/arena/arena_lvl70.txt
index cef72fc62..e50113e74 100644
--- a/npc/other/arena/arena_lvl70.txt
+++ b/npc/other/arena/arena_lvl70.txt
@@ -13,7 +13,7 @@
 //= 1.3 Script updates. [Euphy]
 //============================================================
 
-arena_room,52,42,7	script	Lv70 Waiting Room	124,{
+arena_room,52,42,7	script	Lv70 Waiting Room	4_F_TELEPORTER,{
 	end;
 
 OnInit:
@@ -32,7 +32,7 @@ OnStart:
 	end;
 }
 
-force_3-1,99,20,4	script	Cadillac#arena	124,{
+force_3-1,99,20,4	script	Cadillac#arena	4_F_TELEPORTER,{
 	end;
 
 OnStart:
@@ -307,56 +307,56 @@ OnReset_All:
 	end;
 }
 
-force_3-1,62,26,1	script	force_08_01#70	45,1,1,{
+force_3-1,62,26,1	script	force_08_01#70	WARPNPC,1,1,{
 OnTouch:
 	donpcevent "Cadillac#arena::On01_Start";
 	warp "force_3-1",40,26;
 	end;
 }
 
-force_3-1,25,44,1	script	force_01_02#70	45,1,1,{
+force_3-1,25,44,1	script	force_01_02#70	WARPNPC,1,1,{
 OnTouch:
 	donpcevent "Cadillac#arena::On02_Start";
 	warp "force_3-1",25,69;
 	end;
 }
 
-force_3-1,25,134,1	script	force_02_03#70	45,1,1,{
+force_3-1,25,134,1	script	force_02_03#70	WARPNPC,1,1,{
 OnTouch:
 	donpcevent "Cadillac#arena::On03_Start";
 	warp "force_3-1",25,159;
 	end;
 }
 
-force_3-1,44,174,1	script	force_03_04#70	45,1,1,{
+force_3-1,44,174,1	script	force_03_04#70	WARPNPC,1,1,{
 OnTouch:
 	donpcevent "Cadillac#arena::On04_Start";
 	warp "force_3-1",69,174;
 	end;
 }
 
-force_3-1,134,174,1	script	force_04_05#70	45,1,1,{
+force_3-1,134,174,1	script	force_04_05#70	WARPNPC,1,1,{
 OnTouch:
 	donpcevent "Cadillac#arena::On05_Start";
 	warp "force_3-1",159,174;
 	end;
 }
 
-force_3-1,174,155,1	script	force_05_06#70	45,1,1,{
+force_3-1,174,155,1	script	force_05_06#70	WARPNPC,1,1,{
 OnTouch:
 	donpcevent "Cadillac#arena::On06_Start";
 	warp "force_3-1",174,130;
 	end;
 }
 
-force_3-1,174,65,1	script	force_06_07#70	45,1,1,{
+force_3-1,174,65,1	script	force_06_07#70	WARPNPC,1,1,{
 OnTouch:
 	donpcevent "Cadillac#arena::On07_Start";
 	warp "force_3-1",174,40;
 	end;
 }
 
-force_3-1,155,26,1	script	force_07_08#70	45,1,1,{
+force_3-1,155,26,1	script	force_07_08#70	WARPNPC,1,1,{
 OnTouch:
 	donpcevent "Cadillac#arena::On08_Start";
 	warp "force_3-1",132,26;
@@ -364,14 +364,14 @@ OnTouch:
 	end;
 }
 
-force_3-1,99,54,1	script	force_08_09#70	45,1,1,{
+force_3-1,99,54,1	script	force_08_09#70	WARPNPC,1,1,{
 OnTouch:
 	donpcevent "Cadillac#arena::On09_Start";
 	warp "force_3-1",99,82;
 	end;
 }
 
-force_3-1,99,124,1	script	force_exit#70	45,1,1,{
+force_3-1,99,124,1	script	force_exit#70	WARPNPC,1,1,{
 OnTouch:
 	donpcevent "Cadillac#arena::OnTimerOff";
 	donpcevent "#arn_timer_70::OnEnable";
@@ -755,7 +755,7 @@ OnMyMobDead:
 	end;
 }
 
-prt_are_in,129,83,3	script	Staff#70-1	67,{
+prt_are_in,129,83,3	script	Staff#70-1	1_F_02,{
 	mes "[Staff]";
 	mes "You did a good job.";
 	mes "Even if you have failed to clear a time attack battle, I will reward you with a small amount of arena points.";
@@ -776,7 +776,7 @@ prt_are_in,129,83,3	script	Staff#70-1	67,{
 	end;
 }
 
-prt_are_in,25,84,3	script	Staff#70-2	67,{
+prt_are_in,25,84,3	script	Staff#70-2	1_F_02,{
 	if($arena_min70end < $arena_min70st) {
 		if($arena_sec70end < $arena_sec70st) {
 			set @record_min70,60 - $arena_min70st + $arena_min70end -1;
diff --git a/npc/other/arena/arena_lvl80.txt b/npc/other/arena/arena_lvl80.txt
index 2ad4c254d..773175a11 100644
--- a/npc/other/arena/arena_lvl80.txt
+++ b/npc/other/arena/arena_lvl80.txt
@@ -13,7 +13,7 @@
 //= 1.3 Script updates, and removed a level restriction. [Euphy]
 //============================================================
 
-arena_room,147,42,1	script	Lv80 Waiting Room	124,{
+arena_room,147,42,1	script	Lv80 Waiting Room	4_F_TELEPORTER,{
 	end;
 
 OnInit:
@@ -32,7 +32,7 @@ OnStart:
 	end;
 }
 
-force_4-1,99,20,4	script	Octus#arena	124,{
+force_4-1,99,20,4	script	Octus#arena	4_F_TELEPORTER,{
 	end;
 
 OnStart:
@@ -310,28 +310,28 @@ OnReset_All:
 	end;
 }
 
-force_4-1,62,26,1	script	force_08_01#80	45,1,1,{
+force_4-1,62,26,1	script	force_08_01#80	WARPNPC,1,1,{
 OnTouch:
 	donpcevent "Octus#arena::On01_Start";
 	warp "force_4-1",40,26;
 	end;
 }
 
-force_4-1,25,44,1	script	force_01_02#80	45,1,1,{
+force_4-1,25,44,1	script	force_01_02#80	WARPNPC,1,1,{
 OnTouch:
 	donpcevent "Octus#arena::On02_Start";
 	warp "force_4-1",25,69;
 	end;
 }
 
-force_4-1,25,134,1	script	force_02_03#80	45,1,1,{
+force_4-1,25,134,1	script	force_02_03#80	WARPNPC,1,1,{
 OnTouch:
 	donpcevent "Octus#arena::On03_Start";
 	warp "force_4-1",25,159;
 	end;
 }
 
-force_4-1,44,174,1	script	force_03_04#80	45,1,1,{
+force_4-1,44,174,1	script	force_03_04#80	WARPNPC,1,1,{
 OnTouch:
 	donpcevent "Octus#arena::On04_Start";
 	warp "force_4-1",69,174;
@@ -339,28 +339,28 @@ OnTouch:
 
 }
 
-force_4-1,134,174,1	script	force_04_05#80	45,1,1,{
+force_4-1,134,174,1	script	force_04_05#80	WARPNPC,1,1,{
 OnTouch:
 	donpcevent "Octus#arena::On05_Start";
 	warp "force_4-1",159,174;
 	end;
 }
 
-force_4-1,174,155,1	script	force_05_06#80	45,1,1,{
+force_4-1,174,155,1	script	force_05_06#80	WARPNPC,1,1,{
 OnTouch:
 	donpcevent "Octus#arena::On06_Start";
 	warp "force_4-1",174,130;
 	end;
 }
 
-force_4-1,174,65,1	script	force_06_07#80	45,1,1,{
+force_4-1,174,65,1	script	force_06_07#80	WARPNPC,1,1,{
 OnTouch:
 	donpcevent "Octus#arena::On07_Start";
 	warp "force_4-1",174,40;
 	end;
 }
 
-force_4-1,155,26,1	script	force_07_08#80	45,1,1,{
+force_4-1,155,26,1	script	force_07_08#80	WARPNPC,1,1,{
 OnTouch:
 	donpcevent "Octus#arena::On08_Start";
 	warp "force_4-1",132,26;
@@ -368,14 +368,14 @@ OnTouch:
 	end;
 }
 
-force_4-1,99,54,1	script	force_08_09#80	45,1,1,{
+force_4-1,99,54,1	script	force_08_09#80	WARPNPC,1,1,{
 OnTouch:
 	donpcevent "Octus#arena::On09_Start";
 	warp "force_4-1",99,82;
 	end;
 }
 
-force_4-1,99,124,1	script	force_exit#80	45,1,1,{
+force_4-1,99,124,1	script	force_exit#80	WARPNPC,1,1,{
 OnTouch:
 	donpcevent "Octus#arena::OnTimerOff";
 	donpcevent "#arn_timer_80::OnEnable";
@@ -736,7 +736,7 @@ OnMyMobDead:
 	end;
 }
 
-prt_are_in,181,188,3	script	Staff#80-1	67,{
+prt_are_in,181,188,3	script	Staff#80-1	1_F_02,{
 	mes "[Staff]";
 	mes "You did a good job.";
 	mes "Even if you have failed to clear a time attack battle, I will reward you with a small amount of arena points.";
@@ -757,7 +757,7 @@ prt_are_in,181,188,3	script	Staff#80-1	67,{
 	end;
 }
 
-prt_are_in,77,187,3	script	Staff#80-2	67,{
+prt_are_in,77,187,3	script	Staff#80-2	1_F_02,{
 	if($arena_min80end < $arena_min80st) {
 		if($arena_sec80end < $arena_sec80st) {
 			set @record_min80,60 - $arena_min80st + $arena_min80end -1;
diff --git a/npc/other/arena/arena_party.txt b/npc/other/arena/arena_party.txt
index 77ba829eb..2be12b02e 100644
--- a/npc/other/arena/arena_party.txt
+++ b/npc/other/arena/arena_party.txt
@@ -16,7 +16,7 @@
 //= 1.5 Script updates, and removed a level restriction. [Euphy]
 //============================================================
 
-arena_room,162,88,3	script	Ponox	124,{
+arena_room,162,88,3	script	Ponox	4_F_TELEPORTER,{
 	end;
 
 OnInit:
@@ -144,7 +144,7 @@ OnTouch:
 	end;
 }
 
-force_1-2,99,31,4	script	Slipslowrun#party	124,{
+force_1-2,99,31,4	script	Slipslowrun#party	4_F_TELEPORTER,{
 OnStart:
 	initnpctimer;
 	set $arena_minptst,gettime(2);
@@ -410,7 +410,7 @@ OnReset:
 	end;
 }
 
-force_1-2,95,187,0	script	force_09_exit	45,1,1,{
+force_1-2,95,187,0	script	force_09_exit	WARPNPC,1,1,{
 OnTouch:
 	set $arena_minptend,gettime(2);
 	set $arena_secptend,gettime(1);
@@ -949,7 +949,7 @@ OnMyMobDead:
 	end;
 }
 
-prt_are_in,181,135,3	script	Staff#party-1	67,{
+prt_are_in,181,135,3	script	Staff#party-1	1_F_02,{
 	mes "[Staff]";
 	mes "You did a good job.";
 	mes "Even if you have failed to clear a time attack battle, I will reward you with a small amount of arena points.";
@@ -970,7 +970,7 @@ prt_are_in,181,135,3	script	Staff#party-1	67,{
 	end;
 }
 
-prt_are_in,77,135,3	script	Staff#party-2	67,{
+prt_are_in,77,135,3	script	Staff#party-2	1_F_02,{
 	if($arena_minptend < $arena_minptst) {
 		if($arena_secptend < $arena_secptst) {
 			set @record_minpt,60 - $arena_minptst + $arena_minptend -1;
diff --git a/npc/other/arena/arena_point.txt b/npc/other/arena/arena_point.txt
index dc4911c68..3b49596c0 100644
--- a/npc/other/arena/arena_point.txt
+++ b/npc/other/arena/arena_point.txt
@@ -11,7 +11,7 @@
 //= 1.0 First version. [L0ne_W0lf]
 //============================================================
 
-prt_are_in,103,11,3	script	Arena Point Manager	732,{
+prt_are_in,103,11,3	script	Arena Point Manager	4_M_JOB_HUNTER,{
 	mes "[Arena Point Manager]";
 	mes "I hope you're having a good";
 	mes "time in the Arena. If you've";
diff --git a/npc/other/arena/arena_room.txt b/npc/other/arena/arena_room.txt
index 2e067cd28..b459724c2 100644
--- a/npc/other/arena/arena_room.txt
+++ b/npc/other/arena/arena_room.txt
@@ -15,7 +15,7 @@
 //= 1.4 Added GM management function. [Euphy]
 //============================================================
 
-arena_room,94,93,5	script	Vendigos	97,{
+arena_room,94,93,5	script	Vendigos	4W_M_01,{
 	mes "[Vendigos]";
 	mes "Welcome to the world of Arena, the battle against a time limit.";
 	mes "My name is Vendigos, I am here to help you.";
@@ -101,7 +101,7 @@ OnLineRec_pt:
 //	end;
 }
 
-arena_room,105,82,5	script	Arena Record Staff	57,{
+arena_room,105,82,5	script	Arena Record Staff	1_M_LIBRARYMASTER,{
 	mes "[Owen Kheuv]";
 	mes "Hello, my name is Own Kheuv";
 	mes "in charge of every arena stage record of players.";
@@ -134,7 +134,7 @@ arena_room,105,82,5	script	Arena Record Staff	57,{
 	}
 }
 
-arena_room,68,135,3	script	Helper Pat	726,{
+arena_room,68,135,3	script	Helper Pat	4_F_JOB_BLACKSMITH,{
 	mes "[Pat]";
 	mes "Welcome, welcome.";
 	mes "I am a helper of the Lv 50 arena stage.";
@@ -173,7 +173,7 @@ arena_room,68,135,3	script	Helper Pat	726,{
 	close;
 }
 
-arena_room,41,93,5	script	Helper Ben	750,{
+arena_room,41,93,5	script	Helper Ben	4_M_ALCHE_C,{
 	mes "[Ben]";
 	mes "Welcome, welcome.";
 	mes "I am a helper of the Lv 60 arena stage.";
@@ -212,7 +212,7 @@ arena_room,41,93,5	script	Helper Ben	750,{
 	close;
 }
 
-arena_room,53,49,5	script	Helper Vicious	730,{
+arena_room,53,49,5	script	Helper Vicious	4_M_JOB_ASSASSIN,{
 	mes "[Vicious]";
 	mes "Hey there.";
 	mes "My name is Vicious, I am a helper of Lv 70 arena stage.";
@@ -252,7 +252,7 @@ arena_room,53,49,5	script	Helper Vicious	730,{
 	close;
 }
 
-arena_room,147,49,3	script	Helper Epin	727,{
+arena_room,147,49,3	script	Helper Epin	4_F_JOB_HUNTER,{
 	mes "[Epin]";
 	mes "Good day,";
 	mes "I am a helper of Lv 80 arena stage and my name is Epin.";
@@ -296,7 +296,7 @@ arena_room,147,49,3	script	Helper Epin	727,{
 	close;
 }
 
-arena_room,158,93,5	script	Helper Lunic	828,{
+arena_room,158,93,5	script	Helper Lunic	4_M_ROGUE,{
 	mes "[Lunic]";
 	mes "Welcome to party arena stage.";
 	mes "I hope you will listen carefully to my introduction";
@@ -365,7 +365,7 @@ arena_room,158,93,5	script	Helper Lunic	828,{
 	close;
 }
 
-arena_room,158,82,1	script	Helper Lonik	828,{
+arena_room,158,82,1	script	Helper Lonik	4_M_ROGUE,{
 	emotion e_no1,0;
 	mes "[Lonik]";
 	mes "Tah dah! Here I am!";
@@ -391,7 +391,7 @@ arena_room,158,82,1	script	Helper Lonik	828,{
 	close;
 }
 
-sec_in02,72,180,3	script	Arena Manager#arena	802,{
+sec_in02,72,180,3	script	Arena Manager#arena	4_NFWISP,{
 	set .@i, callfunc("F_GM_NPC",1357,0);
 	if (.@i == -1) {
 		mes "[Arena Manager]";
@@ -513,7 +513,7 @@ sec_in02,72,180,3	script	Arena Manager#arena	802,{
 	}
 }
 
-sec_in02,79,171,3	script	Reward Manager#arena	802,{
+sec_in02,79,171,3	script	Reward Manager#arena	4_NFWISP,{
 	set .@i, callfunc("F_GM_NPC",1357,0);
 	if (.@i == -1) {
 		mes "[Reward Manager]";
@@ -546,7 +546,7 @@ sec_in02,79,171,3	script	Reward Manager#arena	802,{
 	}
 }
 
-arena_room,105,93,5	script	Teleporter#arena	55,{
+arena_room,105,93,5	script	Teleporter#arena	1_M_JOBTESTER,{
 	mes "[Teleporter]";
 	mes "I can move you to the reward arena!";
 	mes "Would you like to go there?";
@@ -565,7 +565,7 @@ arena_room,105,93,5	script	Teleporter#arena	55,{
 	}
 }
 
-prt_are_in,98,14,3	script	Givu#arena	728,{
+prt_are_in,98,14,3	script	Givu#arena	4_F_JOB_KNIGHT,{
 	if (checkweight(526,5) == 0) {
 		mes "- Wait a moment! -";
 		mes "- Currently you're carrying -";
@@ -755,10 +755,10 @@ OnKis:
 	emotion e_kis,0;
 	end;
 }
-prt_are_in,1,1,5	duplicate(#arena_1039)	#arena_6969	714
-prt_are_in,94,26,5	duplicate(#arena_1039)	#arena_ss_2	714
-prt_are_in,100,28,3	duplicate(#arena_1039)	#arena_ss_3	714
-prt_are_in,102,26,3	duplicate(#arena_1039)	#arena_ss_4	714
+prt_are_in,1,1,5	duplicate(#arena_1039)	#arena_6969	4_F_06
+prt_are_in,94,26,5	duplicate(#arena_1039)	#arena_ss_2	4_F_06
+prt_are_in,100,28,3	duplicate(#arena_1039)	#arena_ss_3	4_F_06
+prt_are_in,102,26,3	duplicate(#arena_1039)	#arena_ss_4	4_F_06
 prt_are_in,1,1,5	duplicate(#arena_1039)	#arena_1272	1272
 prt_are_in,1,1,5	duplicate(#arena_1039)	#arena_1046	1046
 prt_are_in,1,1,5	duplicate(#arena_1039)	#arena_1115	1115
@@ -766,7 +766,7 @@ prt_are_in,1,1,5	duplicate(#arena_1039)	#arena_1389	1389
 prt_are_in,1,1,5	duplicate(#arena_1039)	#arena_1492	1492
 prt_are_in,1,1,5	duplicate(#arena_1039)	#arena_1251	1251
 prt_are_in,1,1,5	duplicate(#arena_1039)	#arena_1159	1159
-prt_are_in,1,1,5	duplicate(#arena_1039)	#arena_7777	811
+prt_are_in,1,1,5	duplicate(#arena_1039)	#arena_7777	4_F_VALKYRIE
 
 -	script	npctime#arena	-1,{
 OnStop:
@@ -946,7 +946,7 @@ OnTimer62000:
 	end;
 }
 
-sec_in02,72,171,3	script	Picture Manager#arena	802,{
+sec_in02,72,171,3	script	Picture Manager#arena	4_NFWISP,{
 	set .@i, callfunc("F_GM_NPC",1357,0);
 	if (.@i == -1) {
 		mes "[Picture Manager]";
@@ -974,7 +974,7 @@ sec_in02,72,171,3	script	Picture Manager#arena	802,{
 	}
 }
 
-sec_in02,76,176,5	script	Live Broadcast#arena	802,{
+sec_in02,76,176,5	script	Live Broadcast#arena	4_NFWISP,{
 	callfunc "F_GM_NPC";
 	mes "[Live Broadcast]";
 	mes "Currently there are "+getmapusers("force_1-1")+" people in Lv 50s map.";