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/008-1/hinnak.txt | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

(limited to 'world/map/npc/008-1/hinnak.txt')

diff --git a/world/map/npc/008-1/hinnak.txt b/world/map/npc/008-1/hinnak.txt
index 8deb8263..3d92de07 100644
--- a/world/map/npc/008-1/hinnak.txt
+++ b/world/map/npc/008-1/hinnak.txt
@@ -12,6 +12,7 @@
     set @inspector, ((QUEST_Hurnscald & NIBBLE_3_MASK) >> NIBBLE_3_SHIFT);
 
     if (@inspector == 10) goto L_NohMask;
+    goto L_No_NohMask;
 
 L_No_NohMask:
     set @state, ((QUEST_Hurnscald & NIBBLE_1_MASK) >> NIBBLE_1_SHIFT);
@@ -71,6 +72,7 @@ L_Exchange:
         goto L_Exchange_Start;
     mes "The farmer glares at your hat.";
     next;
+    goto L_Exchange_Start;
 
 L_Exchange_Start:
     mes "[Farmer Hinnak]";
@@ -116,22 +118,29 @@ L_ThanksHat:
     mes "[Farmer Hinnak]";
     mes "\"That better be a trophy on your head.\"";
     menu
-        "It is.", -;
+        "It is.", L_Next;
+
+L_Next:
     mes "[Farmer Hinnak]";
     mes "\"Good then. Thanks for your help with the pinkies.\"";
+    goto L_ThanksMenu;
 
 L_ThanksMenu:
     menu
-        "Sure, any time!", -,
-        "Anything else you want me to do?", -,
+        "Sure, any time!", L_Next1,
+        "Anything else you want me to do?", L_Next1,
         "You're welcome.  Bye!", L_Bye;
+
+L_Next1:
     mes "[Farmer Hinnak]";
     mes "\"Actually, it's been a long day.  If it's no trouble, could you get me a beer?\"";
     next;
     menu
         "Here you are.", L_GiveBeer,
         "Sure, I'll go get one.  Bye!", L_Bye,
-        "You shouldn't drink while working!", -;
+        "You shouldn't drink while working!", L_Next2;
+
+L_Next2:
     mes "[Farmer Hinnak]";
     mes "\"Well, I'm done for the day, and I'm quite old enough to decide when I can have a beer, thank you!\"";
     next;
@@ -195,8 +204,7 @@ L_GiveBeer:
         "Hahaha!", L_Sagatha_hahaha,
         "Whoah, scary...", L_Sagatha_scary,
         "What was that gobbledygook word?", L_Sagatha_word,
-        "I better go now.", -;
-    goto L_Bye;
+        "I better go now.", L_Bye;
 
 L_Sagatha_hahaha:
     mes "[Farmer Hinnak]";
-- 
cgit v1.2.3-70-g09d2