Clean up main scripts

3 files changed, 68 insertions, 25 deletions

diff --git a/world/map/npc/009-4/orum.txt b/world/map/npc/009-4/orum.txt
index c6cbd403..2b222255 100644
--- a/world/map/npc/009-4/orum.txt
+++ b/world/map/npc/009-4/orum.txt
@@ -43,7 +43,9 @@
     menu
         "What exactly is 'this place'?", L_Explain,
         "Umm... what kind of help?", L_Explain,
-        "You're right, I'll be on my way.", -;
+        "You're right, I'll be on my way.", L_Next;
+
+L_Next:
     mes "[Orum]";
     mes "\"Very smart thinking!\"";
     goto L_Close;
@@ -57,7 +59,9 @@ L_Explain:
     mes "\"I traveled in the direction she left until I came accross this cave, but it appears to be protected by some type of magical barrier and I haven't been able to get further than this room.\"";
     menu
         "So where would I come in?", L_Explain_Barriers,
-        "I'd like to help but I have to go...", -;
+        "I'd like to help but I have to go...", L_Next1;
+
+L_Next1:
     mes "[Orum]";
     mes "\"Thats too bad... well, if you ever have some free time, I probably won't figure this out any time soon.\"";
     goto L_Close;
@@ -69,7 +73,9 @@ L_Explain_Barriers:
     mes "\"I've never come across anything like this barrier before. It must be drawing it's power from the torches. I tried putting them out with conventional means but I had no luck.\"";
     menu
         "Have any other ideas on how we get past it?", L_Explain_Note,
-        "I think its meant to keep us out... Bye.", -;
+        "I think its meant to keep us out... Bye.", L_Next2;
+
+L_Next2:
     mes "[Orum]";
     mes "\"You may be right... but she kidnapped Waric. I know it! So I must do something! If you ever change your mind I could surely use the help.\"";
     goto L_Close;
@@ -84,7 +90,9 @@ L_Explain_Note:
     mes "\"Ah! Here it is! If I'm reading this right we may have found a way past it after all. I guess she would need a way to come and go unaffected while everyone else is kept from entering.\"";
     menu
         "What does it say?", L_Explain_Aura,
-        "Looks like you can do this without me.", -;
+        "Looks like you can do this without me.", L_Next3;
+
+L_Next3:
     mes "[Orum]";
     mes "\"Eh... well I guess I can't force you to stay.\"";
     goto L_Close;
@@ -98,15 +106,16 @@ L_Explain_Aura:
     mes "\"Luckily I happen to be skilled in this field of magic! I'm pretty sure if I can get my hands on the materials listed on here I'll be able to cast this aura on us, and hopefully then we can get past this barrier!\"";
     menu
         "Let me guess... that is my job?", L_Offer_Quest,
-        "I think someone is calling me... Bye!", -;
-    goto L_Close;
+        "I think someone is calling me... Bye!", L_Close;
 
 L_Offer_Quest:
     mes "[Orum]";
     mes "\"Well you would probably do better than me since I don't know this area very well. It's not too much stuff so I'm sure you won't have any trouble at all.\"";
     menu
         "Alright alright, just give me a list.", L_Start_Quest,
-        "I'm not your servant! Bye.", -;
+        "I'm not your servant! Bye.", L_Leave1;
+
+L_Leave1:
     mes "[Orum]";
     mes "\"Everyone answers to someone... that's just how the world is. If you ever change your mind I'll probably be here forever gathering these materials on my own.\"";
     goto L_Close;
@@ -120,7 +129,9 @@ L_Start_Quest:
     mes "" + @B0_HARDSPIKES + " Hard Spikes";
     menu
         "Alright, I'll go get these.", L_Start_Gathering,
-        "You can forget it! I quit!", -;
+        "You can forget it! I quit!", L_Next4;
+
+L_Next4:
     mes "[Orum]";
     mes "\"I know you'll be back... they always come back!\"";
     goto L_Close;
