Follow-up to 124ab2a1cdb344f24170a4d91f7000ebabf39b40

- Changed a few leftover NPC IDs to constants
- Note: we're still missing support for mob sprite constants, so the
  NPCs using mob sprites are still not converted.

Signed-off-by: Haru <haru@dotalux.com>

12 files changed, 17 insertions, 17 deletions

diff --git a/npc/instances/EndlessTower.txt b/npc/instances/EndlessTower.txt
index 7d1bee6aa..e39cfbbff 100644
--- a/npc/instances/EndlessTower.txt
+++ b/npc/instances/EndlessTower.txt
@@ -1252,7 +1252,7 @@ OnTimer5000:
 	end;
 }
 
-1@tower,12,393,0	script	1FGate102tower	45,2,2,{
+1@tower,12,393,0	script	1FGate102tower	WARPNPC,2,2,{
 	end;
 
 OnInstanceInit:
@@ -1323,7 +1323,7 @@ L_Display:
 1@tower,184,51,0	duplicate(1FGate102tower)	23FGate102tower	WARPNPC,2,2
 1@tower,270,51,0	duplicate(1FGate102tower)	24FGate102tower	WARPNPC,2,2
 
-1@tower,355,51,0	script	25FGate102tower	45,2,2,{
+1@tower,355,51,0	script	25FGate102tower	WARPNPC,2,2,{
 	end;
 
 OnInstanceInit:
@@ -1347,7 +1347,7 @@ OnTimer120000:
 	end;
 }
 
-1@tower,355,51,0	script	25FGate102tower-2	45,2,2,{
+1@tower,355,51,0	script	25FGate102tower-2	WARPNPC,2,2,{
 	end;
 
 OnInstanceInit:
@@ -2244,4 +2244,4 @@ OnTimer1000:
 	stopnpctimer;
 	donpcevent instance_npcname("#Effect30")+"::OnEnable";
 	end;
-}
\ No newline at end of file
+}
diff --git a/npc/other/hugel_bingo.txt b/npc/other/hugel_bingo.txt
index 2bd8f1d55..0a47b4f00 100644
--- a/npc/other/hugel_bingo.txt
+++ b/npc/other/hugel_bingo.txt
@@ -276,7 +276,7 @@ OnTimer460000:
 	end;
 }
 
-que_bingo,49,125,0	script	1a#bingo	139,1,1,{
+que_bingo,49,125,0	script	1a#bingo	HIDDEN_WARP_NPC,1,1,{
 	end;
 
 OnInit:
diff --git a/npc/other/turbo_track.txt b/npc/other/turbo_track.txt
index b135cd093..dea910aa3 100644
--- a/npc/other/turbo_track.txt
+++ b/npc/other/turbo_track.txt
@@ -1918,7 +1918,7 @@ turbo_n_1,222,45,0	duplicate(TurboHint_4#tt_main)	#n1NoWayOut5	-1,1,1
 turbo_n_1,222,61,0	duplicate(TurboHint_4#tt_main)	#n1NoWayOut6	-1,1,1
 turbo_n_1,222,65,0	duplicate(TurboHint_4#tt_main)	#n1NoWayOut7	-1,1,1
 
--	script	cos_end#tt_main	01,{
+-	script	cos_end#tt_main	-1,{
 	function	GetNumber;
 OnTouch:
 	set .@w$,callfunc("F_tt");
diff --git a/npc/quests/first_class/tu_acolyte.txt b/npc/quests/first_class/tu_acolyte.txt
index fde13dbae..c788462bd 100644
--- a/npc/quests/first_class/tu_acolyte.txt
+++ b/npc/quests/first_class/tu_acolyte.txt
@@ -1778,7 +1778,7 @@ prt_monk,223,123,3	script	Eavesdrop#tu	HIDDEN_NPC,{
 	}
 }
 
-sec_in02,17,156,3	script	1st Job Quest Reset	726,{
+sec_in02,17,156,3	script	1st Job Quest Reset	4_F_JOB_BLACKSMITH,{
 	callfunc "F_GM_NPC";
 	mes "[1st Job Quest]";
 	mes "Which would you like to reset?";
diff --git a/npc/quests/quests_ein.txt b/npc/quests/quests_ein.txt
index 243c47fc7..51d7e5869 100644
--- a/npc/quests/quests_ein.txt
+++ b/npc/quests/quests_ein.txt
@@ -4073,7 +4073,7 @@ ein_in01,67,242,3	script	Zelmeto	4_M_REPAIR,{
 	}
 }
 
-ein_in01,49,232,3	script	2nd Control Panel#ins	111,{
+ein_in01,49,232,3	script	2nd Control Panel#ins	HIDDEN_NPC,{
 	if ((EinFactory == 1) || (EinFactory == 2)) {
 		changequest 8017,8018;
 		set EinFactory,2;
@@ -4088,7 +4088,7 @@ ein_in01,49,232,3	script	2nd Control Panel#ins	111,{
 	end;
 }
 
-ein_in01,108,217,3	script	3rd Pressure Governor#1	111,{
+ein_in01,108,217,3	script	3rd Pressure Governor#1	HIDDEN_NPC,{
 	if ((EinFactory == 3) || (EinFactory == 4)) {
 		changequest 8019,8020;
 		set EinFactory,4;
diff --git a/npc/quests/quests_juperos.txt b/npc/quests/quests_juperos.txt
index b46c8a82c..3c51ead24 100644
--- a/npc/quests/quests_juperos.txt
+++ b/npc/quests/quests_juperos.txt
@@ -4904,7 +4904,7 @@ OnTimer26000:
 	donpcevent "GuardEnd#ufe::OnDisable";
 }
 
-jupe_ele,41,33,0	script	4F Enter#ufe	45,4,4,{
+jupe_ele,41,33,0	script	4F Enter#ufe	WARPNPC,4,4,{
 OnInit:
 	disablenpc "4F Enter#ufe";
 	end;
diff --git a/npc/quests/quests_moscovia.txt b/npc/quests/quests_moscovia.txt
index 6f00c6e7c..d868926b6 100644
--- a/npc/quests/quests_moscovia.txt
+++ b/npc/quests/quests_moscovia.txt
@@ -9298,7 +9298,7 @@ moc_pryd04,126,120,0	script	Soldier#rus26	4_M_RUSMAN1,{
 //----------------------------------------------------------------------------
 // Marozka's Dungeon (Golden Thread)
 //----------------------------------------------------------------------------
-mosk_dun01,45,250,3	script	1#rus27	45,3,3,{
+mosk_dun01,45,250,3	script	1#rus27	WARPNPC,3,3,{
 	end;
 OnTouch:
 	warp "mosk_que",49,22;
diff --git a/npc/quests/thana_quest.txt b/npc/quests/thana_quest.txt
index bb70a4166..8aebaae31 100644
--- a/npc/quests/thana_quest.txt
+++ b/npc/quests/thana_quest.txt
@@ -868,7 +868,7 @@ L_Request:
 	return;
 }
 
-tha_t02,227,163,0	script	3rdf_warp#tt	45,1,1,{
+tha_t02,227,163,0	script	3rdf_warp#tt	WARPNPC,1,1,{
 	end;
 OnInit:
 	disablenpc "3rdf_warp#tt";
@@ -2310,4 +2310,4 @@ OnTouch:
 	}
 	mes "A mysterious power is blocking my path.";
 	close;
-}
\ No newline at end of file
+}
diff --git a/npc/re/quests/eden/86-90.txt b/npc/re/quests/eden/86-90.txt
index 60bbac0e2..1fced3a16 100644
--- a/npc/re/quests/eden/86-90.txt
+++ b/npc/re/quests/eden/86-90.txt
@@ -13,7 +13,7 @@
 //= 1.3 Updated to match the official script. [Euphy]
 //============================================================
 
