From c0ba38cd4b68491e28e467889804ebc09c9c002e Mon Sep 17 00:00:00 2001
From: Ben Longbons <b.r.longbons@gmail.com>
Date: Wed, 2 Apr 2014 11:06:32 -0700
Subject: Clean up main scripts

---
 world/map/npc/001-1/rewards_master.txt | 31 ++++++++++++++++++-------------
 1 file changed, 18 insertions(+), 13 deletions(-)

(limited to 'world/map/npc/001-1/rewards_master.txt')

diff --git a/world/map/npc/001-1/rewards_master.txt b/world/map/npc/001-1/rewards_master.txt
index 7ebc12f5..e581b907 100644
--- a/world/map/npc/001-1/rewards_master.txt
+++ b/world/map/npc/001-1/rewards_master.txt
@@ -17,19 +17,20 @@
     callsub SUB_prep_menu;
 
     menu
-        @Menu$[0], -,
-        @Menu$[1], -,
-        @Menu$[2], -,
-        @Menu$[3], -,
-        @Menu$[4], -,
-        @Menu$[5], -,
-        @Menu$[6], -,
-        @Menu$[7], -,
-        @Menu$[8], -,
-        @Menu$[9], -,
-        @Menu$[10], -,
-        @Menu$[11], -;
-
+        @Menu$[0], L_MenuItems,
+        @Menu$[1], L_MenuItems,
+        @Menu$[2], L_MenuItems,
+        @Menu$[3], L_MenuItems,
+        @Menu$[4], L_MenuItems,
+        @Menu$[5], L_MenuItems,
+        @Menu$[6], L_MenuItems,
+        @Menu$[7], L_MenuItems,
+        @Menu$[8], L_MenuItems,
+        @Menu$[9], L_MenuItems,
+        @Menu$[10], L_MenuItems,
+        @Menu$[11], L_MenuItems;
+
+L_MenuItems:
     // this is for the last entry "No thanks":
     if (@menu > @i) goto L_Close;
     // this is for the "Give all" entry:
@@ -37,6 +38,7 @@
 
     set @req, @menu;
     set @rec, 0;
+    goto L_Item_Loop;
 
 L_Item_Loop:
     if (@rec == @req || Mobpt < tvis) goto L_Item_Done;
@@ -66,6 +68,7 @@ L_Give_all:
     // since the server complains about more than 250 (70 according to Jaxad0127)
     // gotos without interrupting next statement.
     set @gotocounter, 50;
+    goto L_Give_all_loop;
 
 L_Give_all_loop:
     set @gotocounter, @gotocounter - 1;
@@ -100,6 +103,7 @@ L_Close:
 SUB_prep_menu:
     set @pts, Mobpt;
     set @dif, tvis;
+    goto L_Menu_Loop;
 
 L_Menu_Loop:
     if (@pts < @dif || @i == 10) goto L_Menu_Check;
@@ -117,6 +121,7 @@ L_Menu_Check:
     if (@i != 10) goto L_Menu_Done;
         set @Menu$[@i], "Please give me as many as I deserve!";
         set @i, @i + 1;
+    goto L_Menu_Done;
 
 L_Menu_Done:
     set @Menu$[@i], "No thanks";
-- 
cgit v1.2.3-70-g09d2