From ff6f23e94c4ac068dae9e7441b9dc4e600787aa5 Mon Sep 17 00:00:00 2001
From: wushin <pasekei@gmail.com>
Date: Wed, 5 Nov 2014 11:09:21 -0600
Subject: NPCs on 009-* fixed

---
 world/map/npc/009-4/torches.txt | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'world/map/npc/009-4/torches.txt')

diff --git a/world/map/npc/009-4/torches.txt b/world/map/npc/009-4/torches.txt
index e9d8ff3e..b92098c0 100644
--- a/world/map/npc/009-4/torches.txt
+++ b/world/map/npc/009-4/torches.txt
@@ -1,5 +1,5 @@
 //# see detailed description at orum.txt
-function|script|GetTorchColor|,
+function|script|GetTorchColor
 {
     if (@Torch < 0 || @Torch > 2) goto L_Error;
 
@@ -13,7 +13,7 @@ L_Error:
     close;
 }
 
-function|script|SetTorchColor|,
+function|script|SetTorchColor
 {
     if (@Torch < 0 || @Torch > 2) goto L_Error;
     if (@TorchColor < 1 || @TorchColor > 12) goto L_Error2;
@@ -31,7 +31,7 @@ L_Error2:
     close;
 }
 
-function|script|GetTorchIntensity|,
+function|script|GetTorchIntensity
 {
     if (@Torch < 0 || @Torch > 2) goto L_Error;
 
@@ -45,7 +45,7 @@ L_Error:
     close;
 }
 
-function|script|SetTorchIntensity|,
+function|script|SetTorchIntensity
 {
     if (@Torch < 0 || @Torch > 2) goto L_Error;
     if (@TorchIntensity < 0 || @TorchIntensity > 2) goto L_Error2;
@@ -63,7 +63,7 @@ L_Error2:
     close;
 }
 
-function|script|DoneWithTorches|,
+function|script|DoneWithTorches
 {
     if (OrumQuest < 11 && OrumQuest >= 8)
         goto L_Return;
@@ -87,7 +87,7 @@ L_Return:
 }
 
 // To make sure in range of torches
-function|script|InRangeTorch1|,
+function|script|InRangeTorch1
 {
     if (isin("009-4.gat",67,20,69,25))
         goto L_Return;
@@ -97,7 +97,7 @@ function|script|InRangeTorch1|,
 L_Return:
     return;
 }
-function|script|InRangeTorch2|,
+function|script|InRangeTorch2
 {
     if (isin("009-4.gat",65,41,69,46))
         goto L_Return;
@@ -107,7 +107,7 @@ function|script|InRangeTorch2|,
 L_Return:
     return;
 }
-function|script|InRangeTorch3|,
+function|script|InRangeTorch3
 {
     if (isin("009-4.gat",33,84,37,88))
         goto L_Return;
@@ -118,7 +118,7 @@ L_Return:
     return;
 }
 
-function|script|TorchLoop|,
+function|script|TorchLoop
 {
     // Variables used here:
     // @Torch - pass before calling
@@ -281,7 +281,7 @@ L_Failed:
 }
 
 // First Torch
-009-4.gat,68,21,0|script|Torch#1|400,
+009-4.gat,68,21,0|script|Torch#1|400
 {
     callfunc "InRangeTorch1";
     callfunc "DoneWithTorches";
@@ -293,7 +293,7 @@ L_Failed:
 }
 
 // Second Torch
-009-4.gat,67,42,0|script|Torch#2|400,
+009-4.gat,67,42,0|script|Torch#2|400
 {
     callfunc "InRangeTorch2";
     callfunc "DoneWithTorches";
@@ -305,7 +305,7 @@ L_Failed:
 }
 
 // Third Torch
-009-4.gat,33,86,0|script|Torch#3|400,
+009-4.gat,33,86,0|script|Torch#3|400
 {
     callfunc "InRangeTorch3";
     callfunc "DoneWithTorches";
-- 
cgit v1.2.3-60-g2f50