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

1 files changed, 14 insertions, 14 deletions

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;