Clean up main scripts

1 files changed, 7 insertions, 2 deletions

diff --git a/world/map/npc/031-4/cindyCave.txt b/world/map/npc/031-4/cindyCave.txt
index 0be990c8..d7d16155 100644
--- a/world/map/npc/031-4/cindyCave.txt
+++ b/world/map/npc/031-4/cindyCave.txt
@@ -32,7 +32,9 @@ L_Please_Help:
     mes "There is a little girl in a cage. As you come near, she starts to shiver and back off from you as far as she can in that small cage.";
     next;
     menu
-        "Hello Cindy, I'm here to save you.", - ;
+        "Hello Cindy, I'm here to save you.", L_Next;
+
+L_Next:
     mes "Cindy doesn't look so scared anymore.";
     next;
     mes "[Cindy]";
@@ -44,7 +46,6 @@ L_Please_Help:
     menu
         "Try to open the cage", L_Try_Cage,
         "Leave", L_Close;
-    goto L_Close;
 
 L_Try_Cage:
     if (BaseLevel < @minlevel)
@@ -98,6 +99,7 @@ L_Wizard_Hat:
     getitem @wizardhats[@reward], 1;
     set @rescue_Cindy, 3;
     callsub S_Update_Mask;
+    goto L_Visit;
 
 L_Visit:
     mes "\"Thank you so much; please come to my home. It's the house at the beach.\"";
@@ -139,6 +141,7 @@ OnTimer5000:
     setnpctimer 0;
     if ($@FIGHT_YETI_STATUS != 0)
         goto L_CaveLogic;
+    goto L_Return_1;
 
 L_Return_1:
     set $@FIGHT_YETI_PLAYER_COUNT, 0;
@@ -223,6 +226,8 @@ OnReward:
     message strcharinfo(0), "Cindy looks relieved and as if she wants to talk with you.";
     set BOSS_POINTS, BOSS_POINTS + 70;
     message strcharinfo(0), "You gain 70 Boss Points giving you a total of " + BOSS_POINTS + ".";
+    goto L_End;
+
 L_End:
     set @bonus, 0;
     set @Q_Nivalis_state_MASK, 0;