1 files changed, 9 insertions, 4 deletions
diff --git a/npc/commands/event.txt b/npc/commands/event.txt
index 4982d85f1..61caed24b 100644
--- a/npc/commands/event.txt
+++ b/npc/commands/event.txt
@@ -233,10 +233,7 @@ OnCall:
     end;
 }
 
--	script	@toevent	32767,{
-    end;
-
-OnCall:
+function	script	CMD_toevent	{
     if (!@toeventchk) {
         @toeventval1=readparam(Hp);
         @toeventval2=readparam(Sp);
@@ -244,6 +241,14 @@ OnCall:
         specialeffect FX_CIRCLE, SELF, getcharid(3);
         addtimer 4000, "@toevent::OnEffect";
     }
+    return;
+}
+
+-	script	@toevent	32767,{
+    end;
+
+OnCall:
+    CMD_toevent();
     end;
 
 OnEffect: