Clean up main scripts

2 files changed, 23 insertions, 13 deletions

diff --git a/world/map/npc/009-3/sword.txt b/world/map/npc/009-3/sword.txt
index 1be13790..cdf69ea9 100644
--- a/world/map/npc/009-3/sword.txt
+++ b/world/map/npc/009-3/sword.txt
@@ -51,11 +51,13 @@ L_Initial:
     next;
     menu
         "Leave", L_Close,
-        "Sorry.", -,
-        "Who or what are you?", -,
-        "What sorrow?", -,
-        "Can I help?", -,
-        "Can you teach me magic?", -;
+        "Sorry.", L_Next,
+        "Who or what are you?", L_Next,
+        "What sorrow?", L_Next,
+        "Can I help?", L_Next,
+        "Can you teach me magic?", L_Next;
+
+L_Next:
     mes "[Magic Sword]";
     mes "There is no answer.";
     close;
@@ -69,8 +71,7 @@ L_PostFlareDart:
         "Hi!  How are you?", L_PostFlareDart_hi,
         "Can you teach me magic?", L_PostFlareDart_teach,
         "Your sister sent me.", L_PostFlareDart_sister,
-        "Bye!", -;
-    close;
+        "Bye!", L_Close;
 
 L_PostFlareDart_hi:
     mes "[Magic Sword]";
@@ -83,7 +84,7 @@ L_PostFlareDart_sister:
     mes "\"Wherefore did she send thee?\"";
     next;
     menu
-        "She asked me to ask you to teach me a spell.", -;
+        "She asked me to ask you to teach me a spell.", L_PostFlareDart_teach;
 
 L_PostFlareDart_teach:
     mes "[Magic Sword]";
@@ -94,8 +95,10 @@ L_PostFlareDart_teach:
     mes "\"Once a spell has been learned, it cannot be taken back, no more than a death can be undone.  So be careful, mortal... dost thou truly wish to know the secrets of thus destructive power?\"";
     next;
     menu
-        "Yes.", -,
+        "Yes.", L_Next1,
         "No.", L_Close;
+
+L_Next1:
     mes "[Magic Sword]";
     mes "\"So thou art bound to the path of War, as am I, as is my sister...\"";
     next;
@@ -113,6 +116,7 @@ L_PostFlareDart_teach2:
     mes "[Magic Sword]";
     mes "\"Seek out my sister, and leave me alone in my sorrows.\"";
     next;
+    goto L_Close;
 
 L_Close:
     close;
@@ -123,13 +127,17 @@ L_L2_W11:
     next;
     menu
         "No, I just wanted to say `hi'.", L_sayhi,
-        "Yes, teach me more!", -;
+        "Yes, teach me more!", L_Next2;
+
+L_Next2:
     mes "[Magic Sword]";
     mes "\"If that is thou wishest, I shall not stop thee.  But do not expect to find merriment down this road.\"";
     mes "\"I must ask that thou sacrificest five thousand monster points for this, however.\"";
     menu
         "No, I don't want that.", L_farewell,
-        "Very well.", -;
+        "Very well.", L_Next3;
+
+L_Next3:
     if (Mobpt < 5000)
         goto L_lacking_mobpoints;
     mes "[Magic Sword]";
diff --git a/world/map/npc/009-3/warp.txt b/world/map/npc/009-3/warp.txt
index d02c365a..8bb52a30 100644
--- a/world/map/npc/009-3/warp.txt
+++ b/world/map/npc/009-3/warp.txt
@@ -3,10 +3,12 @@
     mes "Do you want to enter the PVP cave? It costs 150GP.";
     menu
         "No.", L_Exit,
-        "Yes.", -;
+        "Yes.", L_Next;
+
+L_Next:
     if (Zeny < 150)
         goto L_NotEnoughMoney;
-    if (Zeny >= 150)
+    //else
         goto L_Pay;
 
 L_Exit: