1 files changed, 6 insertions, 10 deletions

diff --git a/world/map/npc/033-1/yerrnk.txt b/world/map/npc/033-1/yerrnk.txt
index c2ae904b..e04a8610 100644
--- a/world/map/npc/033-1/yerrnk.txt
+++ b/world/map/npc/033-1/yerrnk.txt
@@ -52,6 +52,7 @@ L_Sorrow:
     mes "\"I noticed that you're getting along with Kimarr and Birrod very well. That's good.\"";
     mes "He smiles, but then an expression of worry returns to his face.";
     next;
+    goto L_Mission;
 
 L_Mission:
     mes "[Yerrnk]";
@@ -85,29 +86,26 @@ L_Birrod:
         goto L_Not_Ready;
     mes "\"Please talk to Birrod to receive the initiation rite to become a warrior of the Mangarr.\"";
     menu
-        "Alright.",-,
+        "Alright.",L_Close,
         "Can you tell me again what you are here for?",L_Mission;
-    goto L_Close;
 
 L_Not_Ready:
     mes "[Yerrnk]";
     mes "\"But you're not yet ready to become a fully accepted warrior of our tribe.";
     mes "You should travel the world to gain the ability to focus on your inner strength.\"";
     menu
-        "Alright.",-,
+        "Alright.",L_Close,
         "What are you doing down here?",L_Mission;
-    goto L_Close;
 
 L_Warrior:
     mes "[Yerrnk]";
     mes "\"" + strcharinfo(0) + ", welcome back!";
     mes "Do you have any question?\"";
     menu
-        "Everything's all right, thanks.",-,
+        "Everything's all right, thanks.",L_Close,
         "What are you doing down here?",L_Mission,
         "Can you explain the Raging ability to me?",L_Skill,
         "Do you have a task for me?",L_Task;
-    goto L_Close;
 
 L_Skill:
     mes "[Yerrnk]";
@@ -148,10 +146,9 @@ L_Hunt_Yeti:
     mes "\"That Yeti is still roaming in the forest west of here.";
     mes "To find the house it's prowling around, enter the forest and then go first south and then west.\"";
     menu
-        "I'm on it.",-,
+        "I'm on it.",L_Close,
         "What are you doing down here?",L_Mission,
         "Can you explain the Raging ability to me?",L_Skill;
-    goto L_Close;
 
 L_Yeti_Success:
     mes "[Yerrnk]";
@@ -169,8 +166,7 @@ L_Done:
     menu
         "What's the reason you came here?",L_Mission,
         "Can you explain the raging ability to me?",L_Skill,
-        "(Leave)",-;
-    goto L_Close;
+        "(Leave)",L_Close;
 
 L_Close:
     set @state, 0;