@@ -149,7 +160,9 @@ L_Gathering:
     menu
         "Yep, I have every last one of them!", L_Check_Materials,
         "Can I get another list?", L_List_Materials,
-        "I still need a few things...", -;
+        "I still need a few things...", L_Next5;
+
+L_Next5:
     mes "Orum shakes his head in frustration.";
     next;
     mes "[Orum]";
@@ -198,7 +211,6 @@ L_Check_Materials:
     mes "[Orum]";
     mes "\"Well we are both still in one piece so that is a good sign! Now we'll have to see if I did it right... mind going first?\"";
     goto L_Setup_Lair;
-    goto L_Close;
 
 L_Missing_Materials:
     mes "Orum carefully looks over all of the items then squints his eyes at you.";
@@ -257,7 +269,9 @@ L_Explore:
     menu
         "Yep. A whole mess of torches!", L_Explain_Objective,
         "I'm not sure what to look for...", L_Explain_Objective,
-        "Going to explore more, bye.", -;
+        "Going to explore more, bye.", L_Leave2;
+
+L_Leave2:
     mes "[Orum]";
     mes "\"Be sure to let me know if you find anything. I've almost gained my energy back.\"";
     goto L_Close;
@@ -276,7 +290,9 @@ L_Found_Barriers:
         "Yep. A whole mess of torches!", L_Explain_Objective,
         "I'm not sure what to look for...", L_Explain_Objective,
         "I found more barriers, but...", L_Explain_Barriers_More,
-        "Going to explore more, bye.", -;
+        "Going to explore more, bye.", L_Leave3;
+
+L_Leave3:
     mes "[Orum]";
     mes "\"Be sure to let me know if you find anything. I'm still gaining my energy back.\"";
     goto L_Close;
@@ -286,7 +302,9 @@ L_Explain_Barriers_More:
     mes "\"Hm let me guess... the aura is ineffective on the rest of the barriers here?\"";
     menu
         "How did you know?", L_Explain_Note_More,
-        "I'm not sure, I'll go try again.", -;
+        "I'm not sure, I'll go try again.", L_Next6;
+
+L_Next6:
     mes "[Orum]";
     mes "\"Always a good idea to double check things!\"";
     goto L_Close;
@@ -312,7 +330,9 @@ L_Found_Torches:
         "I'm not sure what to look for...", L_Explain_Objective,
         "I found more barriers, but...", L_Explain_Barriers_More,
         "I found a strange torch by itself.", L_Explain_Torches,
-        "Going to explore more, bye.", -;
+        "Going to explore more, bye.", L_Leave4;
+
+L_Leave4:
     mes "[Orum]";
     mes "\"Be sure to let me know if you find anything new.\"";
     goto L_Close;
@@ -330,7 +350,9 @@ L_Explain_Torches:
     mes "\"We will probably need to transmute this powder before we can get any further past these barriers. Would you mind gathering a few more materials?\"";
     menu
         "It better be the last time.", L_Gather_More,
-        "I'm done doing stuff for you!", -;
+        "I'm done doing stuff for you!", L_Next61;
+
+L_Next61:
     mes "[Orum]";
     mes "\"I'm surprised you give up after we've gotten so far. Shame.\"";
     goto L_Close;
@@ -345,7 +367,9 @@ L_Gather_More:
     mes @BT_HERBS + " Cobalt Herbs";
     menu
         "Yikes! I'll try...", L_Gathering_More,
-        "No way! Too much stuff!", -;
+        "No way! Too much stuff!", L_Next7;
+
+L_Next7:
     mes "[Orum]";
     mes "\"The note says to get these and I'm not going to attempt this spell until I have what the note says.\"";
     goto L_Close;
@@ -362,7 +386,9 @@ L_Still_Gathering:
     menu
         "I believe I have!", L_Finished_Gathering_More,
         "I lost my list... again.", L_List_Materials_More,
-        "I've almost got them all.", -;
+        "I've almost got them all.", L_Next8;
+
+L_Next8:
     mes "[Orum]";
     mes "\"Don't make me remind you again! Warics life is on the line here! Hurry up!\"";
     goto L_Close;
