4 files changed, 25 insertions, 10 deletions
diff --git a/world/map/npc/051-1/desert.txt b/world/map/npc/051-1/desert.txt
index b79fe0f5..960eb401 100644
--- a/world/map/npc/051-1/desert.txt
+++ b/world/map/npc/051-1/desert.txt
@@ -33,8 +33,7 @@
     mes "Jump in the waterfall?";
     menu
         "Yes", L_Warp,
-        "No", -;
-    close;
+        "No", L_Close;
 
 OnTimer1000:
     npctalk "Youuuuuuu... Bring me souls... " + $@illia_num_sealed_souls + " fresh souls... Nooooow. And you shall paaass.";
@@ -85,7 +84,7 @@ L_GiveTask:
     areamonster "051-1.gat", 138, 34, 145, 41, "", 1096, 5, "IlliaDMobs051-1::On1096";
     // Start timed messages
     initnpctimer;
-    close;
+    goto L_Close;
 
 L_GiveSouls:
     if (strcharinfo(0) != $@ILLIA_HERO$)
@@ -94,13 +93,12 @@ L_GiveSouls:
     mes "\"Give me the souuuuuuls... Noooooooow!!\"";
     menu
         "Please, have a look at these.", L_CheckSouls,
-        "Sorry, I don't have any.", -;
-    close;
+        "Sorry, I don't have any.", L_Close;
 
 L_GiveSoulsToHero:
     mes "[Cursed Waterfall]";
     mes "\"Who are you?.... I want the souuuuuuls from " + $@ILLIA_HERO$ + "!\"";
-    close;
+    goto L_Close;
 
 L_CheckSouls:
     if (countitem ("SealedSoul") < $@illia_num_sealed_souls)
@@ -127,17 +125,19 @@ L_CheckSouls:
 
     // Display an effect to show the waterfall opens itself / kills remaining monsters
     misceffect FX_MEDIUM_BLINDINGLIGHT;
-    close;
+    goto L_Close;
 
 L_NotEnough:
     mes "[Cursed Waterfall]";
     mes "\"Moooooooooore... Give me more...\"";
-    close;
+    goto L_Close;
 
 L_Warp:
     warp "052-1.gat", 23, 52;
     // Count the player who reached the island.
     set $@illia_players_in_luvia_territory, $@illia_players_in_luvia_territory + 1;
-    close;
+    goto L_Close;
 
+L_Close:
+    close;
 }
diff --git a/world/map/npc/051-1/desertmonsters.txt b/world/map/npc/051-1/desertmonsters.txt
index f46edd6f..9011e1b3 100644
--- a/world/map/npc/051-1/desertmonsters.txt
+++ b/world/map/npc/051-1/desertmonsters.txt
@@ -3,6 +3,8 @@
 // The soul snakes release a Sealed Soul at random, once the soul collecting is started
 051-1.gat,0,0,0|script|IlliaDMobs051-1|-1,
 {
+    end;
+
 On1096:
     if (rand(4) == 0 && $@illia_progress == 3 && $@illia_level_3_progress == 1)
         getitem "SealedSoul", 1;
@@ -27,6 +29,8 @@ On1096:
 
 051-1.gat,142,38,0|script|#SoulEaters0|32767,
 {
+    end;
+
 OnSpawn:
     set $@SoulEaters0_count, 5;
     areamonster "051-1.gat", 139, 34, 145, 41, "", 1097, $@SoulEaters0_count, "#SoulEaters0::OnSoulEaterDeath";
@@ -56,6 +60,8 @@ OnSoulEaterDeath:
 
 051-1.gat,134,16,0|script|#SoulEaters1|32767,
 {
+    end;
+
 OnSpawn:
     set $@SoulEaters1_count, 7;
     areamonster "051-1.gat", 125, 14, 143, 18, "", 1097, $@SoulEaters1_count, "#SoulEaters1::OnSoulEaterDeath";
@@ -85,6 +91,8 @@ OnSoulEaterDeath:
 
 051-1.gat,137,55,0|script|#SoulEaters2|32767,
 {
+    end;
+
 OnSpawn:
     set $@SoulEaters2_count, 4;
     areamonster "051-1.gat", 134, 54, 139, 58, "", 1097, $@SoulEaters2_count, "#SoulEaters2::OnSoulEaterDeath";
@@ -114,6 +122,8 @@ OnSoulEaterDeath:
 
 051-1.gat,155,35,0|script|#SoulEaters3|32767,
 {
+    end;
+
 OnSpawn:
     set $@SoulEaters3_count, 4;
     areamonster "051-1.gat", 151, 29, 160, 45, "", 1097, $@SoulEaters3_count, "#SoulEaters3::OnSoulEaterDeath";
@@ -143,6 +153,8 @@ OnSoulEaterDeath:
 
 051-1.gat,120,38,0|script|#SoulEaters4|32767,
 {
+    end;
+
 OnSpawn:
     set $@SoulEaters4_count, 4;
     areamonster "051-1.gat", 116, 29, 127, 50, "", 1097, $@SoulEaters4_count, "#SoulEaters4::OnSoulEaterDeath";
diff --git a/world/map/npc/051-1/forest.txt b/world/map/npc/051-1/forest.txt
index 8b2f1ea6..9a1b7223 100644
--- a/world/map/npc/051-1/forest.txt
+++ b/world/map/npc/051-1/forest.txt
@@ -39,7 +39,8 @@ L_GiveTask:
     mes "You are smart enough to notice that there seems to be a missing rock that could activate a mechanism.";
     next;
     menu
-        "This rock must not be far... Let's look around.", -;
+        "This rock must not be far... Let's look around.", L_Foo;
+L_Foo:
     set $@illia_level_1_progress, 1;
     set $@illia_level_1_num_deaths, 0;
     close;
diff --git a/world/map/npc/051-1/forestmonsters.txt b/world/map/npc/051-1/forestmonsters.txt
index 2ede6574..3ad5ea4e 100644
--- a/world/map/npc/051-1/forestmonsters.txt
+++ b/world/map/npc/051-1/forestmonsters.txt
@@ -2,6 +2,8 @@
 
 051-1.gat,0,0,0|script|IlliaFMobs051-1|-1,
 {
+    end;
+
 On1005:
     if ($@illia_level_1_progress == 1)
         goto L_RockFinding;