2 files changed, 28 insertions, 9 deletions
diff --git a/world/map/npc/025-1/barrier.txt b/world/map/npc/025-1/barrier.txt
index 619ce0d7..a4a0565b 100644
--- a/world/map/npc/025-1/barrier.txt
+++ b/world/map/npc/025-1/barrier.txt
@@ -5,6 +5,7 @@
     if (Rossy_Quest > 14 || FLAGS & FLAG_ROSSI_COMPLETED) goto L_Warp;
     if (Rossy_Quest <= 13) goto L_Block;
     if (Rossy_Quest == 14) message strcharinfo(0), "You hear distant screams of fear.";
+    goto L_Warp;
 
 L_Warp:
     warp "025-3.gat", 112, 97;
diff --git a/world/map/npc/025-1/rossy.txt b/world/map/npc/025-1/rossy.txt
index af57e5b1..f0332f95 100644
--- a/world/map/npc/025-1/rossy.txt
+++ b/world/map/npc/025-1/rossy.txt
@@ -41,15 +41,19 @@
         close;
     next;
     menu
-        "Hey, hey... Why are you crying? Are you hurt?", -,
+        "Hey, hey... Why are you crying? Are you hurt?", L_Next,
         "Sorry kid, I don't have time to play with children.", L_No;
+
+L_Next:
     mes "[Young Girl]";
     mes "\"No. I'm crying because I lost all my fruits. My sister and I were collecting some near Dimond's Cove, but then I stumbled on a giant snail and it attacked us!";
     next;
     mes "But we were lucky, because the snail is really slow and we ran away from it. Julia ran to the left and I ran to the right. The snail got pretty confused, because we are identical twins. The problem is that I dropped the basket full of fruits on the ground and that evil snail ate them all! And now I can't find Julia to help me collect more fruits.\"";
     next;
     menu
-        "Did you say Julia? I talked to you mother. She is very worried about you.", -;
+        "Did you say Julia? I talked to you mother. She is very worried about you.", L_SheWorried;
+
+L_SheWorried:
     mes "[Rossy]";
     mes "\"Really? But she let us play in the woods. There is no reason to be worried. Unless...\"";
     next;
@@ -59,8 +63,10 @@
     mes "\"Could you do me a favor? Please, tell my mother we are alright. There is.. uh... there is no reason to worry about us.\"";
     next;
     menu
-        "Ok, if you say so.", -,
+        "Ok, if you say so.", L_SaySo,
         "Sorry, I have no time for this.", L_No;
+
+L_SaySo:
     mes "[Rossy]";
     mes "\"Thank you very much!\"";
     set Rossy_Quest, 2;
@@ -85,8 +91,10 @@ L_Check:
     next;
     menu
         "That is no problem for me. Just wait and I will come back with the cherries.", L_No,
-        "Hey, I have some cherries in my backpack!", -,
+        "Hey, I have some cherries in my backpack!", L_HaveSomeCherries,
         "You should get them yourself.", L_No;
+
+L_HaveSomeCherries:
     if(countitem("Cherry") < @Cherry_Amount)
         goto L_Get_Cherry;
     mes "[Rossy]";
@@ -118,7 +126,9 @@ L_Let:
 L_Let2:
     mes "The little girl grabs the piece of paper and reads it quickly. Her face turns pale.";
     menu
-        "What does it say?", -;
+        "What does it say?", L_PaperSays;
+
+L_PaperSays:
     mes "[Rossy]";
     mes "\"Oh no, I completely forgot! My magic school exam! I need to make a potion and give it to my teacher today! But I haven't found Julia yet and I don't even have any of the ingredients required. Could you get them for me, please?\"";
     next;
@@ -176,7 +186,9 @@ L_Donet:
         && countitem("RedRose") >= @RedRose_Amount)
             goto L_RG;
     menu
-        "David took your potion and he tested it in front of me. It worked perfectly!", -;
+        "David took your potion and he tested it in front of me. It worked perfectly!", L_DavidPotion;
+
+L_DavidPotion:
     mes "[Rossy]";
     mes "\"Yay! Phew... That was close, I almost forgot about my exam. Please, tell my mother about it. I am sure she will be proud of me.\"";
 close;
@@ -186,14 +198,18 @@ L_RG:
         goto L_No;
     delitem "RedRose", @RedRose_Amount;
     menu
-        "Your mother was so happy that she asked me to bring you these flowers.", -;
+        "Your mother was so happy that she asked me to bring you these flowers.", L_MotherFlowers;
+
+L_MotherFlowers:
     mes "[Rossy]";
     mes "\"How nice!\"";
     next;
     mes "Rossy takes the flowers from your hands and suddenly throws them on the ground. She begins sneezing.";
     set Rossy_Quest, 11;
     menu
-        "I presume you don't like roses, right?", -;
+        "I presume you don't like roses, right?", L_LikeRoses;
+
+L_LikeRoses:
     mes "[Rossy]";
     mes "\"I am allergic to roses, my mother should already know that!\"";
 close;
@@ -226,7 +242,9 @@ L_Best:
     mes "\"Thank you "+ strcharinfo(0) +", you helped me so much!\"";
     next;
     menu
-        "Did you find your sister? I am starting to get worried too.", -;
+        "Did you find your sister? I am starting to get worried too.", L_FindMySister;
+
+L_FindMySister:
     mes "\"I think I have an idea where she might be. Come back in a few minutes, I will tell you if she is ok.\"";
     set Rossy_Quest, 14;
 close;