@@ -429,7 +455,9 @@ L_Finish_Up:
     menu
         "No, I'm still not sure how.", L_Explain_Torches_More,
         "I need more of that powder.", L_More_Powder,
-        "I'm still trying...", -;
+        "I'm still trying...", L_Next9;
+
+L_Next9:
     mes "[Orum]";
     mes "\"Excellent! Let me know when you've made any progress.\"";
     goto L_Close;
@@ -449,7 +477,9 @@ L_More_Powder:
     menu
         "I have them right here!", L_More_Powder_Make,
         "Hmmm... what are they again?", L_List_Materials_More,
-        "I'll go get those for you.", -;
+        "I'll go get those for you.", L_Next10;
+
+L_Next10:
     mes "[Orum]";
     mes "\"You better not waste any time gathering those materials!\"";
     goto L_Close;
@@ -490,7 +520,9 @@ L_Finished_Up:
     menu
         "Actually... I have!", L_Enter_Cavern,
         "I need more of that powder.", L_More_Powder,
-        "Cut me some slack! I'm working on it!", -;
+        "Cut me some slack! I'm working on it!", L_Next11;
+
+L_Next11:
     mes "[Orum]";
     mes "\"Just hurry it up! Warics life is on the line here!\"";
     goto L_Close;
@@ -524,8 +556,10 @@ L_Ready_Cavern:
     next;
     mes "\"You've done enough here to help. I will go the rest of the way alone so that your life is not endangered. You must promise me not to go any further!\"";
     menu
-        "Sure, I promise!", -,
-        "I thought this would never be over!", -;
+        "Sure, I promise!", L_Next12,
+        "I thought this would never be over!", L_Next12;
+
+L_Next12:
     mes "[Orum]";
     mes "\"Well I guess this is farewell!\"";
     goto L_Close;
diff --git a/world/map/npc/009-4/torches.txt b/world/map/npc/009-4/torches.txt
index eaf8c837..eec66815 100644
--- a/world/map/npc/009-4/torches.txt
+++ b/world/map/npc/009-4/torches.txt
@@ -141,7 +141,9 @@ L_Color_Loop:
         "Add Red Powder", L_Use_Red,
         "Add Yellow Powder", L_Use_Yellow,
         "Add Blue Powder", L_Use_Blue,
-        "Leave it alone.", -;
+        "Leave it alone.", L_Leave;
+
+L_Leave:
     mes "The flame flickers as if it's laughing at you.";
     close;
 
@@ -288,6 +290,7 @@ L_Failed:
     set @Torch, 0;
     callfunc "TorchLoop";
     // unreachable
+    end;
 }
 
 // Second Torch
@@ -299,6 +302,7 @@ L_Failed:
     set @Torch, 1;
     callfunc "TorchLoop";
     // unreachable
+    end;
 }
 
 // Third Torch
@@ -310,4 +314,5 @@ L_Failed:
     set @Torch, 2;
     callfunc "TorchLoop";
     // unreachable
+    end;
 }
diff --git a/world/map/npc/009-4/waric.txt b/world/map/npc/009-4/waric.txt
index 13187203..778c5111 100644
--- a/world/map/npc/009-4/waric.txt
+++ b/world/map/npc/009-4/waric.txt
@@ -40,7 +40,9 @@
     menu
         "My pleasure! Mind letting me out of here?", L_Explain,
         "This doesn't look like a thank you!", L_Explain,
-        "Let me out of here at once!", -;
+        "Let me out of here at once!", L_Next;
+
+L_Next:
     mes "Waric turns toward Orum.";
     next;
     mes "[Waric]";
@@ -57,7 +59,9 @@ L_Behave:
     mes "\"So... are you ready to behave yourself now?\"";
     menu
         "Yes mister...", L_Explain,
-        "Let me out here!", -;
+        "Let me out here!", L_Next1;
+
+L_Next1:
     mes "[Waric]";
     mes "\"Having fun I take it?\"";
     next;