9 files changed, 30 insertions, 14 deletions
diff --git a/world/map/npc/030-2/avalia.txt b/world/map/npc/030-2/avalia.txt
index 038b0dd2..970197a0 100644
--- a/world/map/npc/030-2/avalia.txt
+++ b/world/map/npc/030-2/avalia.txt
@@ -32,7 +32,9 @@ L_ListReturn:
     mes "[Avalia]";
     mes "\"This had better be important, I have got enough to worry about.\"";
     menu
-        "Sorry for interrupting, but I have been sent up here with the List", -;
+        "Sorry for interrupting, but I have been sent up here with the List", L_Next;
+
+L_Next:
     mes "She stares blankly at you for a bit...";
     next;
     mes "\"YAHOO!!\"";
diff --git a/world/map/npc/030-2/basic_npcs.txt b/world/map/npc/030-2/basic_npcs.txt
index f3a25f6b..b8573912 100644
--- a/world/map/npc/030-2/basic_npcs.txt
+++ b/world/map/npc/030-2/basic_npcs.txt
@@ -42,7 +42,9 @@
     menu
         "Yes, it's really interesting.", L_Interesting,
         "It's ok.", L_Rage,
-        "I'm confused, it's much bigger than from the outside.", -;
+        "I'm confused, it's much bigger than from the outside.", L_Next;
+
+L_Next:
     mes "[Akseli]";
     mes "\"Ah, yes, that's a magic technique almost all of the Sages use. The house is located in a shifted dimension.\"";
     goto L_Close;
diff --git a/world/map/npc/030-2/chief_helper.txt b/world/map/npc/030-2/chief_helper.txt
index 3cecfd6a..3c63ac14 100644
--- a/world/map/npc/030-2/chief_helper.txt
+++ b/world/map/npc/030-2/chief_helper.txt
@@ -31,7 +31,9 @@ L_Helping:
     next;
     mes "\"For this reason I have to ask you to leave and come back some at some more convenient time.\"";
     menu
-        "Availa Sent me. She said you should have me help out.",-;
+        "Availa Sent me. She said you should have me help out.",L_Next;
+
+L_Next:
     mes "Warrick sighs.";
     next;
     mes "[Chief Warrick]";
@@ -43,13 +45,17 @@ L_Helping:
     mes "However, as you can see we have to deal with some serious problems here.";
     mes "So I'd appreciate if you could just leave and not interfere.\"";
     menu
-        "But I can help!",-;
+        "But I can help!",L_Continue;
+
+L_Continue:
     mes "He hesitates.";
     next;
     mes "[Chief Warrick]";
     mes "\"I'm not sure...\"";
     menu
-        "Really, I can do a lot of things.",-;
+        "Really, I can do a lot of things.",L_Insist;
+
+L_Insist:
     mes "[Chief Warrick]";
     mes "\"Well, alright. I suppose it can't get worse than it already is.";
     mes "Go to the helpers all over the house and ask them what is needed.";
