summaryrefslogtreecommitdiff
path: root/world/map
diff options
context:
space:
mode:
Diffstat (limited to 'world/map')
-rw-r--r--world/map/npc/functions/clear_vars.txt22
1 files changed, 22 insertions, 0 deletions
diff --git a/world/map/npc/functions/clear_vars.txt b/world/map/npc/functions/clear_vars.txt
index aa3f700a..e0cab888 100644
--- a/world/map/npc/functions/clear_vars.txt
+++ b/world/map/npc/functions/clear_vars.txt
@@ -31,6 +31,7 @@ function|script|ClearVariables
callsub S_Halloween2009;
callsub S_Halloween2010;
callsub S_Halloween2011;
+ callsub S_Halloween2016;
callsub S_Xmas2006;
callsub S_Xmas2007;
callsub S_Xmas2008;
@@ -160,6 +161,20 @@ S_Halloween2010:
set hween10_paid, 0;
return;
+S_Halloween2016:
+ set HWEEN16, 0;
+ if(!hween16) goto S_Return;
+ set hween16, 0;
+ set hween16_collect_canpump, 0;
+ set hween16_credits, 0;
+ set hween16_collect, 0;
+ set hween16_collect_mmallow, 0;
+ set hween16_collect_jelskul, 0;
+ set hween16_bonecount, 0;
+ set hween16_collect_tondel, 0;
+ set hween16_paid, 0;
+ return;
+
S_Xmas2010:
if(!Xmas2010) goto S_Return;
set Count_Yellow, 0;
@@ -442,6 +457,13 @@ L_EventClear:
// Clear global variable used in Christmas event 2010
set $Golbenez_Inn_Cost, 0;
+// Clear global variables used in the Halloween event 2016
+ set $hween16, 0;
+ set $hween16_tondel, 0;
+ set $hween16_mmallow, 0;
+ set $hween16_jelskul, 0;
+ set $hween16_canpump, 0;
+
// Variable was used in Voltain's script, was renamed and turned into a temporary variable
set $state, 0;
return;