1 files changed, 13 insertions, 13 deletions

diff --git a/world/map/npc/027-2/caretaker.txt b/world/map/npc/027-2/caretaker.txt
index 7ed0a665..2234ffc5 100644
--- a/world/map/npc/027-2/caretaker.txt
+++ b/world/map/npc/027-2/caretaker.txt
@@ -15,8 +15,7 @@
     next;
     menu
         "And what are you?", L_Who,
-        "That's right, so move and let me kill that demon behind you.", -;
-    close;
+        "That's right, so move and let me kill that demon behind you.", L_Close;
 
 L_Who:
     mes "[Caretaker]";
@@ -24,7 +23,9 @@ L_Who:
     mes "Now, I care only for my wife. I watch over her... make sure that nobody ever does her harm.\"";
     next;
     menu
-        "You guard her corpse day and night?", -;
+        "You guard her corpse day and night?", L_WatchCorpse;
+
+L_WatchCorpse:
     mes "[Caretaker]";
     mes "\"I am bound to this wretched place by the very same spell that was cast to keep the undead from leaving. Until the day that this cemetery is free from its curse, I shall remain within these gates.\"";
     set QUEST_Graveyard_Caretaker, 1;
@@ -38,8 +39,7 @@ L_Return_Dialog:
     menu
         "What's the favor?", L_Favor,
         "I'm sure I can, for a price.", L_Favor,
-        "Sorry, I am busy.", -;
-    close;
+        "Sorry, I am busy.", L_Close;
 
 L_Favor:
     mes "[Caretaker]";
@@ -50,8 +50,7 @@ L_Favor:
     menu
         "I will take it to her.", L_Receive,
         "I will help you. Where can I find your daughter?", L_Receive,
-        "Sorry, but I am too busy.", -;
-    close;
+        "Sorry, but I am too busy.", L_Close;
 
 L_Receive:
     set QUEST_Graveyard_Caretaker, 2;
@@ -62,6 +61,7 @@ L_Receive:
 
 L_Location:
     next;
+    goto L_Location_Real;
 
 L_Location_Real:
     mes "[Caretaker]";
@@ -73,17 +73,18 @@ L_Has_Letter:
     mes "\"Have you found my daughter?\"";
     next;
     menu
-        "Not yet.", -,
-        "I'll get there when I get there.", -,
+        "Not yet.", L_Close,
+        "I'll get there when I get there.", L_Close,
         "Where did you say I could find her?", L_Location_Real;
-    close;
 
 L_Delivered_Letter:
     mes "[Caretaker]";
     mes "\"Have you found my daughter?\"";
     next;
     menu
-        "Yes.", -;
+        "Yes.", L_Next;
+
+L_Next:
     mes "[Caretaker]";
     mes "\"Thank you for delivering my letter.\"";
     set QUEST_Graveyard_Caretaker, 4;
@@ -95,8 +96,7 @@ L_Give_New_Letter:
     next;
     menu
         "Sure.", L_Give_New_Letter_Real,
-        "I'm too busy right now.", -;
-    close;
+        "I'm too busy right now.", L_Close;
 
 L_Give_New_Letter_Real:
     set QUEST_Graveyard_Caretaker, 5;