Clean up main scripts

1 files changed, 25 insertions, 12 deletions

diff --git a/world/map/npc/027-2/lover.txt b/world/map/npc/027-2/lover.txt
index 354362b1..7105dfab 100644
--- a/world/map/npc/027-2/lover.txt
+++ b/world/map/npc/027-2/lover.txt
@@ -49,7 +49,9 @@
     mes "[Hanged Man]";
     mes "\"Oh, hello. Nice to see you - I seem to be dead, but I don't know why and why I'm still consciousness. This is very interesting.\"";
     menu
-        "INTERESTING? Are you crazy?",-;
+        "INTERESTING? Are you crazy?",L_Next;
+
+L_Next:
     mes "[Hanged Man]";
     mes "\"Well, as you mention it, it is quite annoying and uncomfortable. Would you mind helping me down to the floor?\"";
     next;
@@ -87,13 +89,16 @@ L_Crystals:
     mes "[Hanged Man]";
     mes "\"You have more of them, haven't you? It will work better if you give them to me too.\"";
     menu
-        "Ok, here you go.",-,
+        "Ok, here you go.",L_Next1,
         "I prefer to keep them.",L_Skip;
+
+L_Next1:
     set @crystal, countitem("DarkCrystal");
     if (@crystal > @CRYSTAL_MAX)
         set @crystal, @CRYSTAL_MAX;
     delitem "DarkCrystal", @crystal;
     getexp @crystal*@CRYSTAL_EXTRA_EXP, 0;
+    goto L_Skip;
 
 L_Skip:
     mes "[Hanged Man]";
@@ -117,9 +122,11 @@ L_Skip:
     next;
     mes "\"This is fascinating!\"";
     menu
-        "Ok, you are crazy!",-,
-        "Yes, it is very fascinating to be blown up!",-,
-        "I NEARLY DIED! AND YOU THINK THIS IS FASCINATING?!",-;
+        "Ok, you are crazy!",L_Next2,
+        "Yes, it is very fascinating to be blown up!",L_Next2,
+        "I NEARLY DIED! AND YOU THINK THIS IS FASCINATING?!",L_Next2;
+
+L_Next2:
     mes "[Hanged Man]";
     mes "\"I sometimes forget the fact that not everybody is fascinated by the riddles of magic. Please forgive me.\"";
     next;
@@ -155,6 +162,7 @@ L_News:
                 "Can you tell me about your relationship to Reid?",L_Reid,
                 "Yes, let me tell you.",L_Golbenez,
                 "I don't think so.",L_Close;
+    goto L_Golbenez;
 
 L_Golbenez:
     mes "You explain how you came to the inn and what Golbenez said to you.";
@@ -164,9 +172,11 @@ L_Golbenez:
     next;
     mes "\"Savaric seems to be completely absorbed in his thoughts.\"";
     menu
-        "Hello? Are you still there?",-,
-        "Excuse me, I don't want to interrupt you, but can you explain to me what's going on? I'm confused.",-,
-        "Hey! I'm talking with you!",-;
+        "Hello? Are you still there?",L_Next3,
+        "Excuse me, I don't want to interrupt you, but can you explain to me what's going on? I'm confused.",L_Next3,
+        "Hey! I'm talking with you!",L_Next3;
+
+L_Next3:
     mes "Savaric winces.";
     next;
     mes "\"Oh, right - I was just thinking. It makes me feel uncomfortable to hear about Golbenez being involved in this.\"";
@@ -195,9 +205,10 @@ L_Golb:
         menu
             "I'm still working on doing all the stuff Golbenez wants me to do.",L_Close;
     menu
-        "Now I know what happened. I'll tell you.",-,
-        "I'm sorry to tell you, but this was all your fault.",-;
+        "Now I know what happened. I'll tell you.",L_Next4,
+        "I'm sorry to tell you, but this was all your fault.",L_Next4;
 
+L_Next4:
     mes "You tell Savaric about what Golbenez showed to you.";
     next;
     mes "[Savaric]";
@@ -237,8 +248,10 @@ L_Want_Soul:
     mes "[Savaric]";
     mes "\"Welcome back! Are you still working on getting my soul back?\"";
     menu
-        "I'm doing my best.",-,
-        "Yes, but it isn't easy.",-;
+        "I'm doing my best.",L_NextEnd,
+        "Yes, but it isn't easy.",L_NextEnd;
+
+L_NextEnd:
     mes "[Savaric]";
     mes "\"Thank you so much! I'm counting on you!\"";
     goto L_Close;