use upstream overworld option

Instead of a standalone option, use upstream's "overworld" option, which we don't use yet but it leaves better space for the future

worlds/ladx/LADXR/generator.py

@@ -65,7 +65,7 @@
 
 from BaseClasses import ItemClassification
 from ..Locations import LinksAwakeningLocation
-from ..Options import TrendyGame, Palette, MusicChangeCondition, BootsControls, OpenMabe
+from ..Options import TrendyGame, Palette, MusicChangeCondition, BootsControls
 
 if TYPE_CHECKING:
     from .. import LinksAwakeningWorld
@@ -153,7 +153,7 @@ def generateRom(args, world: "LinksAwakeningWorld"):
         patches.witch.updateWitch(rom)
     patches.softlock.fixAll(rom)
     patches.maptweaks.tweakMap(rom)
-    if world.options.open_mabe:
+    if world.options.overworld == "open_mabe":
         patches.maptweaks.openMabe(rom)
     patches.chest.fixChests(rom)
     patches.shop.fixShop(rom)

worlds/ladx/LADXR/logic/overworld.py

@@ -141,7 +141,7 @@ def __init__(self, options, world_setup, r):
 
         # "Ukuku Prairie"
         ukuku_prairie = Location()
-        if options.openmabe:
+        if options.overworld == "openmabe":
             ukuku_prairie.connect(mabe_village, r.bush)
         else:
             ukuku_prairie.connect(mabe_village, POWER_BRACELET)

worlds/ladx/LADXR/settings.py

@@ -169,7 +169,7 @@ def __init__(self, ap_options):
 [Never] you can never steal from the shop."""),
             Setting('bowwow', 'Special', 'g', 'Good boy mode', options=[('normal', '', 'Disabled'), ('always', 'a', 'Enabled'), ('swordless', 's', 'Enabled (swordless)')], default='normal',
                 description='Allows BowWow to be taken into any area, damage bosses and more enemies. If enabled you always start with bowwow. Swordless option removes the swords from the game and requires you to beat the game without a sword and just bowwow.'),
-            Setting('overworld', 'Special', 'O', 'Overworld', options=[('normal', '', 'Normal'), ('dungeondive', 'D', 'Dungeon dive'), ('nodungeons', 'N', 'No dungeons'), ('random', 'R', 'Randomized')], default='normal',
+            Setting('overworld', 'Special', 'O', 'Overworld', options=[('normal', '', 'Normal'), ('dungeondive', 'D', 'Dungeon dive'), ('nodungeons', 'N', 'No dungeons'), ('random', 'R', 'Randomized'), ('openmabe', 'M', 'Open Mabe')], default='normal',
                 description="""
 [Dungeon Dive] Create a different overworld where all the dungeons are directly accessible and almost no chests are located in the overworld.
 [No dungeons] All dungeons only consist of a boss fight and a instrument reward. Rest of the dungeon is removed.
@@ -207,8 +207,6 @@ def __init__(self, ap_options):
 [Random] Randomizes overworld and dungeon music'
 [Disable] no music in the whole game""",
                 aesthetic=True),
-            Setting('openmabe', 'Archipelago', 'a', 'Open Mabe', default="",
-                description="""Swap east mabe rocks for bushes."""),
         ]
         self.__by_key = {s.key: s for s in self.__all}
 

worlds/ladx/Options.py

@@ -303,15 +303,12 @@ class Bowwow(Choice):
 
 class Overworld(Choice, LADXROption):
     """
-    [Dungeon Dive] Create a different overworld where all the dungeons are directly accessible and almost no chests are located in the overworld.
-    [Tiny dungeons] All dungeons only consist of a boss fight and a instrument reward. Rest of the dungeon is removed.
+    [Open Mabe] Replaces rock on the east side of Mabe Village with bushes, allowing access to Ukuku Prairie without Power Bracelet.
     """
     display_name = "Overworld"
     ladxr_name = "overworld"
     option_normal = 0
-    option_dungeon_dive = 1
-    option_tiny_dungeons = 2
-    # option_shuffled = 3
+    option_open_mabe = 1
     default = option_normal
 
 
@@ -502,14 +499,6 @@ class AdditionalWarpPoints(DefaultOffToggle):
     display_name = "Additional Warp Points"
 
 
-class OpenMabe(DefaultOffToggle, LADXROption):
-    """
-    Replaces rock on the east side of Mabe Village with bushes, allowing access to Ukuku Prairie without Power Bracelet.
-    """
-    display_name = "Open Mabe"
-    ladxr_name = "openmabe"
-
-
 ladx_option_groups = [
     OptionGroup("Goal Options", [
         Goal,
@@ -530,7 +519,7 @@ class OpenMabe(DefaultOffToggle, LADXROption):
     OptionGroup("Miscellaneous", [
         TradeQuest,
         Rooster,
-        OpenMabe,
+        Overworld,
         TrendyGame,
         NagMessages,
         BootsControls
@@ -589,4 +578,4 @@ class LinksAwakeningOptions(PerGameCommonOptions):
     nag_messages: NagMessages
     ap_title_screen: APTitleScreen
     boots_controls: BootsControls
-    open_mabe: OpenMabe
+    overworld: Overworld

worlds/ladx/__init__.py

@@ -539,7 +539,7 @@ def fill_slot_data(self):
                 "shuffle_stone_beaks",
                 "shuffle_instruments",
                 "nag_messages",
-                "open_mabe",
+                "overworld",
             ]
 
             # use the default behaviour to grab options