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/007-1/witch.txt | 38 +++++++++++++++++++++++++++++++-------
 1 file changed, 31 insertions(+), 7 deletions(-)

(limited to 'world/map/npc/007-1/witch.txt')

diff --git a/world/map/npc/007-1/witch.txt b/world/map/npc/007-1/witch.txt
index 70147a8b..f65bafb1 100644
--- a/world/map/npc/007-1/witch.txt
+++ b/world/map/npc/007-1/witch.txt
@@ -66,16 +66,18 @@ L_Introduce:
     mes "\"And you, you seem to be quite an adventurer.\"";
     menu
         "Well... No.", L_Disappointed,
-        "No doubt!", -;
+        "No doubt!", L_Next;
 
+L_Next:
     mes "[Valia]";
     mes "\"Maybe you can help then.";
     mes "You see, I have a sister. Yes, a witch too. Very talented.";
     mes "But unfortunately not enough to avoid being captured.\"";
     menu
         "That's unfortunate...", L_Exit,
-        "What informations do you have about all this?", -;
+        "What informations do you have about all this?", L_Next1;
 
+L_Next1:
     set @illia_know_witch, 1;
     mes "[Valia]";
     mes "\"Ismuth, some dark mage we both hate. He is the one holding her jailed for sure.";
@@ -86,7 +88,9 @@ L_Introduce:
     mes "And I am unable to go help her.\"";
 
     menu
-        "Why not? You seem to be quite talented as well.", -;
+        "Why not? You seem to be quite talented as well.", L_Next2;
+
+L_Next2:
     mes "[Valia]";
     mes "\"Sure. But I know the enemy. My chances are thin. And if I fail, no one will ever find us.";
     mes "And my magic skills aren't suited for this...\"";
@@ -111,8 +115,9 @@ L_AskHelp:
     mes "\"Will you help me?\"";
     menu
         "That sounds quite dangerous... I don't feel it.", L_Disappointed,
-        "Ok, I can do that for you.", -;
+        "Ok, I can do that for you.", L_Next3;
 
+L_Next3:
     mes "[Valia]";
     mes "\"Good. Now listen carefully. Ismuth owns an island where he makes his researchs.";
     mes "An island where no boat goes, and where no magic could teleport you to...";
@@ -129,8 +134,9 @@ L_AskHelp:
     mes "\"Do you know such people?\"";
     menu
         "I'm afraid not. I should better look around.", L_Exit,
-        "Yes I know such people!", -;
+        "Yes I know such people!", L_Next4;
 
+L_Next4:
     mes "[Valia]";
     mes "\"Good.";
     mes "I can teleport all of you close to that waterfall, but for that, I will need " + @illia_sapphire_powder + " bags of Sapphire Powder, " + @illia_amethyst_powder + " of Amethyst Powder, " + @illia_iron_powder + " Iron Powders," + @illia_yeti_tear + " Frozen Yeti Tear and " + @illia_iced_water + " bottles of Iced Water.\"";
@@ -399,8 +405,10 @@ L_AskToTeleport:
     mes "[Valia]";
     mes "\"Everyone seems to be here. Make sure to stay close to me.\"";
     menu
-        "I'm ready.", -,
+        "I'm ready.", L_Next5,
         "Wait a minute.", L_Exit;
+
+L_Next5:
     // Stop the 5mins timer and start it again.
     set $@ILLIA_STATUS, 3;
     initnpctimer;
@@ -416,8 +424,10 @@ L_TalkHelper:
     mes "[Valia]";
     mes "\"" + strcharinfo(0) + ", do your best to assist " + $@ILLIA_HERO$ + ".\"";
     menu
-        "What is " + $@ILLIA_HERO$ + " going to do?", -,
+        "What is " + $@ILLIA_HERO$ + " going to do?", L_Next6,
         "I will, no problem.", L_Exit;
+
+L_Next6:
     mes "[Valia]";
     mes "\"You weren't told about it? This is about saving my captive sister.\"";
     next;
@@ -904,18 +914,32 @@ function|script|UpdateIlliaProgress|,
 
 L_Torch8:
     enablenpc "#IlliaTorch8";
+    goto L_Torch7;
+
 L_Torch7:
     enablenpc "#IlliaTorch7";
+    goto L_Torch6;
+
 L_Torch6:
     enablenpc "#IlliaTorch6";
+    goto L_Torch5;
+
 L_Torch5:
     enablenpc "#IlliaTorch5";
+    goto L_Torch4;
+
 L_Torch4:
     enablenpc "#IlliaTorch4";
+    goto L_Torch3;
+
 L_Torch3:
     enablenpc "#IlliaTorch3";
+    goto L_Torch2;
+
 L_Torch2:
     enablenpc "#IlliaTorch2";
+    goto L_Torch1;
+
 L_Torch1:
     enablenpc "#IlliaTorch1";
 
-- 
cgit v1.2.3-60-g2f50