Clean up main scripts

1 files changed, 24 insertions, 16 deletions

diff --git a/world/map/npc/016-1/gwendolyn.txt b/world/map/npc/016-1/gwendolyn.txt
index 30521be5..2879db9a 100644
--- a/world/map/npc/016-1/gwendolyn.txt
+++ b/world/map/npc/016-1/gwendolyn.txt
@@ -64,7 +64,7 @@
     mes "\"Are you interested in becoming a student of Archery?\"";
     next;
     menu
-        "I want to become an archer!",-,
+        "I want to become an archer!",L_fee,
         "I'm not interested right now.",L_no_student;
 
 L_fee:
@@ -72,9 +72,10 @@ L_fee:
     mes "\"Wonderful! The school's fee is " + @SCHOOLFEE + ".\"";
     next;
     menu
-        "That's a lot, but I think it will be worth it.",-,
+        "That's a lot, but I think it will be worth it.",L_Next,
         "I'm not sure I want to spend that much.",L_no_student;
 
+L_Next:
     if (Zeny < @SCHOOLFEE)
         goto L_no_money;
 
@@ -89,7 +90,7 @@ L_fee:
         goto L_Close;
     next;
     menu
-        "I already have a Forest Bow.",-;
+        "I already have a Forest Bow.",L_state2;
 
 L_state2:
     mes "[Gwendolyn Bowmaker]";
@@ -106,6 +107,7 @@ L_state2:
     mes "[Gwendolyn Bowmaker]";
     mes "\"Very well, this looks fine. It is time for your first lesson. \"";
     next;
+    goto L_lesson;
 
 L_lesson:
     mes "[Gwendolyn Bowmaker]";
@@ -119,6 +121,7 @@ L_lesson:
     next;
     mes "\"Also worth mentioning is how to improve your ability to shoot fast. You need to be agile to grab a new arrow from your quiver and aim for the next shot before your enemy has recovered from your last.\"";
     next;
+    goto L_state3;
 
 L_state3:
     mes "[Gwendolyn Bowmaker]";
@@ -127,8 +130,9 @@ L_state3:
     menu
         "Can you please repeat your lesson?",L_lesson,
         "I will go and hunt some snakes.",L_Close,
-        "I have what you want.",-;
+        "I have what you want.",L_Next1;
 
+L_Next1:
     if (countitem("CaveSnakeEgg") < @CAVE_EGGS_AMOUNT
         ||countitem("SnakeEgg") < @SNAKE_EGGS_AMOUNT
         ||countitem("MountainSnakeEgg") < @MOUNTAIN_EGGS_AMOUNT
@@ -148,6 +152,7 @@ L_state3:
     mes "[Gwendolyn Bowmaker]";
     mes "\"Very well. That will make a great meal.\"";
     next;
+    goto L_state4;
 
 L_state4:
     if (BaseLevel < @BASELEVEL_GAME)
@@ -162,6 +167,7 @@ L_state4:
     mes "[Gwendolyn Bowmaker]";
     mes "\"Ok. You have made great progress. I think you are ready for further tasks.\"";
     next;
+    goto L_game_explain;
 
 L_game_explain:
     mes "[Gwendolyn Bowmaker]";
@@ -171,6 +177,7 @@ L_game_explain:
     next;
     mes "\"Ok, you can see that target over there? I will tell you how strong the wind blows and from which direction. Then you will try to hit the target by moving right or left and decide how powerful you want to shoot.\"";
     next;
+    goto L_state5;
 
 L_state5:
     // needed for the minigame:
@@ -191,7 +198,7 @@ L_state5:
     next;
     menu
         "Can you please explain the task again?",L_game_explain,
-        "I'm ready, let's start!",-,
+        "I'm ready, let's start!",L_game,
         "I'm sorry, I will come back later.",L_Close;
 
 L_game:
@@ -347,16 +354,17 @@ L_choose_shotpower:
     mes "How powerfully do you want to shoot?";
     next;
     menu
-        "very weak shot",-,
-        "rather weak shot",-,
-        "weak shot",-,
-        "somewhat weak shot",-,
-        "medium shot",-,
-        "somewhat powerful shot",-,
-        "powerful shot",-,
-        "rather powerful shot",-,
-        "very powerful shot",-;
-
+        "very weak shot",L_MenuItems,
+        "rather weak shot",L_MenuItems,
+        "weak shot",L_MenuItems,
+        "somewhat weak shot",L_MenuItems,
+        "medium shot",L_MenuItems,
+        "somewhat powerful shot",L_MenuItems,
+        "powerful shot",L_MenuItems,
+        "rather powerful shot",L_MenuItems,
+        "very powerful shot",L_MenuItems;
+
+L_MenuItems:
     // we have 9 menu entries, so scale @menu, which is in range 1-9, to a scale in -4 to +4
     set @sp, @menu - 5;
     // calculate where you hit. You range is in [-8, 8] in X and Y as well
@@ -461,7 +469,7 @@ L_state1:
     next;
     menu
         "I want to become an archer!",L_fee,
-        "I am not interested.",-;
+        "I am not interested.",L_no_student;
 
 L_no_student:
     mes "\"That's a pity. Well, if you change your mind, come back any time.\"";