8 files changed, 18 insertions, 33 deletions
diff --git a/world/map/npc/annuals/fathertime.txt b/world/map/npc/annuals/fathertime.txt
index 53912f86..6d61f446 100644
--- a/world/map/npc/annuals/fathertime.txt
+++ b/world/map/npc/annuals/fathertime.txt
@@ -1,6 +1,6 @@
 // Annual Timer
 // One timer to check to enable all holiday events
-017-9,26,28,0|script|#HolidayConfig|-1
+017-9,26,28,0|script|#HolidayConfig|32767
 {
     end;
 
@@ -20,23 +20,3 @@ OnTimer20000:
     initnpctimer;
     end;
 }
-017-9,31,24,0|script|HolidayDebug#1|105
-{
-    if(getgmlevel() < 40)
-        goto L_End;
-
-    menu
-        "Xmas.", L_XmasDebug,
-        "Halloween.", L_HalloweenDebug;
-
-L_XmasDebug:
-    callfunc "XmasDebug";
-    goto L_End;
-
-L_HalloweenDebug:
-    callfunc "HalloweenDebug";
-    goto L_End;
-
-L_End:
-    end;
-}
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;
diff --git a/world/map/npc/annuals/xmas/barriers.txt b/world/map/npc/annuals/xmas/barriers.txt
index 5dd30774..3e6aad65 100644
--- a/world/map/npc/annuals/xmas/barriers.txt
+++ b/world/map/npc/annuals/xmas/barriers.txt
@@ -4,6 +4,7 @@
 
 function|script|ThrowOutTheBum
 {
+    set @getout, 0;
     if((@xmas_thrown_out) && ($@xmas_time))
         goto L_SideOut;
     goto L_Return;
@@ -18,13 +19,16 @@ L_Hint:
     mes "[Orum's Homunculus]";
     mes "\"What are you doing? Come, see me in the caves below!\"";
     mes "\"I said go north till you reach the snowman. Then head into the cave to the east.\"";
+    close2;
     warp "020-1.gat",33,94;
-    close;
+    set @getout, 1;
+    goto L_Return;
 
 L_Warp:
     message strcharinfo(0), "I said get out, We've no time for your kind here.";
     warp "020-1.gat",33,94;
-    end;
+    set @getout, 1;
+    goto L_Return;
 
 L_Return:
     return;
diff --git a/world/map/npc/annuals/xmas/config.txt b/world/map/npc/annuals/xmas/config.txt
index b7a6de82..90eab504 100644
--- a/world/map/npc/annuals/xmas/config.txt
+++ b/world/map/npc/annuals/xmas/config.txt
@@ -38,7 +38,7 @@
 // 30: Helper Bit
 // 31: Side Choosen: Naughty vs. Nice
 
--|script|#XmasConfig|-1
+-|script|#XmasConfig|32767
 {
     end;
 
diff --git a/world/map/npc/annuals/xmas/core.txt b/world/map/npc/annuals/xmas/core.txt
index d064efca..517ac084 100644
--- a/world/map/npc/annuals/xmas/core.txt
+++ b/world/map/npc/annuals/xmas/core.txt
@@ -130,7 +130,7 @@ L_SetRewardBonus:
         set @xmas_reward_lower_bound, 2 * @xmas_reward_tally - rand(5);
     if (@xmas_reward_tally <= 5)
         set @xmas_reward_lower_bound, @xmas_reward_tally;
-    set @xmas_reward_upper_bound, @xmas_reward_lower_bound + ((readparam(bLuk)) / 5);
+    set @xmas_reward_upper_bound, @xmas_reward_lower_bound + ((Luk) / 5);
     set @xmas_reward, (rand(@xmas_reward_lower_bound, @xmas_reward_upper_bound));
     set @xmas_reward_lower_bound, 0;
     set @xmas_reward_upper_bound, 0;
@@ -159,8 +159,7 @@ L_LevelingReward:
     goto L_XmasExp;
 
 L_XmasLevel:
-    gmcommand "@blvl 1";
-    gmcommand "@l I was a good kid this year.";
+    set BaseLevel, BaseLevel + 1;
     return;
 
 L_XmasExp:
diff --git a/world/map/npc/annuals/xmas/debug.txt b/world/map/npc/annuals/xmas/debug.txt
index 0e3c38a2..d67c3de8 100644
--- a/world/map/npc/annuals/xmas/debug.txt
+++ b/world/map/npc/annuals/xmas/debug.txt
@@ -168,7 +168,8 @@ L_Close:
     set @xmas_time_key_rsday, 0;
     set @xmas_time_key_reday, 0;
     set @xmas_time_key_year, 0;
-    close;
+    close2;
+    return;
 }
 
 020-1.gat,86,76,0|script|XmasDebug#1|105