1 files changed, 13 insertions, 11 deletions

diff --git a/world/map/npc/015-1/alice.txt b/world/map/npc/015-1/alice.txt
index 34f728a1..972d48b3 100644
--- a/world/map/npc/015-1/alice.txt
+++ b/world/map/npc/015-1/alice.txt
@@ -14,21 +14,18 @@
         menu
             "Yes, sure.", L_findmany,
             "Herbs?", L_herbs,
-            "Nope, just enjoying the scenery.", L_close,
+            "Nope, just enjoying the scenery.", L_Close,
             "I saw the cat, but it doesn't like me.", L_cat;
     if (@Hiss == 1)
         menu
             "Yes, sure.", L_findmany,
             "Herbs?", L_herbs,
-            "Nope, just enjoying the scenery.", L_close,
+            "Nope, just enjoying the scenery.", L_Close,
             "There is a monster in that cave!", L_cave;
     menu
         "Yes, sure.", L_findmany,
         "Herbs?", L_herbs,
-        "Nope, just enjoying the scenery.", L_close;
-
-L_close:
-    close;
+        "Nope, just enjoying the scenery.", L_Close;
 
 L_findmany:
     mes "[Alice]";
@@ -40,7 +37,7 @@ L_findmany:
     mes "[Alice]";
     mes "\"Oooh, how sad. Let me give you a little tip:";
     mes "Herbs are often growing in places where they can't be spotted that easily. Don't forget to look behind the trees, too.\"";
-    close;
+    goto L_Close;
 
 L_plenty:
     mes "[Alice]";
@@ -48,14 +45,14 @@ L_plenty:
     mes "When you are not that good at brewing you should consider letting someone else brew them for you.";
     mes "Good brewers get much better healing potions from them.";
     mes "The most important characteristic of a good brewer is intelligence.\"";
-    close;
+    goto L_Close;
 
 L_herbs:
     mes "[Alice]";
     mes "\"Yes, some powerful magic herbs started to grow around here and a mile to the southeast.";
     mes "Caul in Hurnscald found a way to brew magical healing potions from them, and I have heard a rumor that they may also be good for making colors.";
     mes "Now everyone is running around in the woods to harvest the herbs.\"";
-    close;
+    goto L_Close;
 
 L_cave:
     mes "[Alice]";
@@ -72,16 +69,21 @@ L_cave:
         "What a stupid cat!", -;
     mes "[Alice]";
     mes "\"Please don't do her any harm. See you later!\"";
-    close;
+    goto L_Close;
 
 L_cat:
     mes "[Alice]";
     mes "\"You would have to tame her first. Maybe she's thirsty or hungry. Cats also tend to get bored without something to play with. Good luck!\"";
     next;
     menu
-        "Thank you so much!", L_close,
+        "Thank you so much!", L_Close,
         "Are you crazy? Taming a cat?", -;
     mes "[Alice]";
     mes "\"Well, it's up to you.\"";
+    goto L_Close;
+
+L_Close:
+    set @cat, 0;
+    set @Hiss, 0;
     close;
 }