-moc_para01,48,175,3	script	4_M_04-90 Mission Board	857,{
+moc_para01,48,175,3	script	4_M_04-90 Mission Board	4_BOARD3,{
 	if (countitem(6219) < 1) {
 		mes "Wait a minute!";
 		mes "-You need to have an-";
diff --git a/npc/re/quests/eden/91-99.txt b/npc/re/quests/eden/91-99.txt
index 0c3c6b12f..62a6512f6 100644
--- a/npc/re/quests/eden/91-99.txt
+++ b/npc/re/quests/eden/91-99.txt
@@ -13,7 +13,7 @@
 //= 1.3 Updated to match the official script. [Euphy]
 //============================================================
 
-moc_para01,48,177,3	script	4_F_02-99 Mission Board	857,{
+moc_para01,48,177,3	script	4_F_02-99 Mission Board	4_BOARD3,{
 	if (countitem(6219) < 1) {
 		mes "Wait a minute!";
 		mes "-You need to have an-";
diff --git a/npc/re/quests/quests_dicastes.txt b/npc/re/quests/quests_dicastes.txt
index 020aff699..9375cf27b 100644
--- a/npc/re/quests/quests_dicastes.txt
+++ b/npc/re/quests/quests_dicastes.txt
@@ -436,7 +436,7 @@ dic_in01,254,119,0	script	Item Storage#01	CLEAR_NPC,{
 	end;
 }
 
-sec_in02,10,42,1	script	13.3 Related Reset	449,{
+sec_in02,10,42,1	script	13.3 Related Reset	4_MAN_BENKUNI,{
 	callfunc "F_GM_NPC";
 	mes "[Reset]";
 	mes "Resets all quest windows including daily and map quests for 13.3.";
diff --git a/npc/re/quests/quests_malangdo.txt b/npc/re/quests/quests_malangdo.txt
index ea03d66bb..62b356c23 100644
--- a/npc/re/quests/quests_malangdo.txt
+++ b/npc/re/quests/quests_malangdo.txt
@@ -2468,7 +2468,7 @@ OnTouch:
 	close;
 }
 
-malangdo,246,184,0	script	1st Rate Point	111,{
+malangdo,246,184,0	script	1st Rate Point	HIDDEN_NPC,{
 	if (checkweight(1201,1) == 0) {
 		mes " - Notice !! -";
 		mes " - Since you have too many items - ";