3 files changed, 6 insertions, 5 deletions
diff --git a/world/map/npc/annuals/halloween/config.txt b/world/map/npc/annuals/halloween/config.txt
index 8e9169e8..34ffb875 100644
--- a/world/map/npc/annuals/halloween/config.txt
+++ b/world/map/npc/annuals/halloween/config.txt
@@ -81,7 +81,7 @@
 // BIT 30: NPC #1
 // BIT 31: NPC #0
 
--|script|#HalloweenConfig|-1
+-|script|#HalloweenConfig|32767
 {
     end;
 
diff --git a/world/map/npc/annuals/halloween/debug.txt b/world/map/npc/annuals/halloween/debug.txt
index 07717b35..cbc918e2 100644
--- a/world/map/npc/annuals/halloween/debug.txt
+++ b/world/map/npc/annuals/halloween/debug.txt
@@ -1,4 +1,4 @@
-// Halloween Debug 
+// Halloween Debug
 // Author: Wushin
 
 function|script|HalloweenDebug
@@ -137,5 +137,6 @@ L_Close:
     set @loop, 0;
     set @menu, 0;
     set @halloween_npc_id, 0;
-    close;
+    close2;
+    return;
 }
diff --git a/world/map/npc/annuals/halloween/trick_or_treat.txt b/world/map/npc/annuals/halloween/trick_or_treat.txt
index 24a359d2..10265382 100644
--- a/world/map/npc/annuals/halloween/trick_or_treat.txt
+++ b/world/map/npc/annuals/halloween/trick_or_treat.txt
@@ -71,7 +71,7 @@ L_MaskMemoryCheck:
 
 L_MaskMemoryYes:
     // not necessarily true
-    mes "\"I remember you, " + getequipname(equip_head) + " person. No more treats for you!\"";
+    mes "\"I remember you, " + getitemlink(getequipid(equip_head)) + " person. No more treats for you!\"";
     goto L_Close;
 
 L_MaskMemoryNo:
@@ -285,7 +285,7 @@ L_Explain:
     next;
     set @npc_check_loop, 0;
     goto L_NpcCheckLoop;
-    
+
 L_NpcCheckLoop:
     mes $@halloween_npc_names$[@npc_check_loop];
     next;