From bc66a98377575c7c8e9592e50cbdcf083d6ecaff Mon Sep 17 00:00:00 2001
From: Ben Longbons <b.r.longbons@gmail.com>
Date: Fri, 28 Jun 2013 11:41:36 -0700
Subject: Refactor all calls within an if, which is illegal

---
 world/map/npc/008-1/annualeaster.txt | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'world/map/npc/008-1/annualeaster.txt')

diff --git a/world/map/npc/008-1/annualeaster.txt b/world/map/npc/008-1/annualeaster.txt
index 2e59275c..7032a0f3 100644
--- a/world/map/npc/008-1/annualeaster.txt
+++ b/world/map/npc/008-1/annualeaster.txt
@@ -168,10 +168,19 @@ OnTimer1000:
         set $@isEaster, 1;
 
     if (!$@wasEaster && $@isEaster)
-        callsub S_enableEggs;
+        goto L_do_update_enable;
     if ($@wasEaster && !$@isEaster)
-        callsub S_disableEggs;
+        goto L_do_update_disable;
 
+L_do_update_enable:
+    callsub S_enableEggs;
+    goto L_done_update;
+
+L_do_update_disable:
+    callsub S_disableEggs;
+    goto L_done_update;
+
+L_done_update:
     set $@wasEaster, $@isEaster;
 
     if (!$@isEaster)
-- 
cgit v1.2.3-60-g2f50