Clear temporary variables after you close npc window. Npcs from 001-1.

1 files changed, 10 insertions, 9 deletions

diff --git a/world/map/npc/001-1/sarah.txt b/world/map/npc/001-1/sarah.txt
index 3bd2a447..57793ec9 100644
--- a/world/map/npc/001-1/sarah.txt
+++ b/world/map/npc/001-1/sarah.txt
@@ -8,7 +8,7 @@
 
     // If this is shown, something is wrong with the above case handling.
     mes "Sarah looks confused.";
-    close;
+    goto L_Close;
 
 L_Convince_Sarah_First:
     mes "[Sarah]";
@@ -17,7 +17,7 @@ L_Convince_Sarah_First:
     mes "\"The girl suddenly looks at you suspiciously.\"";
     next;
     mes "\"My mommy says not to talk to strangers!\"";
-    close;
+    goto L_Close;
 
 L_Start:
     set @TEMP, rand(2);
@@ -40,7 +40,7 @@ L_Ask:
     mes "\"Can you bring me a piece of Cherry Cake?  Pretty please?\"";
     menu
         "Yes.", L_Req0,
-        "No.", L_No;
+        "No.", L_Close;
 
 L_Req0:
     mes "[Sarah]";
@@ -52,7 +52,7 @@ L_Set:
     set TMW_Quest,7;
     mes "[Sarah]";
     mes "\"Please bring it to me!\"";
-    close;
+    goto L_Close;
 
 L_Progress:
     if (countitem("CherryCake") < 1) goto L_NotEnough;
@@ -66,25 +66,26 @@ L_Progress:
     delitem "CherryCake", 1;
     getitem "serfhat", 1;
     set TMW_Quest, 8;
-    close;
+    goto L_Close;
 
 L_NotEnough:
     mes "[Sarah]";
     mes "\"Oh, I'm starving!  Please bring me Cherry Cake!\"";
-    close;
+    goto L_Close;
 
 L_Done:
     mes "[Sarah]";
     mes "\"It was so tasty, I can't eat anything more...  Thank you!\"";
     emotion 9;
-    close;
+    goto L_Close;
 
-L_No:
+L_Close:
+    set @TEMP, 0;
     close;
 
 L_TooMany:
     next;
     mes "[Sarah]";
     mes "\"You don't have room for my reward.  I'll wait until you do.\"";
-    close;
+    goto L_Close;
 }