6 files changed, 16 insertions, 16 deletions
diff --git a/world/map/npc/functions/DyeConfig.txt b/world/map/npc/functions/DyeConfig.txt
index 0072dd26..e2d9640e 100644
--- a/world/map/npc/functions/DyeConfig.txt
+++ b/world/map/npc/functions/DyeConfig.txt
@@ -1,4 +1,4 @@
-009-2,32,105,0|script|#DyeChecker|-1
+009-2,32,105,0|script|#DyeChecker|32767
 {
     end;
 OnInit:
diff --git a/world/map/npc/functions/debug.txt b/world/map/npc/functions/debug.txt
index 7885c821..bcb54777 100755
--- a/world/map/npc/functions/debug.txt
+++ b/world/map/npc/functions/debug.txt
@@ -2,7 +2,12 @@
 
 function|script|Debug
 {
-    goto L_Begin;
+    if(!@debug_npc) goto L_Begin;
+    mes "The debug NPCs have been deprecated. Please use this magic spell instead:";
+    mes "";
+    mes "%%E        ##a"+ getspellinvocation("debug0") +"##0";
+    set @debug_npc, 0;
+    close;
 
 L_Begin:
     set @debug_mask, 65535;
@@ -918,6 +923,7 @@ L_Close:
 
 029-2,30,26,0|script|Debug#0|154
 {
+    set @debug_npc, 1;
     callfunc "Debug";
     end;
 OnInit:
@@ -928,6 +934,7 @@ OnInit:
 
 001-1,53,47,0|script|Debug#1|154
 {
+    set @debug_npc, 1;
     callfunc "Debug";
     end;
 OnInit:
@@ -938,6 +945,7 @@ OnInit:
 
 009-1,45,33,0|script|Debug#2|154
 {
+    set @debug_npc, 1;
     callfunc "Debug";
     end;
 OnInit:
@@ -948,6 +956,7 @@ OnInit:
 
 020-1,75,85,0|script|Debug#3|154
 {
+    set @debug_npc, 1;
     callfunc "Debug";
     end;
 OnInit:
@@ -956,18 +965,9 @@ OnInit:
     end;
 }
 
-017-9,21,24,0|script|Debug#4|154
-{
-    callfunc "Debug";
-    end;
-OnInit:
-    if (!debug)
-        disablenpc "Debug#4";
-    end;
-}
-
 027-2,125,103,0|script|Debug#5|154
 {
+    set @debug_npc, 1;
     callfunc "Debug";
     end;
 OnInit:
diff --git a/world/map/npc/functions/ferry.txt b/world/map/npc/functions/ferry.txt
index aad92b14..3737bb18 100644
--- a/world/map/npc/functions/ferry.txt
+++ b/world/map/npc/functions/ferry.txt
@@ -1,6 +1,6 @@
 // The ferry system
 
-017-9,27,28,0|script|#FerryConfig|-1
+017-9,27,28,0|script|#FerryConfig|32767
 {
     end;
 
diff --git a/world/map/npc/functions/global_event_handler.txt b/world/map/npc/functions/global_event_handler.txt
index 9ce44a38..92194086 100644
--- a/world/map/npc/functions/global_event_handler.txt
+++ b/world/map/npc/functions/global_event_handler.txt
@@ -3,7 +3,7 @@
 //
 // Author: meko
 
--|script|#GlobalHandler|-1
+-|script|#GlobalHandler|32767
 {
     end;
 
diff --git a/world/map/npc/functions/gm_island.txt b/world/map/npc/functions/gm_island.txt
index 5efe105e..94c745a7 100644
--- a/world/map/npc/functions/gm_island.txt
+++ b/world/map/npc/functions/gm_island.txt
@@ -1,5 +1,5 @@
 // Add Localized Warp in town centers and Message to GM Island
--|script|#GmConfig|-1
+-|script|#GmConfig|32767
 {
     end;
 
diff --git a/world/map/npc/functions/travelers.txt b/world/map/npc/functions/travelers.txt
index 6b2103d8..aec700d0 100644
--- a/world/map/npc/functions/travelers.txt
+++ b/world/map/npc/functions/travelers.txt
@@ -6,7 +6,7 @@
 // Costs Zeny
 
 // Contains all warp points to find
-017-9,27,28,0|script|#TravelConfig|-1
+017-9,27,28,0|script|#TravelConfig|32767
 {
     end;