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/030-4/mana_battery.txt | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'world/map/npc/030-4')

diff --git a/world/map/npc/030-4/mana_battery.txt b/world/map/npc/030-4/mana_battery.txt
index a86dd527..6f59d10e 100644
--- a/world/map/npc/030-4/mana_battery.txt
+++ b/world/map/npc/030-4/mana_battery.txt
@@ -51,17 +51,21 @@ L_BattleBad:
     mes "\"So this is where this whole shallow charade will end...\"";
     mes "\"Good. Are you ready to get this over with?\"";
     menu
-        "Huh? Sure, why not.", -,
+        "Huh? Sure, why not.", L_KeepGoing,
         "Wait a sec.", L_Close,
         "Well... since you ask... I prefer to leave now, this is way to dangerous. I have responsibities.", L_Coward;
+
+L_KeepGoing:
     mes "[Orums Homunculus]";
     mes "\"Okay now listen closely, at least for once.\"";
     mes "\"Put the mana battery into that vessel in front of you.\"";
     next;
     menu
-        "Ok.", -,
+        "Ok.", L_YeahOk,
         "No way, I prefer to leave. Now!", L_Coward,
         "Give me a second, I need to consider my options.", L_Close;
+
+L_YeahOk:
     mes "You carefully install the Mana Battery as good as you can manage.";
     mes "As you bend over, you notice a strong sulphur odour coming from the crate";
     next;
@@ -79,14 +83,12 @@ L_BattleGood:
         "No WAY! I am not going to put my life in danger", L_Close,
         "Ok that does it, I am going to leave! I cannot be responsible for blowing up the entire mana world.", L_Coward,
         "I studied magic and this looks all wrong. (Beware! that's dangerous)", L_StartGoodHard;
-    goto L_Close;
 
 L_StartGood:
     if ($@XmasBattleStatus)
         goto L_BattleInProgress;
     set @xmas_battle_status, 1;
     goto L_Start;
-    goto L_Close;
 
 L_StartGoodHard:
     if ($@XmasBattleStatus)
@@ -153,8 +155,7 @@ L_Helper:
     menu
         "No I prefer to leave now, get me out of here.", L_Quit,
         "Wait let me check if i can fix this ...(Beware!)", L_Repeat,
-        "Why would I do that? Aaaah... Nevermind.", -;
-    goto L_Close;
+        "Why would I do that? Aaaah... Nevermind.", L_Close;
 
 L_Repeat:
     //Player wants to try again on hard mode again
@@ -173,8 +174,7 @@ L_CoolDown:
     mes "The AniManOMat is too hot to handle right now, you should wait a bit to try a new battery.";
     menu
         "No I prefer to leave now, get me out of here.", L_Quit,
-        "Ughhh, but I'm certain this time the battery will work!", -;
-    goto L_Close;
+        "Ughhh, but I'm certain this time the battery will work!", L_Close;
 
 L_BattleInProgress:
     mes "The mana battery looks like it is about to explode. You better take cover!";
-- 
cgit v1.2.3-60-g2f50