diff --git a/world/map/npc/030-2/eljas.txt b/world/map/npc/030-2/eljas.txt
index beaefaad..288dbb4e 100644
--- a/world/map/npc/030-2/eljas.txt
+++ b/world/map/npc/030-2/eljas.txt
@@ -5,6 +5,7 @@
 {
     callfunc "XmasStates";
     callfunc "ThrowOutTheBum";
+    goto L_Start;
 
 L_Start:
     if($@xmas_time)
@@ -46,7 +47,6 @@ L_HaveList1:
         "Christmas?", L_Christmas,
         "I am interested in magical research.", L_Research,
         "Nothing, I have to go.", L_Close;
-    goto L_Close;
 
 L_HaveList2:
     mes "Mmmmh he probably won't notice what lists you will bring him (Did you ever notice that he does not move at all?)";
@@ -62,7 +62,6 @@ L_HaveList2:
         "Christmas?", L_Christmas,
         "I am interested in magical research.", L_Research,
         "Nothing, I have to go.", L_Close;
-    goto L_Close;
 
 L_NeedList1:
     mes "[Eljas]";
@@ -71,7 +70,9 @@ L_NeedList1:
     mes "\"So what brings you here my dear?\"";
     menu
         "Mmh? Nothing, I have to go.", L_Close,
-        "I heard you need help with some Wish lists?", -;
+        "I heard you need help with some Wish lists?", L_Next;
+
+L_Next:
     mes "\"True...\"";
     next;
     mes "\"It appears we are missing some of the wish list from the children from all over the Mana World.\"";
diff --git a/world/map/npc/030-2/present_helper.txt b/world/map/npc/030-2/present_helper.txt
index 9637b778..ca4246e2 100644
--- a/world/map/npc/030-2/present_helper.txt
+++ b/world/map/npc/030-2/present_helper.txt
@@ -29,18 +29,18 @@ L_XmasMain:
 L_Helping:
     mes "\"Here we take back any presents stolen from us by those nasty creatures.\"";
     next;
+    goto L_Main;
 
 L_Main:
     mes "\"Did you find any presents you would like to return?\"";
     next;
     menu
-        "No, I just wanted to say hello.",-,
+        "No, I just wanted to say hello.",L_Close,
         $@xmas_present_amount + " Purple present boxes.",L_Purple,
         $@xmas_present_amount + " Blue present boxes.",L_Blue,
         $@xmas_present_amount + " Green present boxes.",L_Green,
         $@xmas_present_amount + " Yellow present boxes.",L_Yellow,
         $@xmas_present_amount + " White present boxes.",L_White;
-    goto L_Close;
 
 L_Purple:
     set @karma_bonus, $@xmas_karma_bonus;
diff --git a/world/map/npc/030-2/roasted_acrons_helper.txt b/world/map/npc/030-2/roasted_acrons_helper.txt
index 900d1bd1..8c7c6e41 100644
--- a/world/map/npc/030-2/roasted_acrons_helper.txt
+++ b/world/map/npc/030-2/roasted_acrons_helper.txt
@@ -20,9 +20,10 @@ L_XmasMain:
     next;
     mes "\"Ah, I remember when I was a child we used to roast acorns at the fireplace. We dunked them into Iron Potion and then put them over the fire for a while. That gave a tasty icing.\"";
     menu
-        "Let's roast some.", -,
+        "Let's roast some.", L_LetsRoast,
         "Children's stuff...", L_Close;
 
+L_LetsRoast:
     mes "[Verneri]";
     mes "\"Well, if you get some Acorns and Iron Potions, we can do that.\"";
     mes "\"With one Iron Potion we can ice about " + $@xmas_acorn_amount + " Acorns.\"";
diff --git a/world/map/npc/030-2/shipping_helper.txt b/world/map/npc/030-2/shipping_helper.txt
index 573ed2fc..29a0ae26 100644
--- a/world/map/npc/030-2/shipping_helper.txt
+++ b/world/map/npc/030-2/shipping_helper.txt
@@ -48,18 +48,18 @@ L_Helping:
     mes "\"I am " + $@npc_name$ + ". We are in charge of getting all the presents together, but we messed up and now all our supplies are ruined. Can you help us out?\"";
     mes "\"We need wrapping paper and empty boxes! We can provide the gifts!\"";
     next;
+    goto L_Main;
 
 L_Main:
     mes "\"Do you have any supplies we can use?\"";
     next;
     menu
-        "What? err... I just wanted to say hello.",-,
+        "What? err... I just wanted to say hello.",L_Close,
         "Purple Wrapping Paper and an empty box.",L_Purple,
         "Blue Wrapping Paper and an empty box.",L_Blue,
         "Green Wrapping Paper and an empty box.",L_Green,
         "Yellow Wrapping Paper and an empty box.",L_Yellow,
         "White Wrapping Paper and an empty box.",L_White;
-    goto L_Close;
 
 L_Purple:
     set @wrap$, "PurpleWrap";
diff --git a/world/map/npc/030-2/storage_helper.txt b/world/map/npc/030-2/storage_helper.txt
index 37f7ee2d..ff6fa242 100644
--- a/world/map/npc/030-2/storage_helper.txt
+++ b/world/map/npc/030-2/storage_helper.txt
@@ -27,7 +27,9 @@ L_Helping:
     mes "\"Oh, hello. Visitors usually don't come down here in the basement. Here we store several things, materials for the presents, the finished presents, supplies.\"";
     menu
         "Nice. I have to go.", L_Close,
-        "Do you need help with anything?", -;
+        "Do you need help with anything?", L_Next;
+
+L_Next:
     mes "[Vellamo]";
     mes "\"Oh? You want to help us? Actually, there is one thing you could do. Did you see those weird slimes out there on the snow fields? Argh, I hate those creatures, last year they invaded the entire basement...\"";
     next;
diff --git a/world/map/npc/030-2/wrapping_paper_helper.txt b/world/map/npc/030-2/wrapping_paper_helper.txt
index 48e23f45..dcd5a36e 100644
--- a/world/map/npc/030-2/wrapping_paper_helper.txt
+++ b/world/map/npc/030-2/wrapping_paper_helper.txt
@@ -32,6 +32,8 @@ L_Helping:
     mes "\"So, eh, I can only give you some of the remaining wrapping paper if you bring me the needed material to make new wrapping paper.";
     mes "For making one roll of wrapping paper, I need " + $@xmas_reed_amount + " Reed Bundles, " + $@xmas_water_amount + " Bottle of Water and some dye to make it colored.\"";
     next;
+    goto L_Again;
+
 L_Again:
     mes "\"Let's see... These are the regulations for wrapping paper colors and designs for this year. Tell me which you want.\"";
     mes "He shows you an official looking piece of paper.";