Clean up main scripts

1 files changed, 16 insertions, 7 deletions

diff --git a/world/map/npc/018-2/miners.txt b/world/map/npc/018-2/miners.txt
index d4397492..59e97297 100644
--- a/world/map/npc/018-2/miners.txt
+++ b/world/map/npc/018-2/miners.txt
@@ -53,6 +53,7 @@ L_Check_Gems:
     next;
     setarray @menuitems$, "", "", "", "", "", "", "";
     set @c, 0;
+    goto L_Check_Diamond;
 
 L_Check_Diamond:
     if (countitem("Diamond") < 1)
@@ -60,6 +61,7 @@ L_Check_Diamond:
     set @menuitems$[@c], "A diamond.";
     set @menuid[@c], 0;
     set @c, @c + 1;
+    goto L_Check_Ruby;
 
 L_Check_Ruby:
     if (countitem("Ruby") < 1)
@@ -67,6 +69,7 @@ L_Check_Ruby:
     set @menuitems$[@c], "A ruby.";
     set @menuid[@c], 1;
     set @c, @c + 1;
+    goto L_Check_Emerald;
 
 L_Check_Emerald:
     if (countitem("Emerald") < 1)
@@ -74,6 +77,7 @@ L_Check_Emerald:
     set @menuitems$[@c], "An emerald.";
     set @menuid[@c], 2;
     set @c, @c + 1;
+    goto L_Check_Sapphire;
 
 L_Check_Sapphire:
     if (countitem("Sapphire") < 1)
@@ -81,6 +85,7 @@ L_Check_Sapphire:
     set @menuitems$[@c], "A sapphire.";
     set @menuid[@c], 3;
     set @c, @c + 1;
+    goto L_Check_Topaz;
 
 L_Check_Topaz:
     if (countitem("Topaz") < 1)
@@ -88,6 +93,7 @@ L_Check_Topaz:
     set @menuitems$[@c], "A topaz.";
     set @menuid[@c], 4;
     set @c, @c + 1;
+    goto L_Check_Amethyst;
 
 L_Check_Amethyst:
     if (countitem("Amethyst") < 1)
@@ -95,19 +101,22 @@ L_Check_Amethyst:
     set @menuitems$[@c], "An amethyst.";
     set @menuid[@c], 5;
     set @c, @c + 1;
+    goto L_Choose_Gem;
 
 L_Choose_Gem:
     set @menuitems$[@c], "None right now, thanks.";
     set @menuid[@c], 6;
     set @c, @c + 1;
     menu
-        @menuitems$[0], -,
-        @menuitems$[1], -,
-        @menuitems$[2], -,
-        @menuitems$[3], -,
-        @menuitems$[4], -,
-        @menuitems$[5], -,
-        @menuitems$[6], -;
+        @menuitems$[0], L_MenuItems,
+        @menuitems$[1], L_MenuItems,
+        @menuitems$[2], L_MenuItems,
+        @menuitems$[3], L_MenuItems,
+        @menuitems$[4], L_MenuItems,
+        @menuitems$[5], L_MenuItems,
+        @menuitems$[6], L_MenuItems;
+
+L_MenuItems:
     set @menu, @menu - 1;
     if (@menu >= @c)
         goto L_Close;