Clean up main scripts

1 files changed, 25 insertions, 6 deletions

diff --git a/world/map/npc/011-1/oscar.txt b/world/map/npc/011-1/oscar.txt
index c9ee88da..e3901a12 100644
--- a/world/map/npc/011-1/oscar.txt
+++ b/world/map/npc/011-1/oscar.txt
@@ -80,8 +80,10 @@ L_Introduce:
     next;
     mes "\"I just came back from a long trip... Really tiring, but so interesting.\"";
     menu
-        "Oh? Where did you go?", -,
+        "Oh? Where did you go?", L_Next,
         "Well... I believe.", L_End;
+
+L_Next:
     mes "[Oscar]";
     mes "\"Well, I travelled to the economic center of this continent.";
     mes "It's north-east of here. Quite far I must say.\"";
@@ -96,8 +98,10 @@ L_Introduce:
     mes "\"They taste really good you see, but ahah, they weren't really for eating at that moment!";
     mes "Anyway, I wondered if I could grow some here. Until now I only grow apples and oranges.\"";
     menu
-        "That's an interesting idea!", -,
+        "That's an interesting idea!", L_Next1,
         "Really, I hate pumpkins.", L_End;
+
+L_Next1:
     mes "[Oscar]";
     mes "\"However, I couldn't get any seeds, but I heard rumors in that city, saying we could find pumpkins in the forests north-east of here.";
     mes "Most likely there are pumpkin seeds laying around them.\"";
@@ -110,8 +114,10 @@ L_Introduce:
 
     mes "\"Do you think you can get some for me?\"";
     menu
-        "Sure. Leave it to me!", -,
+        "Sure. Leave it to me!", L_Next2,
         "Well, I don't have time for that right now.", L_End;
+
+L_Next2:
     mes "[Oscar]";
     mes "\"Thanks so much " + strcharinfo(0) + "!";
     mes "I can't wait to try them!\"";
@@ -164,8 +170,10 @@ L_HelpGrowSeeds:
         goto L_ProposeUseKaflosh;
     set @nature_magic, 0;
     menu
-        "Yeah sure!", -,
+        "Yeah sure!", L_Next3,
         "That sounds boring to do. No thanks.", L_End;
+
+L_Next3:
     getinventorylist;
     if (@inventorylist_count == 100 && countitem("EmptyBottle") == 0)
         goto L_InventoryFull;
@@ -176,9 +184,11 @@ L_HelpGrowSeeds:
 L_ProposeUseKaflosh:
     set @nature_magic, 0;
     menu
-        "Yeah sure!", -,
+        "Yeah sure!", L_Next4,
         "Maybe I can help you water them with magic!", L_WaterWithKaflosh,
         "That sounds boring to do. No thanks.", L_End;
+
+L_Next4:
     getinventorylist;
     if (@inventorylist_count == 100 && countitem("EmptyBottle") == 0)
         goto L_InventoryFull;
@@ -212,8 +222,10 @@ L_HelpFillWaters:
         goto L_WateringBusy;
     mes "\"So do you have the " + $@halloween_num_water_bottles + " bottles filled with fresh water?\"";
     menu
-        "Yes! Fresh and clear water.", -,
+        "Yes! Fresh and clear water.", L_Next5,
         "Oh, not yet. I'm on my way.", L_End;
+
+L_Next5:
     if (countitem("BottleOfWater") < $@halloween_num_water_bottles)
         goto L_NotEnoughWaters;
 
@@ -306,8 +318,15 @@ OnInit:
     end;
 
 OnTimer1000:
+    goto L_TimerFunction;
+
 OnTimer2000:
+    goto L_TimerFunction;
+
 OnTimer3000:
+    goto L_TimerFunction;
+
+L_TimerFunction:
     if ($@HalloweenQuest_PumpkinsState != 1)
         end;
     callsub S_CheckPlayer;