diff --git a/.github/pyright-config.json b/.github/pyright-config.json
index de7758a715..b6561afa46 100644
--- a/.github/pyright-config.json
+++ b/.github/pyright-config.json
@@ -2,6 +2,7 @@
   "include": [
     "../BizHawkClient.py",
     "../Patch.py",
+    "../test/param.py",
     "../test/general/test_groups.py",
     "../test/general/test_helpers.py",
     "../test/general/test_memory.py",
diff --git a/.github/workflows/ctest.yml b/.github/workflows/ctest.yml
index a0ae2cb252..610f6d7477 100644
--- a/.github/workflows/ctest.yml
+++ b/.github/workflows/ctest.yml
@@ -36,9 +36,9 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - uses: ilammy/msvc-dev-cmd@v1
+    - uses: ilammy/msvc-dev-cmd@0b201ec74fa43914dc39ae48a89fd1d8cb592756
       if: startsWith(matrix.os,'windows')
-    - uses: Bacondish2023/setup-googletest@v1
+    - uses: Bacondish2023/setup-googletest@49065d1f7a6d21f6134864dd65980fe5dbe06c73
       with:
         build-type: 'Release'
     - name: Build tests
diff --git a/.gitignore b/.gitignore
index 5da42dc1e0..f50fc17e23 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,6 +10,7 @@
 *.apmc
 *.apz5
 *.aptloz
+*.aptww
 *.apemerald
 *.pyc
 *.pyd
diff --git a/AdventureClient.py b/AdventureClient.py
index 24c6a4c4fc..91567fc0a0 100644
--- a/AdventureClient.py
+++ b/AdventureClient.py
@@ -511,7 +511,7 @@ if __name__ == '__main__':
 
     import colorama
 
-    colorama.init()
+    colorama.just_fix_windows_console()
 
     asyncio.run(main())
     colorama.deinit()
diff --git a/CommonClient.py b/CommonClient.py
index 33792f0ed2..ae411838d8 100644
--- a/CommonClient.py
+++ b/CommonClient.py
@@ -1128,7 +1128,7 @@ def run_as_textclient(*args):
     args = handle_url_arg(args, parser=parser)
 
     # use colorama to display colored text highlighting on windows
-    colorama.init()
+    colorama.just_fix_windows_console()
 
     asyncio.run(main(args))
     colorama.deinit()
diff --git a/FF1Client.py b/FF1Client.py
index b7c58e2061..748a95b72c 100644
--- a/FF1Client.py
+++ b/FF1Client.py
@@ -261,7 +261,7 @@ if __name__ == '__main__':
 
     parser = get_base_parser()
     args = parser.parse_args()
-    colorama.init()
+    colorama.just_fix_windows_console()
 
     asyncio.run(main(args))
     colorama.deinit()
diff --git a/LinksAwakeningClient.py b/LinksAwakeningClient.py
index ff932e7c76..2f2c94f68f 100644
--- a/LinksAwakeningClient.py
+++ b/LinksAwakeningClient.py
@@ -506,7 +506,7 @@ class LinksAwakeningContext(CommonContext):
     la_task = None
     client = None
     # TODO: does this need to re-read on reset?
-    found_checks = []
+    found_checks = set()
     last_resend = time.time()
 
     magpie_enabled = False
@@ -558,10 +558,6 @@ class LinksAwakeningContext(CommonContext):
 
         self.ui = LADXManager(self)
         self.ui_task = asyncio.create_task(self.ui.async_run(), name="UI")
-
-    async def send_checks(self):
-        message = [{"cmd": "LocationChecks", "locations": self.found_checks}]
-        await self.send_msgs(message)
     
     async def send_new_entrances(self, entrances: typing.Dict[str, str]):
         # Store the entrances we find on the server for future sessions
@@ -613,8 +609,8 @@ class LinksAwakeningContext(CommonContext):
             self.client.pending_deathlink = True
 
     def new_checks(self, item_ids, ladxr_ids):
-        self.found_checks += item_ids
-        create_task_log_exception(self.send_checks())
+        self.found_checks.update(item_ids)
+        create_task_log_exception(self.check_locations(self.found_checks))
         if self.magpie_enabled:
             create_task_log_exception(self.magpie.send_new_checks(ladxr_ids))
 
@@ -721,7 +717,7 @@ class LinksAwakeningContext(CommonContext):
 
                     if self.last_resend + 5.0 < now:
                         self.last_resend = now
-                        await self.send_checks()
+                        await self.check_locations(self.found_checks)
                     if self.magpie_enabled:
                         try:
                             self.magpie.set_checks(self.client.tracker.all_checks)
@@ -803,6 +799,6 @@ async def main():
     await ctx.shutdown()
 
 if __name__ == '__main__':
-    colorama.init()
+    colorama.just_fix_windows_console()
     asyncio.run(main())
     colorama.deinit()
diff --git a/MMBN3Client.py b/MMBN3Client.py
index 140a98745c..4945d49221 100644
--- a/MMBN3Client.py
+++ b/MMBN3Client.py
@@ -370,7 +370,7 @@ if __name__ == "__main__":
 
     import colorama
 
-    colorama.init()
+    colorama.just_fix_windows_console()
 
     asyncio.run(main())
     colorama.deinit()
diff --git a/MultiServer.py b/MultiServer.py
index a310808b3a..f9ed34e2f7 100644
--- a/MultiServer.py
+++ b/MultiServer.py
@@ -47,7 +47,7 @@ from NetUtils import Endpoint, ClientStatus, NetworkItem, decode, encode, Networ
 from BaseClasses import ItemClassification
 
 min_client_version = Version(0, 1, 6)
-colorama.init()
+colorama.just_fix_windows_console()
 
 
 def remove_from_list(container, value):
diff --git a/OoTClient.py b/OoTClient.py
index 1154904173..6a87b9e722 100644
--- a/OoTClient.py
+++ b/OoTClient.py
@@ -346,7 +346,7 @@ if __name__ == '__main__':
 
     import colorama
 
-    colorama.init()
+    colorama.just_fix_windows_console()
 
     asyncio.run(main())
     colorama.deinit()
diff --git a/Options.py b/Options.py
index 49e82069ee..95b9b468c6 100644
--- a/Options.py
+++ b/Options.py
@@ -1579,6 +1579,7 @@ def dump_player_options(multiworld: MultiWorld) -> None:
             player_output = {
                 "Game": multiworld.game[player],
                 "Name": multiworld.get_player_name(player),
+                "ID": player,
             }
             output.append(player_output)
             for option_key, option in world.options_dataclass.type_hints.items():
@@ -1591,7 +1592,7 @@ def dump_player_options(multiworld: MultiWorld) -> None:
                     game_option_names.append(display_name)
 
     with open(output_path(f"generate_{multiworld.seed_name}.csv"), mode="w", newline="") as file:
-        fields = ["Game", "Name", *all_option_names]
+        fields = ["ID", "Game", "Name", *all_option_names]
         writer = DictWriter(file, fields)
         writer.writeheader()
         writer.writerows(output)
diff --git a/README.md b/README.md
index 19ab8aba01..7957eb120c 100644
--- a/README.md
+++ b/README.md
@@ -81,6 +81,7 @@ Currently, the following games are supported:
 * Castlevania: Circle of the Moon
 * Inscryption
 * Civilization VI
+* The Legend of Zelda: The Wind Waker
 * Jak and Daxter: The Precursor Legacy
 
 For setup and instructions check out our [tutorials page](https://archipelago.gg/tutorial/).
diff --git a/SNIClient.py b/SNIClient.py
index 9140c73c14..1156bf6040 100644
--- a/SNIClient.py
+++ b/SNIClient.py
@@ -735,6 +735,6 @@ async def main() -> None:
 
 
 if __name__ == '__main__':
-    colorama.init()
+    colorama.just_fix_windows_console()
     asyncio.run(main())
     colorama.deinit()
diff --git a/UndertaleClient.py b/UndertaleClient.py
index dfacee148a..1c522fac92 100644
--- a/UndertaleClient.py
+++ b/UndertaleClient.py
@@ -500,7 +500,7 @@ def main():
 
     import colorama
 
-    colorama.init()
+    colorama.just_fix_windows_console()
 
     asyncio.run(_main())
     colorama.deinit()
diff --git a/WargrooveClient.py b/WargrooveClient.py
index f9971f7a6c..f900e05e3f 100644
--- a/WargrooveClient.py
+++ b/WargrooveClient.py
@@ -446,6 +446,6 @@ if __name__ == '__main__':
     parser = get_base_parser(description="Wargroove Client, for text interfacing.")
 
     args, rest = parser.parse_known_args()
-    colorama.init()
+    colorama.just_fix_windows_console()
     asyncio.run(main(args))
     colorama.deinit()
diff --git a/WebHostLib/requirements.txt b/WebHostLib/requirements.txt
index b7b14dea1e..190409d9a2 100644
--- a/WebHostLib/requirements.txt
+++ b/WebHostLib/requirements.txt
@@ -1,11 +1,11 @@
-flask>=3.0.3
-werkzeug>=3.0.6
+flask>=3.1.0
+werkzeug>=3.1.3
 pony>=0.7.19
-waitress>=3.0.0
+waitress>=3.0.2
 Flask-Caching>=2.3.0
-Flask-Compress>=1.15
-Flask-Limiter>=3.8.0
-bokeh>=3.5.2
-markupsafe>=2.1.5
+Flask-Compress>=1.17
+Flask-Limiter>=3.12
+bokeh>=3.6.3
+markupsafe>=3.0.2
 Markdown>=3.7
 mdx-breakless-lists>=1.0.1
diff --git a/WebHostLib/templates/playerOptions/macros.html b/WebHostLib/templates/playerOptions/macros.html
index 64f0f140de..972f03175d 100644
--- a/WebHostLib/templates/playerOptions/macros.html
+++ b/WebHostLib/templates/playerOptions/macros.html
@@ -213,7 +213,7 @@
 {% endmacro %}
 
 {% macro RandomizeButton(option_name, option) %}
-    <div class="randomize-button" data-tooltip="Toggle randomization for this option!">
+    <div class="randomize-button" data-tooltip="Pick a random value for this option.">
         <label for="random-{{ option_name }}">
             <input type="checkbox" id="random-{{ option_name }}" name="random-{{ option_name }}" class="randomize-checkbox" data-option-name="{{ option_name }}" {{ "checked" if option.default == "random" }} />
             🎲
diff --git a/WebHostLib/templates/weightedOptions/weightedOptions.html b/WebHostLib/templates/weightedOptions/weightedOptions.html
index b3aefd4835..59dbba127d 100644
--- a/WebHostLib/templates/weightedOptions/weightedOptions.html
+++ b/WebHostLib/templates/weightedOptions/weightedOptions.html
@@ -100,7 +100,7 @@
 
                                 {% else %}
                                     <div class="unsupported-option">
-                                        This option is not supported. Please edit your .yaml file manually.
+                                        This option cannot be modified here. Please edit your .yaml file manually.
                                     </div>
 
                                 {% endif %}
diff --git a/Zelda1Client.py b/Zelda1Client.py
index 1154804fbf..4473b3f3c7 100644
--- a/Zelda1Client.py
+++ b/Zelda1Client.py
@@ -386,7 +386,7 @@ if __name__ == '__main__':
     parser.add_argument('diff_file', default="", type=str, nargs="?",
                         help='Path to a Archipelago Binary Patch file')
     args = parser.parse_args()
-    colorama.init()
+    colorama.just_fix_windows_console()
 
     asyncio.run(main(args))
     colorama.deinit()
diff --git a/docs/CODEOWNERS b/docs/CODEOWNERS
index f46ffe77f8..9f561e4b00 100644
--- a/docs/CODEOWNERS
+++ b/docs/CODEOWNERS
@@ -217,6 +217,9 @@
 # Wargroove
 /worlds/wargroove/ @FlySniper
 
+# The Wind Waker
+/worlds/tww/ @tanjo3
+
 # The Witness
 /worlds/witness/ @NewSoupVi @blastron
 
diff --git a/docs/tests.md b/docs/tests.md
index e7f4004236..a9a1962685 100644
--- a/docs/tests.md
+++ b/docs/tests.md
@@ -82,6 +82,38 @@ Unit tests can also be created using [TestBase](/test/bases.py#L16) or
 may be useful for generating a multiworld under very specific constraints without using the generic world setup, or for
 testing portions of your code that can be tested without relying on a multiworld to be created first.
 
+#### Parametrization
+
+When defining a test that needs to cover a range of inputs it is useful to parameterize (to run the same test
+for multiple inputs) the base test. Some important things to consider when attempting to parametrize your test are:
+
+* [Subtests](https://docs.python.org/3/library/unittest.html#distinguishing-test-iterations-using-subtests)
+  can be used to have parametrized assertions that show up similar to individual tests but without the overhead
+  of needing to instantiate multiple tests; however, subtests can not be multithreaded and do not have individual
+  timing data, so they are not suitable for slow tests.
+
+* Archipelago's tests are test-runner-agnostic. That means tests are not allowed to use e.g. `@pytest.mark.parametrize`.
+  Instead, we define our own parametrization helpers in [test.param](/test/param.py).
+
+* Classes inheriting from `WorldTestBase`, including those created by the helpers in `test.param`, will run all
+  base tests by default, make sure the produced tests actually do what you aim for and do not waste a lot of
+  extra CPU time. Consider using `TestBase` or `unittest.TestCase` directly
+  or setting `WorldTestBase.run_default_tests` to False.
+
+#### Performance Considerations
+
+Archipelago is big enough that the runtime of unittests can have an impact on productivity.
+
+Individual tests should take less than a second, so they can be properly multithreaded.
+
+Ideally, thorough tests are directed at actual code/functionality. Do not just create and/or fill a ton of individual
+Multiworlds that spend most of the test time outside what you actually want to test.
+
+Consider generating/validating "random" games as part of your APWorld release workflow rather than having that be part
+of continuous integration, and add minimal reproducers to the "normal" tests for problems that were found.
+You can use [@unittest.skipIf](https://docs.python.org/3/library/unittest.html#unittest.skipIf) with an environment
+variable to keep all the benefits of the test framework while not running the marked tests by default.
+
 ## Running Tests
 
 #### Using Pycharm
@@ -100,3 +132,11 @@ next to the run and debug buttons.
 #### Running Tests without Pycharm
 
 Run `pip install pytest pytest-subtests`, then use your IDE to run tests or run `pytest` from the source folder.
+
+#### Running Tests Multithreaded
+
+pytest can run multiple test runners in parallel with the pytest-xdist extension.
+
+Install with `pip install pytest-xdist`.
+
+Run with `pytest -n12` to spawn 12 process that each run 1/12th of the tests.
diff --git a/entrance_rando.py b/entrance_rando.py
index 2cfebe74ad..ab329edf59 100644
--- a/entrance_rando.py
+++ b/entrance_rando.py
@@ -265,14 +265,19 @@ def bake_target_group_lookup(world: World, get_target_groups: Callable[[int], li
     return { group: get_target_groups(group) for group in unique_groups }
 
 
-def disconnect_entrance_for_randomization(entrance: Entrance, target_group: int | None = None) -> None:
+def disconnect_entrance_for_randomization(entrance: Entrance, target_group: int | None = None,
+                                          one_way_target_name: str | None = None) -> None:
     """
     Given an entrance in a "vanilla" region graph, splits that entrance to prepare it for randomization
-    in randomize_entrances. This should be done after setting the type and group of the entrance.
+    in randomize_entrances. This should be done after setting the type and group of the entrance. Because it attempts
+    to meet strict entrance naming requirements for coupled mode, this function may produce unintuitive results when
+    called only on a single entrance; it produces eventually-correct outputs only after calling it on all entrances.
 
     :param entrance: The entrance which will be disconnected in preparation for randomization.
     :param target_group: The group to assign to the created ER target. If not specified, the group from
                          the original entrance will be copied.
+    :param one_way_target_name: The name of the created ER target if `entrance` is one-way. This argument
+                                is required for one-way entrances and is ignored otherwise.
     """
     child_region = entrance.connected_region
     parent_region = entrance.parent_region
@@ -287,8 +292,11 @@ def disconnect_entrance_for_randomization(entrance: Entrance, target_group: int
         # targets in the child region will be created when the other direction edge is disconnected
         target = parent_region.create_er_target(entrance.name)
     else:
-        # for 1-ways, the child region needs a target and coupling/naming is not a concern
-        target = child_region.create_er_target(child_region.name)
+        # for 1-ways, the child region needs a target. naming is not a concern for coupling so we
+        # allow it to be user provided (and require it, to prevent an unhelpful assumed name in pairings)
+        if not one_way_target_name:
+            raise ValueError("Cannot disconnect a one-way entrance without a target name specified")
+        target = child_region.create_er_target(one_way_target_name)
     target.randomization_type = entrance.randomization_type
     target.randomization_group = target_group or entrance.randomization_group
 
@@ -358,6 +366,34 @@ def randomize_entrances(
         if on_connect:
             on_connect(er_state, placed_exits)
 
+    def needs_speculative_sweep(dead_end: bool, require_new_exits: bool, placeable_exits: list[Entrance]) -> bool:
+        # speculative sweep is expensive. We currently only do it as a last resort, if we might cap off the graph
+        # entirely
+        if len(placeable_exits) > 1:
+            return False
+
+        # in certain stages of randomization we either expect or don't care if the search space shrinks.
+        # we should never speculative sweep here.
+        if dead_end or not require_new_exits or not perform_validity_check:
+            return False
+
+        # edge case - if all dead ends have pre-placed progression or indirect connections, they are pulled forward
+        # into the non dead end stage. In this case, and only this case, it's possible that the last connection may
+        # actually be placeable in stage 1. We need to skip speculative sweep in this case because we expect the graph
+        # to get capped off.
+
+        # check to see if we are proposing the last placement
+        if not coupled:
+            # in uncoupled, this check is easy as there will only be one target.
+            is_last_placement = len(entrance_lookup) == 1
+        else:
+            # a bit harder, there may be 1 or 2 targets depending on if the exit to place is one way or two way.
+            # if it is two way, we can safely assume that one of the targets is the logical pair of the exit.
+            desired_target_count = 2 if placeable_exits[0].randomization_type == EntranceType.TWO_WAY else 1
+            is_last_placement = len(entrance_lookup) == desired_target_count
+        # if it's not the last placement, we need a sweep
+        return not is_last_placement
+
     def find_pairing(dead_end: bool, require_new_exits: bool) -> bool:
         nonlocal perform_validity_check
         placeable_exits = er_state.find_placeable_exits(perform_validity_check, exits)
@@ -371,11 +407,9 @@ def randomize_entrances(
                 # very last exit and check whatever exits we open up are functionally accessible.
                 # this requirement can be ignored on a beaten minimal, islands are no issue there.
                 exit_requirement_satisfied = (not perform_validity_check or not require_new_exits
-                                                or target_entrance.connected_region not in er_state.placed_regions)
-                needs_speculative_sweep = (not dead_end and require_new_exits and perform_validity_check
-                                           and len(placeable_exits) == 1)
+                                              or target_entrance.connected_region not in er_state.placed_regions)
                 if exit_requirement_satisfied and source_exit.can_connect_to(target_entrance, dead_end, er_state):
-                    if (needs_speculative_sweep
+                    if (needs_speculative_sweep(dead_end, require_new_exits, placeable_exits)
                             and not er_state.test_speculative_connection(source_exit, target_entrance, exits_set)):
                         continue
                     do_placement(source_exit, target_entrance)
diff --git a/requirements.txt b/requirements.txt
index cd045b874b..0a9677fc29 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,14 +1,14 @@
 colorama>=0.4.6
 websockets>=13.0.1,<14
 PyYAML>=6.0.2
-jellyfish>=1.1.0
-jinja2>=3.1.4
+jellyfish>=1.1.3
+jinja2>=3.1.6
 schema>=0.7.7
-kivy>=2.3.0
-bsdiff4>=1.2.4
-platformdirs>=4.2.2
-certifi>=2024.12.14
-cython>=3.0.11
-cymem>=2.0.8
-orjson>=3.10.7
+kivy>=2.3.1
+bsdiff4>=1.2.6
+platformdirs>=4.3.6
+certifi>=2025.1.31
+cython>=3.0.12
+cymem>=2.0.11
+orjson>=3.10.15
 typing_extensions>=4.12.2
diff --git a/test/general/test_entrance_rando.py b/test/general/test_entrance_rando.py
index 7e904d3340..542b3b4ba7 100644
--- a/test/general/test_entrance_rando.py
+++ b/test/general/test_entrance_rando.py
@@ -148,7 +148,7 @@ class TestDisconnectForRandomization(unittest.TestCase):
         e.randomization_group = 1
         e.connect(r2)
 
-        disconnect_entrance_for_randomization(e)
+        disconnect_entrance_for_randomization(e, one_way_target_name="foo")
 
         self.assertIsNone(e.connected_region)
         self.assertEqual([], r1.entrances)
@@ -158,10 +158,22 @@ class TestDisconnectForRandomization(unittest.TestCase):
 
         self.assertEqual(1, len(r2.entrances))
         self.assertIsNone(r2.entrances[0].parent_region)
-        self.assertEqual("r2", r2.entrances[0].name)
+        self.assertEqual("foo", r2.entrances[0].name)
         self.assertEqual(EntranceType.ONE_WAY, r2.entrances[0].randomization_type)
         self.assertEqual(1, r2.entrances[0].randomization_group)
 
+    def test_disconnect_default_1way_no_vanilla_target_raises(self):
+        multiworld = generate_test_multiworld()
+        r1 = Region("r1", 1, multiworld)
+        r2 = Region("r2", 1, multiworld)
+        e = r1.create_exit("e")
+        e.randomization_type = EntranceType.ONE_WAY
+        e.randomization_group = 1
+        e.connect(r2)
+
+        with self.assertRaises(ValueError):
+            disconnect_entrance_for_randomization(e)
+
     def test_disconnect_uses_alternate_group(self):
         multiworld = generate_test_multiworld()
         r1 = Region("r1", 1, multiworld)
@@ -171,7 +183,7 @@ class TestDisconnectForRandomization(unittest.TestCase):
         e.randomization_group = 1
         e.connect(r2)
 
-        disconnect_entrance_for_randomization(e, 2)
+        disconnect_entrance_for_randomization(e, 2, "foo")
 
         self.assertIsNone(e.connected_region)
         self.assertEqual([], r1.entrances)
@@ -181,7 +193,7 @@ class TestDisconnectForRandomization(unittest.TestCase):
 
         self.assertEqual(1, len(r2.entrances))
         self.assertIsNone(r2.entrances[0].parent_region)
-        self.assertEqual("r2", r2.entrances[0].name)
+        self.assertEqual("foo", r2.entrances[0].name)
         self.assertEqual(EntranceType.ONE_WAY, r2.entrances[0].randomization_type)
         self.assertEqual(2, r2.entrances[0].randomization_group)
 
@@ -218,7 +230,7 @@ class TestRandomizeEntrances(unittest.TestCase):
         self.assertEqual(80, len(result.pairings))
         self.assertEqual(80, len(result.placements))
 
-    def test_coupling(self):
+    def test_coupled(self):
         """tests that in coupled mode, all 2 way transitions have an inverse"""
         multiworld = generate_test_multiworld()
         generate_disconnected_region_grid(multiworld, 5)
@@ -236,6 +248,36 @@ class TestRandomizeEntrances(unittest.TestCase):
         # if we didn't visit every placement the verification on_connect doesn't really mean much
         self.assertEqual(len(result.placements), seen_placement_count)
 
+    def test_uncoupled_succeeds_stage1_indirect_condition(self):
+        multiworld = generate_test_multiworld()
+        menu = multiworld.get_region("Menu", 1)
+        generate_entrance_pair(menu, "_right", ERTestGroups.RIGHT)
+        end = Region("End", 1, multiworld)
+        multiworld.regions.append(end)
+        generate_entrance_pair(end, "_left", ERTestGroups.LEFT)
+        multiworld.register_indirect_condition(end, None)
+
+        result = randomize_entrances(multiworld.worlds[1], False, directionally_matched_group_lookup)
+        self.assertSetEqual({
+            ("Menu_right", "End_left"),
+            ("End_left", "Menu_right")
+        }, set(result.pairings))
+
+    def test_coupled_succeeds_stage1_indirect_condition(self):
+        multiworld = generate_test_multiworld()
+        menu = multiworld.get_region("Menu", 1)
+        generate_entrance_pair(menu, "_right", ERTestGroups.RIGHT)
+        end = Region("End", 1, multiworld)
+        multiworld.regions.append(end)
+        generate_entrance_pair(end, "_left", ERTestGroups.LEFT)
+        multiworld.register_indirect_condition(end, None)
+
+        result = randomize_entrances(multiworld.worlds[1], True, directionally_matched_group_lookup)
+        self.assertSetEqual({
+            ("Menu_right", "End_left"),
+            ("End_left", "Menu_right")
+        }, set(result.pairings))
+
     def test_uncoupled(self):
         """tests that in uncoupled mode, no transitions have an (intentional) inverse"""
         multiworld = generate_test_multiworld()
diff --git a/test/multiworld/test_multiworlds.py b/test/multiworld/test_multiworlds.py
index 3c1d0e4544..203af8b63a 100644
--- a/test/multiworld/test_multiworlds.py
+++ b/test/multiworld/test_multiworlds.py
@@ -1,5 +1,5 @@
 import unittest
-from typing import List, Tuple
+from typing import ClassVar, List, Tuple
 from unittest import TestCase
 
 from BaseClasses import CollectionState, Location, MultiWorld
@@ -7,6 +7,7 @@ from Fill import distribute_items_restrictive
 from Options import Accessibility
 from worlds.AutoWorld import AutoWorldRegister, call_all, call_single
 from ..general import gen_steps, setup_multiworld
+from ..param import classvar_matrix
 
 
 class MultiworldTestBase(TestCase):
@@ -63,15 +64,18 @@ class TestAllGamesMultiworld(MultiworldTestBase):
             self.assertTrue(self.fulfills_accessibility(), "Collected all locations, but can't beat the game")
 
 
+@classvar_matrix(game=AutoWorldRegister.world_types.keys())
 class TestTwoPlayerMulti(MultiworldTestBase):
+    game: ClassVar[str]
+
     def test_two_player_single_game_fills(self) -> None:
         """Tests that a multiworld of two players for each registered game world can generate."""
-        for world_type in AutoWorldRegister.world_types.values():
-            self.multiworld = setup_multiworld([world_type, world_type], ())
-            for world in self.multiworld.worlds.values():
-                world.options.accessibility.value = Accessibility.option_full
-            self.assertSteps(gen_steps)
-            with self.subTest("filling multiworld", games=world_type.game, seed=self.multiworld.seed):
-                distribute_items_restrictive(self.multiworld)
-                call_all(self.multiworld, "post_fill")
-                self.assertTrue(self.fulfills_accessibility(), "Collected all locations, but can't beat the game")
+        world_type = AutoWorldRegister.world_types[self.game]
+        self.multiworld = setup_multiworld([world_type, world_type], ())
+        for world in self.multiworld.worlds.values():
+            world.options.accessibility.value = Accessibility.option_full
+        self.assertSteps(gen_steps)
+        with self.subTest("filling multiworld", games=world_type.game, seed=self.multiworld.seed):
+            distribute_items_restrictive(self.multiworld)
+            call_all(self.multiworld, "post_fill")
+            self.assertTrue(self.fulfills_accessibility(), "Collected all locations, but can't beat the game")
diff --git a/test/param.py b/test/param.py
new file mode 100644
index 0000000000..8127b10db9
--- /dev/null
+++ b/test/param.py
@@ -0,0 +1,46 @@
+import itertools
+import sys
+from typing import Any, Callable, Iterable
+
+
+def classvar_matrix(**kwargs: Iterable[Any]) -> Callable[[type], None]:
+    """
+    Create a new class for each variation of input, allowing to generate a TestCase matrix / parametrization that
+    supports multi-threading and has better reporting for ``unittest --durations=...`` and ``pytest --durations=...``
+    than subtests.
+
+    The kwargs will be set as ClassVars in the newly created classes. Use as ::
+
+        @classvar_matrix(var_name=[value1, value2])
+        class MyTestCase(unittest.TestCase):
+            var_name: typing.ClassVar[...]
+
+    :param kwargs: A dict of ClassVars to set, where key is the variable name and value is a list of all values.
+    :return: A decorator to be applied to a class.
+    """
+    keys: tuple[str]
+    values: Iterable[Iterable[Any]]
+    keys, values = zip(*kwargs.items())
+    values = map(lambda v: sorted(v) if isinstance(v, (set, frozenset)) else v, values)
+    permutations_dicts = [dict(zip(keys, v)) for v in itertools.product(*values)]
+
+    def decorator(cls: type) -> None:
+        mod = sys.modules[cls.__module__]
+
+        for permutation in permutations_dicts:
+
+            class Unrolled(cls):  # type: ignore
+                pass
+
+            for k, v in permutation.items():
+                setattr(Unrolled, k, v)
+            params = ", ".join([f"{k}={repr(v)}" for k, v in permutation.items()])
+            params = f"{{{params}}}"
+
+            Unrolled.__module__ = cls.__module__
+            Unrolled.__qualname__ = f"{cls.__qualname__}{params}"
+            setattr(mod, f"{cls.__name__}{params}", Unrolled)
+
+        return None
+
+    return decorator
diff --git a/worlds/_bizhawk/context.py b/worlds/_bizhawk/context.py
index 21c54d30c7..c9b1076644 100644
--- a/worlds/_bizhawk/context.py
+++ b/worlds/_bizhawk/context.py
@@ -276,6 +276,6 @@ def launch(*launch_args: str) -> None:
 
     Utils.init_logging("BizHawkClient", exception_logger="Client")
     import colorama
-    colorama.init()
+    colorama.just_fix_windows_console()
     asyncio.run(main())
     colorama.deinit()
diff --git a/worlds/ahit/Client.py b/worlds/ahit/Client.py
index cbb5f2a13d..0a9d8d6042 100644
--- a/worlds/ahit/Client.py
+++ b/worlds/ahit/Client.py
@@ -261,6 +261,6 @@ def launch():
     # options = Utils.get_options()
 
     import colorama
-    colorama.init()
+    colorama.just_fix_windows_console()
     asyncio.run(main())
     colorama.deinit()
diff --git a/worlds/ahit/Locations.py b/worlds/ahit/Locations.py
index b34e6bb4a7..713113e691 100644
--- a/worlds/ahit/Locations.py
+++ b/worlds/ahit/Locations.py
@@ -206,7 +206,7 @@ ahit_locations = {
     "Subcon Village - Graveyard Ice Cube": LocData(2000325077, "Subcon Forest Area"),
     "Subcon Village - House Top": LocData(2000325471, "Subcon Forest Area"),
     "Subcon Village - Ice Cube House": LocData(2000325469, "Subcon Forest Area"),
-    "Subcon Village - Snatcher Statue Chest": LocData(2000323730, "Subcon Forest Area", paintings=1),
+    "Subcon Village - Snatcher Statue Chest": LocData(2000323730, "Subcon Forest Behind Boss Firewall"),
     "Subcon Village - Stump Platform Chest": LocData(2000323729, "Subcon Forest Area"),
     "Subcon Forest - Giant Tree Climb": LocData(2000325470, "Subcon Forest Area"),
 
@@ -233,7 +233,7 @@ ahit_locations = {
     "Subcon Forest - Long Tree Climb Chest": LocData(2000323734, "Subcon Forest Area",
                                                      required_hats=[HatType.DWELLER], paintings=2),
 
-    "Subcon Forest - Boss Arena Chest": LocData(2000323735, "Subcon Forest Area"),
+    "Subcon Forest - Boss Arena Chest": LocData(2000323735, "Subcon Forest Boss Arena"),
 
     "Subcon Forest - Manor Rooftop": LocData(2000325466, "Subcon Forest Area",
                                              hit_type=HitType.dweller_bell, paintings=1),
@@ -411,7 +411,7 @@ act_completions = {
     "Act Completion (Mail Delivery Service)": LocData(2000312032, "Mail Delivery Service",
                                                       required_hats=[HatType.SPRINT]),
 
-    "Act Completion (Your Contract has Expired)": LocData(2000311390, "Your Contract has Expired",
+    "Act Completion (Your Contract has Expired)": LocData(2000311390, "Your Contract has Expired - Post Fight",
                                                           hit_type=HitType.umbrella),
 
     "Act Completion (Time Rift - Pipe)": LocData(2000313069, "Time Rift - Pipe", hookshot=True),
@@ -976,7 +976,6 @@ event_locs = {
     **snatcher_coins,
     "HUMT Access": LocData(0, "Heating Up Mafia Town"),
     "TOD Access": LocData(0, "Toilet of Doom"),
-    "YCHE Access": LocData(0, "Your Contract has Expired"),
     "AFR Access": LocData(0, "Alpine Free Roam"),
     "TIHS Access": LocData(0, "The Illness has Spread"),
 
diff --git a/worlds/ahit/Regions.py b/worlds/ahit/Regions.py
index 31edf1d0b0..857c04f1d7 100644
--- a/worlds/ahit/Regions.py
+++ b/worlds/ahit/Regions.py
@@ -347,7 +347,7 @@ def create_regions(world: "HatInTimeWorld"):
     sf_act3 = create_region_and_connect(world, "Toilet of Doom", "Subcon Forest - Act 3", subcon_forest)
     sf_act4 = create_region_and_connect(world, "Queen Vanessa's Manor", "Subcon Forest - Act 4", subcon_forest)
     sf_act5 = create_region_and_connect(world, "Mail Delivery Service", "Subcon Forest - Act 5", subcon_forest)
-    create_region_and_connect(world, "Your Contract has Expired", "Subcon Forest - Finale", subcon_forest)
+    sf_finale = create_region_and_connect(world, "Your Contract has Expired", "Subcon Forest - Finale", subcon_forest)
 
     # ------------------------------------------- ALPINE SKYLINE ------------------------------------------ #
     alpine_skyline = create_region_and_connect(world, "Alpine Skyline",  "Telescope -> Alpine Skyline", spaceship)
@@ -386,11 +386,24 @@ def create_regions(world: "HatInTimeWorld"):
     create_rift_connections(world, create_region(world, "Time Rift - Bazaar"))
 
     sf_area: Region = create_region(world, "Subcon Forest Area")
+    sf_behind_boss_firewall: Region = create_region(world, "Subcon Forest Behind Boss Firewall")
+    sf_boss_arena: Region = create_region(world, "Subcon Forest Boss Arena")
+    sf_area.connect(sf_behind_boss_firewall, "SF Area -> SF Behind Boss Firewall")
+    sf_behind_boss_firewall.connect(sf_boss_arena, "SF Behind Boss Firewall -> SF Boss Arena")
     sf_act1.connect(sf_area, "Subcon Forest Entrance CO")
     sf_act2.connect(sf_area, "Subcon Forest Entrance SW")
     sf_act3.connect(sf_area, "Subcon Forest Entrance TOD")
     sf_act4.connect(sf_area, "Subcon Forest Entrance QVM")
     sf_act5.connect(sf_area, "Subcon Forest Entrance MDS")
+    # YCHE puts the player directly in the boss arena, with no access to the rest of Subcon Forest by default.
+    sf_finale.connect(sf_boss_arena, "Subcon Forest Entrance YCHE")
+    # To support the Snatcher Hover expert logic for Act Completion (Your Contract has Expired), the act completion has
+    # to go in a separate region because the Snatcher Hover gives direct access to the Act Completion, but does not
+    # give access to the act itself.
+    sf_finale_post_fight: Region = create_region(world, "Your Contract has Expired - Post Fight")
+    # This connection must never have any rules placed on it because they will not be inherited when setting up act
+    # connections, only the rules for the entrances to the act and the rules for the Act Completion are inherited.
+    sf_finale.connect(sf_finale_post_fight, "YCHE -> YCHE - Post Fight")
 
     create_rift_connections(world, create_region(world, "Time Rift - Sleepy Subcon"))
     create_rift_connections(world, create_region(world, "Time Rift - Pipe"))
@@ -947,6 +960,16 @@ def get_shuffled_region(world: "HatInTimeWorld", region: str) -> str:
                     return name
 
 
+def get_region_shuffled_to(world: "HatInTimeWorld", region: str) -> str:
+    if world.options.ActRandomizer:
+        original_ci: str = chapter_act_info[region]
+        shuffled_ci = world.act_connections[original_ci]
+        return next(act_name for act_name, ci in chapter_act_info.items()
+                    if ci == shuffled_ci)
+    else:
+        return region
+
+
 def get_region_location_count(world: "HatInTimeWorld", region_name: str, included_only: bool = True) -> int:
     count = 0
     region = world.multiworld.get_region(region_name, world.player)
diff --git a/worlds/ahit/Rules.py b/worlds/ahit/Rules.py
index 6753b8eb81..2ca0628a68 100644
--- a/worlds/ahit/Rules.py
+++ b/worlds/ahit/Rules.py
@@ -481,9 +481,8 @@ def set_hard_rules(world: "HatInTimeWorld"):
     set_rule(world.multiworld.get_location("Subcon Forest - Dweller Platforming Tree B", world.player),
              lambda state: has_paintings(state, world, 3))
 
-    # Cherry bridge over boss arena gap (painting still expected)
-    set_rule(world.multiworld.get_location("Subcon Forest - Boss Arena Chest", world.player),
-             lambda state: has_paintings(state, world, 1, False) or state.has("YCHE Access", world.player))
+    # Cherry bridge over boss arena gap
+    set_rule(world.get_entrance("SF Behind Boss Firewall -> SF Boss Arena"), lambda state: True)
 
     set_rule(world.multiworld.get_location("Subcon Forest - Noose Treehouse", world.player),
              lambda state: has_paintings(state, world, 2, True))
@@ -566,27 +565,61 @@ def set_expert_rules(world: "HatInTimeWorld"):
              lambda state: True)
 
     # Expert: Cherry Hovering
-    subcon_area = world.multiworld.get_region("Subcon Forest Area", world.player)
-    yche = world.multiworld.get_region("Your Contract has Expired", world.player)
-    entrance = yche.connect(subcon_area, "Subcon Forest Entrance YCHE")
+    # Skipping the boss firewall is possible with a Cherry Hover.
+    set_rule(world.get_entrance("SF Area -> SF Behind Boss Firewall"),
+             lambda state: has_paintings(state, world, 1, True))
+    # The boss arena gap can be crossed in reverse with a Cherry Hover.
+    subcon_boss_arena = world.get_region("Subcon Forest Boss Arena")
+    subcon_behind_boss_firewall = world.get_region("Subcon Forest Behind Boss Firewall")
+    subcon_boss_arena.connect(subcon_behind_boss_firewall, "SF Boss Arena -> SF Behind Boss Firewall")
 
-    if world.options.NoPaintingSkips:
-        add_rule(entrance, lambda state: has_paintings(state, world, 1))
+    subcon_area = world.get_region("Subcon Forest Area")
+
+    # The boss firewall can be skipped in reverse with a Cherry Hover, but it is not possible to remove the boss
+    # firewall from reverse because the paintings to burn to remove the firewall are on the other side of the firewall.
+    # Therefore, a painting skip is required. The paintings could be burned by already having access to
+    # "Subcon Forest Area" through another entrance, but making a new connection to "Subcon Forest Area" in that case
+    # would be pointless.
+    if not world.options.NoPaintingSkips:
+        # The import cannot be done at the module-level because it would cause a circular import.
+        from .Regions import get_region_shuffled_to
+
+        subcon_behind_boss_firewall.connect(subcon_area, "SF Behind Boss Firewall -> SF Area")
+
+        # Because the Your Contract has Expired entrance can now reach "Subcon Forest Area", it needs to be connected to
+        # each of the Subcon Forest Time Rift entrances, like the other Subcon Forest Acts.
+        yche = world.get_region("Your Contract has Expired")
+
+        def connect_to_shuffled_act_at(original_act_name):
+            region_name = get_region_shuffled_to(world, original_act_name)
+            return yche.connect(world.get_region(region_name), f"{original_act_name} Portal - Entrance YCHE")
+
+        # Rules copied from `Rules.set_rift_rules()` with painting logic removed because painting skips must be
+        # available.
+        entrance = connect_to_shuffled_act_at("Time Rift - Pipe")
+        add_rule(entrance, lambda state: can_clear_required_act(state, world, "Subcon Forest - Act 2"))
+        reg_act_connection(world, world.get_entrance("Subcon Forest - Act 2").connected_region, entrance)
+
+        entrance = connect_to_shuffled_act_at("Time Rift - Village")
+        add_rule(entrance, lambda state: can_clear_required_act(state, world, "Subcon Forest - Act 4"))
+        reg_act_connection(world, world.get_entrance("Subcon Forest - Act 4").connected_region, entrance)
+
+        entrance = connect_to_shuffled_act_at("Time Rift - Sleepy Subcon")
+        add_rule(entrance, lambda state: has_relic_combo(state, world, "UFO"))
 
     set_rule(world.multiworld.get_location("Act Completion (Toilet of Doom)", world.player),
              lambda state: can_use_hookshot(state, world) and can_hit(state, world)
              and has_paintings(state, world, 1, True))
 
     # Set painting rules only. Skipping paintings is determined in has_paintings
-    set_rule(world.multiworld.get_location("Subcon Forest - Boss Arena Chest", world.player),
-             lambda state: has_paintings(state, world, 1, True))
     set_rule(world.multiworld.get_location("Subcon Forest - Magnet Badge Bush", world.player),
              lambda state: has_paintings(state, world, 3, True))
 
     # You can cherry hover to Snatcher's post-fight cutscene, which completes the level without having to fight him
-    subcon_area.connect(yche, "Snatcher Hover")
-    set_rule(world.multiworld.get_location("Act Completion (Your Contract has Expired)", world.player),
-             lambda state: True)
+    yche_post_fight = world.get_region("Your Contract has Expired - Post Fight")
+    subcon_area.connect(yche_post_fight, "Snatcher Hover")
+    # Cherry Hover from YCHE also works, so there are no requirements for the Act Completion.
+    set_rule(world.get_location("Act Completion (Your Contract has Expired)"), lambda state: True)
 
     if world.is_dlc2():
         # Expert: clear Rush Hour with nothing
@@ -681,12 +714,18 @@ def set_subcon_rules(world: "HatInTimeWorld"):
              lambda state: can_use_hat(state, world, HatType.BREWING) or state.has("Umbrella", world.player)
              or can_use_hat(state, world, HatType.DWELLER))
 
-    # You can't skip over the boss arena wall without cherry hover, so these two need to be set this way
-    set_rule(world.multiworld.get_location("Subcon Forest - Boss Arena Chest", world.player),
-             lambda state: state.has("TOD Access", world.player) and can_use_hookshot(state, world)
-             and has_paintings(state, world, 1, False) or state.has("YCHE Access", world.player))
+    # You can't skip over the boss arena wall without cherry hover.
+    set_rule(world.get_entrance("SF Area -> SF Behind Boss Firewall"),
+             lambda state: has_paintings(state, world, 1, False))
 
-    # The painting wall can't be skipped without cherry hover, which is Expert
+    # The hookpoints to cross the boss arena gap are only present in Toilet of Doom.
+    set_rule(world.get_entrance("SF Behind Boss Firewall -> SF Boss Arena"),
+             lambda state: state.has("TOD Access", world.player)
+             and can_use_hookshot(state, world))
+
+    # The Act Completion is in the Toilet of Doom region, so the same rules as passing the boss firewall and crossing
+    # the boss arena gap are required. "TOD Access" is implied from the region so does not need to be included in the
+    # rule.
     set_rule(world.multiworld.get_location("Act Completion (Toilet of Doom)", world.player),
              lambda state: can_use_hookshot(state, world) and can_hit(state, world)
              and has_paintings(state, world, 1, False))
diff --git a/worlds/alttp/Rom.py b/worlds/alttp/Rom.py
index f658b930d0..5ed048e881 100644
--- a/worlds/alttp/Rom.py
+++ b/worlds/alttp/Rom.py
@@ -515,10 +515,15 @@ def _populate_sprite_table():
                     logging.debug(f"Spritefile {file} could not be loaded as a valid sprite.")
 
             with concurrent.futures.ThreadPoolExecutor() as pool:
-                for dir in [user_path('data', 'sprites', 'alttpr'), user_path('data', 'sprites', 'custom')]:
+                sprite_paths = [user_path('data', 'sprites', 'alttpr'), user_path('data', 'sprites', 'custom')]
+                for dir in [dir for dir in sprite_paths if os.path.isdir(dir)]:
                     for file in os.listdir(dir):
                         pool.submit(load_sprite_from_file, os.path.join(dir, file))
 
+            if "link" not in _sprite_table:
+                logging.info("Link sprite was not loaded. Loading link from base rom")
+                load_sprite_from_file(get_base_rom_path())
+
 
 class Sprite():
     sprite_size = 28672
@@ -554,6 +559,11 @@ class Sprite():
             self.sprite = filedata[0x80000:0x87000]
             self.palette = filedata[0xDD308:0xDD380]
             self.glove_palette = filedata[0xDEDF5:0xDEDF9]
+            h = hashlib.md5()
+            h.update(filedata)
+            if h.hexdigest() == LTTPJPN10HASH:
+                self.name = "Link"
+                self.author_name = "Nintendo"
         elif filedata.startswith(b'ZSPR'):
             self.from_zspr(filedata, filename)
         else:
diff --git a/worlds/alttp/Rules.py b/worlds/alttp/Rules.py
index f13178c6c5..47992947ac 100644
--- a/worlds/alttp/Rules.py
+++ b/worlds/alttp/Rules.py
@@ -1120,28 +1120,28 @@ def toss_junk_item(world, player):
     raise Exception("Unable to find a junk item to toss to make room for a TR small key")
 
 
-def set_trock_key_rules(world, player):
+def set_trock_key_rules(multiworld, player):
     # First set all relevant locked doors to impassible.
     for entrance in ['Turtle Rock Dark Room Staircase', 'Turtle Rock (Chain Chomp Room) (North)', 'Turtle Rock (Chain Chomp Room) (South)', 'Turtle Rock Entrance to Pokey Room', 'Turtle Rock (Pokey Room) (South)', 'Turtle Rock (Pokey Room) (North)', 'Turtle Rock Big Key Door']:
-        set_rule(world.get_entrance(entrance, player), lambda state: False)
+        set_rule(multiworld.get_entrance(entrance, player), lambda state: False)
 
-    all_state = world.get_all_state(use_cache=False, allow_partial_entrances=True)
+    all_state = multiworld.get_all_state(use_cache=False, allow_partial_entrances=True)
     all_state.reachable_regions[player] = set()  # wipe reachable regions so that the locked doors actually work
     all_state.stale[player] = True
 
     # Check if each of the four main regions of the dungoen can be reached. The previous code section prevents key-costing moves within the dungeon.
-    can_reach_back = all_state.can_reach(world.get_region('Turtle Rock (Eye Bridge)', player))
-    can_reach_front = all_state.can_reach(world.get_region('Turtle Rock (Entrance)', player))
-    can_reach_big_chest = all_state.can_reach(world.get_region('Turtle Rock (Big Chest)', player))
-    can_reach_middle = all_state.can_reach(world.get_region('Turtle Rock (Second Section)', player))
+    can_reach_back = all_state.can_reach(multiworld.get_region('Turtle Rock (Eye Bridge)', player))
+    can_reach_front = all_state.can_reach(multiworld.get_region('Turtle Rock (Entrance)', player))
+    can_reach_big_chest = all_state.can_reach(multiworld.get_region('Turtle Rock (Big Chest)', player))
+    can_reach_middle = all_state.can_reach(multiworld.get_region('Turtle Rock (Second Section)', player))
 
     # If you can't enter from the back, the door to the front of TR requires only 2 small keys if the big key is in one of these chests since 2 key doors are locked behind the big key door.
     # If you can only enter from the middle, this includes all locations that can only be reached by exiting the front.  This can include Laser Bridge and Crystaroller if the front and back connect via Dark DM Ledge!
     front_locked_locations = {('Turtle Rock - Compass Chest', player), ('Turtle Rock - Roller Room - Left', player), ('Turtle Rock - Roller Room - Right', player)}
     if can_reach_middle and not can_reach_back and not can_reach_front:
         normal_regions = all_state.reachable_regions[player].copy()
-        set_rule(world.get_entrance('Turtle Rock (Chain Chomp Room) (South)', player), lambda state: True)
-        set_rule(world.get_entrance('Turtle Rock (Pokey Room) (South)', player), lambda state: True)
+        set_rule(multiworld.get_entrance('Turtle Rock (Chain Chomp Room) (South)', player), lambda state: True)
+        set_rule(multiworld.get_entrance('Turtle Rock (Pokey Room) (South)', player), lambda state: True)
         all_state.update_reachable_regions(player)
         front_locked_regions = all_state.reachable_regions[player].difference(normal_regions)
         front_locked_locations = set((location.name, player) for region in front_locked_regions for location in region.locations)
@@ -1151,37 +1151,38 @@ def set_trock_key_rules(world, player):
 
     # Big key door requires the big key, obviously. We removed this rule in the previous section to flag front_locked_locations correctly,
     # otherwise crystaroller room might not be properly marked as reachable through the back.
-    set_rule(world.get_entrance('Turtle Rock Big Key Door', player), lambda state: state.has('Big Key (Turtle Rock)', player))
+    set_rule(multiworld.get_entrance('Turtle Rock Big Key Door', player), lambda state: state.has('Big Key (Turtle Rock)', player) and can_kill_most_things(state, player, 10) and can_bomb_or_bonk(state, player))
+
 
     # No matter what, the key requirement for going from the middle to the bottom should be five keys.
-    set_rule(world.get_entrance('Turtle Rock Dark Room Staircase', player), lambda state: state._lttp_has_key('Small Key (Turtle Rock)', player, 5))
+    set_rule(multiworld.get_entrance('Turtle Rock Dark Room Staircase', player), lambda state: state._lttp_has_key('Small Key (Turtle Rock)', player, 5))
 
     # Now we need to set rules based on which entrances we have access to. The most important point is whether we have back access. If we have back access, we
     # might open all the locked doors in any order, so we need maximally restrictive rules.
     if can_reach_back:
-        set_rule(world.get_location('Turtle Rock - Big Key Chest', player), lambda state: (state._lttp_has_key('Small Key (Turtle Rock)', player, 6) or location_item_name(state, 'Turtle Rock - Big Key Chest', player) == ('Small Key (Turtle Rock)', player)))
-        set_rule(world.get_entrance('Turtle Rock (Chain Chomp Room) (South)', player), lambda state: state._lttp_has_key('Small Key (Turtle Rock)', player, 5))
-        set_rule(world.get_entrance('Turtle Rock (Pokey Room) (South)', player), lambda state: state._lttp_has_key('Small Key (Turtle Rock)', player, 6))
+        set_rule(multiworld.get_location('Turtle Rock - Big Key Chest', player), lambda state: (state._lttp_has_key('Small Key (Turtle Rock)', player, 6) or location_item_name(state, 'Turtle Rock - Big Key Chest', player) == ('Small Key (Turtle Rock)', player)))
+        set_rule(multiworld.get_entrance('Turtle Rock (Chain Chomp Room) (South)', player), lambda state: state._lttp_has_key('Small Key (Turtle Rock)', player, 5))
+        set_rule(multiworld.get_entrance('Turtle Rock (Pokey Room) (South)', player), lambda state: state._lttp_has_key('Small Key (Turtle Rock)', player, 6))
 
-        set_rule(world.get_entrance('Turtle Rock (Chain Chomp Room) (North)', player), lambda state: state._lttp_has_key('Small Key (Turtle Rock)', player, 6))
-        set_rule(world.get_entrance('Turtle Rock (Pokey Room) (North)', player), lambda state: state._lttp_has_key('Small Key (Turtle Rock)', player, 6))
-        set_rule(world.get_entrance('Turtle Rock Entrance to Pokey Room', player), lambda state: state._lttp_has_key('Small Key (Turtle Rock)', player, 5))
+        set_rule(multiworld.get_entrance('Turtle Rock (Chain Chomp Room) (North)', player), lambda state: state._lttp_has_key('Small Key (Turtle Rock)', player, 6))
+        set_rule(multiworld.get_entrance('Turtle Rock (Pokey Room) (North)', player), lambda state: state._lttp_has_key('Small Key (Turtle Rock)', player, 6))
+        set_rule(multiworld.get_entrance('Turtle Rock Entrance to Pokey Room', player), lambda state: state._lttp_has_key('Small Key (Turtle Rock)', player, 5))
     else:
         # Middle to front requires 3 keys if the back is locked by this door, otherwise 5
-        set_rule(world.get_entrance('Turtle Rock (Chain Chomp Room) (South)', player), lambda state: state._lttp_has_key('Small Key (Turtle Rock)', player, 3)
+        set_rule(multiworld.get_entrance('Turtle Rock (Chain Chomp Room) (South)', player), lambda state: state._lttp_has_key('Small Key (Turtle Rock)', player, 3)
                 if item_name_in_location_names(state, 'Big Key (Turtle Rock)', player, front_locked_locations.union({('Turtle Rock - Pokey 1 Key Drop', player)}))
                 else state._lttp_has_key('Small Key (Turtle Rock)', player, 5))
         # Middle to front requires 4 keys if the back is locked by this door, otherwise 6
-        set_rule(world.get_entrance('Turtle Rock (Pokey Room) (South)', player), lambda state: state._lttp_has_key('Small Key (Turtle Rock)', player, 4)
+        set_rule(multiworld.get_entrance('Turtle Rock (Pokey Room) (South)', player), lambda state: state._lttp_has_key('Small Key (Turtle Rock)', player, 4)
                 if item_name_in_location_names(state, 'Big Key (Turtle Rock)', player, front_locked_locations)
                 else state._lttp_has_key('Small Key (Turtle Rock)', player, 6))
 
         # Front to middle requires 3 keys (if the middle is accessible then these doors can be avoided, otherwise no keys can be wasted)
-        set_rule(world.get_entrance('Turtle Rock (Chain Chomp Room) (North)', player), lambda state: state._lttp_has_key('Small Key (Turtle Rock)', player, 3))
-        set_rule(world.get_entrance('Turtle Rock (Pokey Room) (North)', player), lambda state: state._lttp_has_key('Small Key (Turtle Rock)', player, 2))
-        set_rule(world.get_entrance('Turtle Rock Entrance to Pokey Room', player), lambda state: state._lttp_has_key('Small Key (Turtle Rock)', player, 1))
+        set_rule(multiworld.get_entrance('Turtle Rock (Chain Chomp Room) (North)', player), lambda state: state._lttp_has_key('Small Key (Turtle Rock)', player, 3))
+        set_rule(multiworld.get_entrance('Turtle Rock (Pokey Room) (North)', player), lambda state: state._lttp_has_key('Small Key (Turtle Rock)', player, 2))
+        set_rule(multiworld.get_entrance('Turtle Rock Entrance to Pokey Room', player), lambda state: state._lttp_has_key('Small Key (Turtle Rock)', player, 1))
 
-        set_rule(world.get_location('Turtle Rock - Big Key Chest', player), lambda state: state._lttp_has_key('Small Key (Turtle Rock)', player, tr_big_key_chest_keys_needed(state)))
+        set_rule(multiworld.get_location('Turtle Rock - Big Key Chest', player), lambda state: state._lttp_has_key('Small Key (Turtle Rock)', player, tr_big_key_chest_keys_needed(state)))
 
         def tr_big_key_chest_keys_needed(state):
             # This function handles the key requirements for the TR Big Chest in the situations it having the Big Key should logically require 2 keys, small key
@@ -1194,30 +1195,30 @@ def set_trock_key_rules(world, player):
             return 6
 
         # If TR is only accessible from the middle, the big key must be further restricted to prevent softlock potential
-        if not can_reach_front and not world.small_key_shuffle[player]:
+        if not can_reach_front and not multiworld.small_key_shuffle[player]:
             # Must not go in the Big Key Chest - only 1 other chest available and 2+ keys required for all other chests
-            forbid_item(world.get_location('Turtle Rock - Big Key Chest', player), 'Big Key (Turtle Rock)', player)
+            forbid_item(multiworld.get_location('Turtle Rock - Big Key Chest', player), 'Big Key (Turtle Rock)', player)
             if not can_reach_big_chest:
                 # Must not go in the Chain Chomps chest - only 2 other chests available and 3+ keys required for all other chests
-                forbid_item(world.get_location('Turtle Rock - Chain Chomps', player), 'Big Key (Turtle Rock)', player)
-                forbid_item(world.get_location('Turtle Rock - Pokey 2 Key Drop', player), 'Big Key (Turtle Rock)', player)
-            if world.accessibility[player] == 'full':
-                if world.big_key_shuffle[player] and can_reach_big_chest:
+                forbid_item(multiworld.get_location('Turtle Rock - Chain Chomps', player), 'Big Key (Turtle Rock)', player)
+                forbid_item(multiworld.get_location('Turtle Rock - Pokey 2 Key Drop', player), 'Big Key (Turtle Rock)', player)
+            if multiworld.accessibility[player] == 'full':
+                if multiworld.big_key_shuffle[player] and can_reach_big_chest:
                     # Must not go in the dungeon - all 3 available chests (Chomps, Big Chest, Crystaroller) must be keys to access laser bridge, and the big key is required first
                     for location in ['Turtle Rock - Chain Chomps', 'Turtle Rock - Compass Chest',
                                      'Turtle Rock - Pokey 1 Key Drop', 'Turtle Rock - Pokey 2 Key Drop',
                                      'Turtle Rock - Roller Room - Left', 'Turtle Rock - Roller Room - Right']:
-                        forbid_item(world.get_location(location, player), 'Big Key (Turtle Rock)', player)
+                        forbid_item(multiworld.get_location(location, player), 'Big Key (Turtle Rock)', player)
                 else:
                     # A key is required in the Big Key Chest to prevent a possible softlock.  Place an extra key to ensure 100% locations still works
-                    item = item_factory('Small Key (Turtle Rock)', world.worlds[player])
-                    location = world.get_location('Turtle Rock - Big Key Chest', player)
+                    item = item_factory('Small Key (Turtle Rock)', multiworld.worlds[player])
+                    location = multiworld.get_location('Turtle Rock - Big Key Chest', player)
                     location.place_locked_item(item)
-                    toss_junk_item(world, player)
+                    toss_junk_item(multiworld, player)
 
-    if world.accessibility[player] != 'full':
-        set_always_allow(world.get_location('Turtle Rock - Big Key Chest', player), lambda state, item: item.name == 'Small Key (Turtle Rock)' and item.player == player
-                and state.can_reach(state.multiworld.get_region('Turtle Rock (Second Section)', player)))
+    if multiworld.accessibility[player] != 'full':
+        set_always_allow(multiworld.get_location('Turtle Rock - Big Key Chest', player), lambda state, item: item.name == 'Small Key (Turtle Rock)' and item.player == player
+                                                                                                             and state.can_reach(state.multiworld.get_region('Turtle Rock (Second Section)', player)))
 
 
 def set_big_bomb_rules(world, player):
diff --git a/worlds/alttp/test/inverted/TestInvertedTurtleRock.py b/worlds/alttp/test/inverted/TestInvertedTurtleRock.py
index db3084b02a..21bcf70964 100644
--- a/worlds/alttp/test/inverted/TestInvertedTurtleRock.py
+++ b/worlds/alttp/test/inverted/TestInvertedTurtleRock.py
@@ -79,12 +79,12 @@ class TestInvertedTurtleRock(TestInverted):
             ["Turtle Rock - Crystaroller Room", False, [], ['Big Key (Turtle Rock)', 'Lamp']],
             ["Turtle Rock - Crystaroller Room", False, [], ['Magic Mirror', 'Cane of Somaria']],
             ["Turtle Rock - Crystaroller Room", False, ['Small Key (Turtle Rock)', 'Small Key (Turtle Rock)'], ['Magic Mirror', 'Small Key (Turtle Rock)']],
-            ["Turtle Rock - Crystaroller Room", True, ['Big Key (Turtle Rock)', 'Flute', 'Quake', 'Progressive Sword', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)']],
-            ["Turtle Rock - Crystaroller Room", True, ['Big Key (Turtle Rock)', 'Lamp', 'Progressive Glove', 'Quake', 'Progressive Sword', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)']],
-            ["Turtle Rock - Crystaroller Room", True, ['Big Key (Turtle Rock)', 'Lamp', 'Magic Mirror', 'Progressive Glove', 'Progressive Glove']],
-            ["Turtle Rock - Crystaroller Room", True, ['Big Key (Turtle Rock)', 'Lamp', 'Magic Mirror', 'Progressive Glove', 'Moon Pearl', 'Hookshot']],
-            ["Turtle Rock - Crystaroller Room", True, ['Big Key (Turtle Rock)', 'Moon Pearl', 'Flute', 'Magic Mirror', 'Hookshot']],
-            ["Turtle Rock - Crystaroller Room", True, ['Big Key (Turtle Rock)', 'Flute', 'Progressive Glove', 'Progressive Glove', 'Magic Mirror']],
+            ["Turtle Rock - Crystaroller Room", True, ['Big Key (Turtle Rock)', 'Bomb Upgrade (50)', 'Flute', 'Quake', 'Progressive Sword', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)']],
+            ["Turtle Rock - Crystaroller Room", True, ['Big Key (Turtle Rock)', 'Bomb Upgrade (50)', 'Lamp', 'Progressive Glove', 'Quake', 'Progressive Sword', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)']],
+            ["Turtle Rock - Crystaroller Room", True, ['Big Key (Turtle Rock)', 'Bomb Upgrade (50)', 'Lamp', 'Magic Mirror', 'Progressive Glove', 'Progressive Glove']],
+            ["Turtle Rock - Crystaroller Room", True, ['Big Key (Turtle Rock)', 'Bomb Upgrade (50)', 'Lamp', 'Magic Mirror', 'Progressive Glove', 'Moon Pearl', 'Hookshot']],
+            ["Turtle Rock - Crystaroller Room", True, ['Big Key (Turtle Rock)', 'Bomb Upgrade (50)', 'Moon Pearl', 'Flute', 'Magic Mirror', 'Hookshot']],
+            ["Turtle Rock - Crystaroller Room", True, ['Big Key (Turtle Rock)', 'Bomb Upgrade (50)', 'Flute', 'Progressive Glove', 'Progressive Glove', 'Magic Mirror']],
             ["Turtle Rock - Crystaroller Room", True, ['Lamp', 'Magic Mirror', 'Progressive Glove', 'Progressive Glove', 'Cane of Somaria']],
             ["Turtle Rock - Crystaroller Room", True, ['Lamp', 'Magic Mirror', 'Progressive Glove', 'Moon Pearl', 'Hookshot', 'Cane of Somaria']],
             ["Turtle Rock - Crystaroller Room", True, ['Lamp', 'Moon Pearl', 'Flute', 'Magic Mirror', 'Hookshot', 'Cane of Somaria']],
@@ -97,9 +97,9 @@ class TestInvertedTurtleRock(TestInverted):
             ["Turtle Rock - Boss", False, [], ['Big Key (Turtle Rock)']],
             ["Turtle Rock - Boss", False, [], ['Magic Mirror', 'Lamp']],
             ["Turtle Rock - Boss", False, ['Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)'], ['Small Key (Turtle Rock)']],
-            ["Turtle Rock - Boss", True, ['Ice Rod', 'Fire Rod', 'Lamp', 'Flute', 'Quake', 'Progressive Sword', 'Progressive Sword', 'Cane of Somaria', 'Bottle', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Big Key (Turtle Rock)']],
-            ["Turtle Rock - Boss", True, ['Ice Rod', 'Fire Rod', 'Lamp', 'Progressive Glove', 'Quake', 'Progressive Sword', 'Progressive Sword', 'Cane of Somaria', 'Bottle', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Big Key (Turtle Rock)']],
-            ["Turtle Rock - Boss", True, ['Ice Rod', 'Fire Rod', 'Lamp', 'Progressive Glove', 'Quake', 'Progressive Sword', 'Progressive Sword', 'Cane of Somaria', 'Magic Upgrade (1/2)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)','Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Big Key (Turtle Rock)']],
+            ["Turtle Rock - Boss", True, ['Ice Rod', 'Fire Rod', 'Lamp', 'Flute', 'Quake', 'Progressive Sword', 'Progressive Sword', 'Cane of Somaria', 'Bottle', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Bomb Upgrade (50)', 'Big Key (Turtle Rock)']],
+            ["Turtle Rock - Boss", True, ['Ice Rod', 'Fire Rod', 'Lamp', 'Progressive Glove', 'Quake', 'Progressive Sword', 'Progressive Sword', 'Cane of Somaria', 'Bottle', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Bomb Upgrade (50)', 'Big Key (Turtle Rock)']],
+            ["Turtle Rock - Boss", True, ['Ice Rod', 'Fire Rod', 'Lamp', 'Progressive Glove', 'Quake', 'Progressive Sword', 'Progressive Sword', 'Cane of Somaria', 'Magic Upgrade (1/2)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)','Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Bomb Upgrade (50)', 'Big Key (Turtle Rock)']],
             ["Turtle Rock - Boss", True, ['Ice Rod', 'Fire Rod', 'Lamp', 'Magic Mirror', 'Progressive Glove', 'Progressive Glove', 'Hammer', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Big Key (Turtle Rock)']],
             ["Turtle Rock - Boss", True, ['Ice Rod', 'Fire Rod', 'Flute', 'Magic Mirror', 'Moon Pearl', 'Hookshot', 'Hammer', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Big Key (Turtle Rock)']]
 
@@ -117,12 +117,12 @@ class TestInvertedTurtleRock(TestInverted):
             [location, False, [], ['Magic Mirror', 'Cane of Somaria']],
             [location, False, [], ['Magic Mirror', 'Lamp']],
             [location, False, ['Small Key (Turtle Rock)', 'Small Key (Turtle Rock)'], ['Magic Mirror', 'Small Key (Turtle Rock)']],
-            [location, True, ['Big Key (Turtle Rock)', 'Flute', 'Quake', 'Progressive Sword', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Lamp', 'Cane of Byrna']],
-            [location, True, ['Big Key (Turtle Rock)', 'Lamp', 'Progressive Glove', 'Quake', 'Progressive Sword', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Cane of Byrna']],
-            [location, True, ['Big Key (Turtle Rock)', 'Flute', 'Quake', 'Progressive Sword', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Lamp', 'Cape']],
-            [location, True, ['Big Key (Turtle Rock)', 'Lamp', 'Progressive Glove', 'Quake', 'Progressive Sword', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Cape']],
-            [location, True, ['Big Key (Turtle Rock)', 'Flute', 'Quake', 'Progressive Sword', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Lamp', 'Progressive Shield', 'Progressive Shield', 'Progressive Shield']],
-            [location, True, ['Big Key (Turtle Rock)', 'Lamp', 'Progressive Glove', 'Quake', 'Progressive Sword', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Progressive Shield', 'Progressive Shield', 'Progressive Shield']],
+            [location, True, ['Big Key (Turtle Rock)', 'Bomb Upgrade (50)', 'Flute', 'Quake', 'Progressive Sword', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Lamp', 'Cane of Byrna']],
+            [location, True, ['Big Key (Turtle Rock)', 'Bomb Upgrade (50)', 'Lamp', 'Progressive Glove', 'Quake', 'Progressive Sword', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Cane of Byrna']],
+            [location, True, ['Big Key (Turtle Rock)', 'Bomb Upgrade (50)', 'Flute', 'Quake', 'Progressive Sword', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Lamp', 'Cape']],
+            [location, True, ['Big Key (Turtle Rock)', 'Bomb Upgrade (50)', 'Lamp', 'Progressive Glove', 'Quake', 'Progressive Sword', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Cape']],
+            [location, True, ['Big Key (Turtle Rock)', 'Bomb Upgrade (50)', 'Flute', 'Quake', 'Progressive Sword', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Lamp', 'Progressive Shield', 'Progressive Shield', 'Progressive Shield']],
+            [location, True, ['Big Key (Turtle Rock)', 'Bomb Upgrade (50)', 'Lamp', 'Progressive Glove', 'Quake', 'Progressive Sword', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Progressive Shield', 'Progressive Shield', 'Progressive Shield']],
 
             # Mirroring into Eye Bridge does not require Cane of Somaria
             [location, True, ['Lamp', 'Magic Mirror', 'Progressive Glove', 'Progressive Glove', 'Cane of Byrna']],
diff --git a/worlds/alttp/test/inverted_minor_glitches/TestInvertedTurtleRock.py b/worlds/alttp/test/inverted_minor_glitches/TestInvertedTurtleRock.py
index a416e1b35d..343cf3f8b1 100644
--- a/worlds/alttp/test/inverted_minor_glitches/TestInvertedTurtleRock.py
+++ b/worlds/alttp/test/inverted_minor_glitches/TestInvertedTurtleRock.py
@@ -80,12 +80,12 @@ class TestInvertedTurtleRock(TestInvertedMinor):
             ["Turtle Rock - Crystaroller Room", False, [], ['Big Key (Turtle Rock)', 'Lamp']],
             ["Turtle Rock - Crystaroller Room", False, [], ['Magic Mirror', 'Cane of Somaria']],
             ["Turtle Rock - Crystaroller Room", False, ['Small Key (Turtle Rock)', 'Small Key (Turtle Rock)'], ['Magic Mirror', 'Small Key (Turtle Rock)']],
-            ["Turtle Rock - Crystaroller Room", True, ['Big Key (Turtle Rock)', 'Flute', 'Quake', 'Progressive Sword', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)']],
-            ["Turtle Rock - Crystaroller Room", True, ['Big Key (Turtle Rock)', 'Lamp', 'Progressive Glove', 'Quake', 'Progressive Sword', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)']],
-            ["Turtle Rock - Crystaroller Room", True, ['Big Key (Turtle Rock)', 'Lamp', 'Magic Mirror', 'Progressive Glove', 'Progressive Glove']],
-            ["Turtle Rock - Crystaroller Room", True, ['Big Key (Turtle Rock)', 'Lamp', 'Magic Mirror', 'Progressive Glove', 'Moon Pearl', 'Hookshot']],
-            ["Turtle Rock - Crystaroller Room", True, ['Big Key (Turtle Rock)', 'Moon Pearl', 'Flute', 'Magic Mirror', 'Hookshot']],
-            ["Turtle Rock - Crystaroller Room", True, ['Big Key (Turtle Rock)', 'Flute', 'Progressive Glove', 'Progressive Glove', 'Magic Mirror']],
+            ["Turtle Rock - Crystaroller Room", True, ['Big Key (Turtle Rock)', 'Bomb Upgrade (50)', 'Flute', 'Quake', 'Progressive Sword', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)']],
+            ["Turtle Rock - Crystaroller Room", True, ['Big Key (Turtle Rock)', 'Bomb Upgrade (50)', 'Lamp', 'Progressive Glove', 'Quake', 'Progressive Sword', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)']],
+            ["Turtle Rock - Crystaroller Room", True, ['Big Key (Turtle Rock)', 'Bomb Upgrade (50)', 'Lamp', 'Magic Mirror', 'Progressive Glove', 'Progressive Glove']],
+            ["Turtle Rock - Crystaroller Room", True, ['Big Key (Turtle Rock)', 'Bomb Upgrade (50)', 'Lamp', 'Magic Mirror', 'Progressive Glove', 'Moon Pearl', 'Hookshot']],
+            ["Turtle Rock - Crystaroller Room", True, ['Big Key (Turtle Rock)', 'Bomb Upgrade (50)', 'Moon Pearl', 'Flute', 'Magic Mirror', 'Hookshot']],
+            ["Turtle Rock - Crystaroller Room", True, ['Big Key (Turtle Rock)', 'Bomb Upgrade (50)', 'Flute', 'Progressive Glove', 'Progressive Glove', 'Magic Mirror']],
             ["Turtle Rock - Crystaroller Room", True, ['Lamp', 'Magic Mirror', 'Progressive Glove', 'Progressive Glove', 'Cane of Somaria']],
             ["Turtle Rock - Crystaroller Room", True, ['Lamp', 'Magic Mirror', 'Progressive Glove', 'Moon Pearl', 'Hookshot', 'Cane of Somaria']],
             ["Turtle Rock - Crystaroller Room", True, ['Lamp', 'Moon Pearl', 'Flute', 'Magic Mirror', 'Hookshot', 'Cane of Somaria']],
@@ -98,9 +98,9 @@ class TestInvertedTurtleRock(TestInvertedMinor):
             ["Turtle Rock - Boss", False, [], ['Big Key (Turtle Rock)']],
             ["Turtle Rock - Boss", False, [], ['Magic Mirror', 'Lamp']],
             ["Turtle Rock - Boss", False, ['Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)'], ['Small Key (Turtle Rock)']],
-            ["Turtle Rock - Boss", True, ['Ice Rod', 'Fire Rod', 'Lamp', 'Flute', 'Quake', 'Progressive Sword', 'Progressive Sword', 'Cane of Somaria', 'Bottle', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Big Key (Turtle Rock)']],
-            ["Turtle Rock - Boss", True, ['Ice Rod', 'Fire Rod', 'Lamp', 'Progressive Glove', 'Quake', 'Progressive Sword', 'Progressive Sword', 'Cane of Somaria', 'Bottle', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Big Key (Turtle Rock)']],
-            ["Turtle Rock - Boss", True, ['Ice Rod', 'Fire Rod', 'Lamp', 'Progressive Glove', 'Quake', 'Progressive Sword', 'Progressive Sword', 'Cane of Somaria', 'Magic Upgrade (1/2)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)','Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Big Key (Turtle Rock)']],
+            ["Turtle Rock - Boss", True, ['Ice Rod', 'Fire Rod', 'Lamp', 'Flute', 'Quake', 'Progressive Sword', 'Progressive Sword', 'Cane of Somaria', 'Bottle', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Bomb Upgrade (50)', 'Big Key (Turtle Rock)']],
+            ["Turtle Rock - Boss", True, ['Ice Rod', 'Fire Rod', 'Lamp', 'Progressive Glove', 'Quake', 'Progressive Sword', 'Progressive Sword', 'Cane of Somaria', 'Bottle', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Bomb Upgrade (50)', 'Big Key (Turtle Rock)']],
+            ["Turtle Rock - Boss", True, ['Ice Rod', 'Fire Rod', 'Lamp', 'Progressive Glove', 'Quake', 'Progressive Sword', 'Progressive Sword', 'Cane of Somaria', 'Magic Upgrade (1/2)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)','Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Bomb Upgrade (50)', 'Big Key (Turtle Rock)']],
             ["Turtle Rock - Boss", True, ['Ice Rod', 'Fire Rod', 'Lamp', 'Magic Mirror', 'Progressive Glove', 'Progressive Glove', 'Hammer', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Big Key (Turtle Rock)']],
             ["Turtle Rock - Boss", True, ['Ice Rod', 'Fire Rod', 'Flute', 'Magic Mirror', 'Moon Pearl', 'Hookshot', 'Hammer', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Big Key (Turtle Rock)']]
         ])
@@ -116,12 +116,12 @@ class TestInvertedTurtleRock(TestInvertedMinor):
             [location, False, [], ['Magic Mirror', 'Cane of Somaria']],
             [location, False, [], ['Magic Mirror', 'Lamp']],
             [location, False, ['Small Key (Turtle Rock)', 'Small Key (Turtle Rock)'], ['Magic Mirror', 'Small Key (Turtle Rock)']],
-            [location, True, ['Big Key (Turtle Rock)', 'Flute', 'Quake', 'Progressive Sword', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Lamp', 'Cane of Byrna']],
-            [location, True, ['Big Key (Turtle Rock)', 'Lamp', 'Progressive Glove', 'Quake', 'Progressive Sword', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Cane of Byrna']],
-            [location, True, ['Big Key (Turtle Rock)', 'Flute', 'Quake', 'Progressive Sword', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Lamp', 'Cape']],
-            [location, True, ['Big Key (Turtle Rock)', 'Lamp', 'Progressive Glove', 'Quake', 'Progressive Sword', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Cape']],
-            [location, True, ['Big Key (Turtle Rock)', 'Flute', 'Quake', 'Progressive Sword', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Lamp', 'Progressive Shield', 'Progressive Shield', 'Progressive Shield']],
-            [location, True, ['Big Key (Turtle Rock)', 'Lamp', 'Progressive Glove', 'Quake', 'Progressive Sword', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Progressive Shield', 'Progressive Shield', 'Progressive Shield']],
+            [location, True, ['Big Key (Turtle Rock)', 'Bomb Upgrade (50)', 'Flute', 'Quake', 'Progressive Sword', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Lamp', 'Cane of Byrna']],
+            [location, True, ['Big Key (Turtle Rock)', 'Bomb Upgrade (50)',  'Lamp', 'Progressive Glove', 'Quake', 'Progressive Sword', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Cane of Byrna']],
+            [location, True, ['Big Key (Turtle Rock)', 'Bomb Upgrade (50)',  'Flute', 'Quake', 'Progressive Sword', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Lamp', 'Cape']],
+            [location, True, ['Big Key (Turtle Rock)', 'Bomb Upgrade (50)',  'Lamp', 'Progressive Glove', 'Quake', 'Progressive Sword', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Cape']],
+            [location, True, ['Big Key (Turtle Rock)', 'Bomb Upgrade (50)',  'Flute', 'Quake', 'Progressive Sword', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Lamp', 'Progressive Shield', 'Progressive Shield', 'Progressive Shield']],
+            [location, True, ['Big Key (Turtle Rock)', 'Bomb Upgrade (50)',  'Lamp', 'Progressive Glove', 'Quake', 'Progressive Sword', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Progressive Shield', 'Progressive Shield', 'Progressive Shield']],
 
             # Mirroring into Eye Bridge does not require Cane of Somaria
             [location, True, ['Lamp', 'Magic Mirror', 'Progressive Glove', 'Progressive Glove', 'Cane of Byrna']],
diff --git a/worlds/alttp/test/inverted_owg/TestDungeons.py b/worlds/alttp/test/inverted_owg/TestDungeons.py
index ada1b92fca..595587f006 100644
--- a/worlds/alttp/test/inverted_owg/TestDungeons.py
+++ b/worlds/alttp/test/inverted_owg/TestDungeons.py
@@ -102,7 +102,7 @@ class TestDungeons(TestInvertedOWG):
             ["Turtle Rock - Chain Chomps", True, ['Progressive Sword', 'Progressive Sword', 'Pegasus Boots']],
 
             ["Turtle Rock - Crystaroller Room", False, []],
-            ["Turtle Rock - Crystaroller Room", True, ['Pegasus Boots', 'Magic Mirror', 'Moon Pearl', 'Big Key (Turtle Rock)']],
+            ["Turtle Rock - Crystaroller Room", True, ['Pegasus Boots', 'Magic Mirror', 'Moon Pearl', 'Big Key (Turtle Rock)', 'Bomb Upgrade (50)']],
             ["Turtle Rock - Crystaroller Room", True, ['Pegasus Boots', 'Magic Mirror', 'Moon Pearl', 'Lamp', 'Cane of Somaria']],
 
             ["Ganons Tower - Hope Room - Left", False, []],
diff --git a/worlds/alttp/test/owg/TestDungeons.py b/worlds/alttp/test/owg/TestDungeons.py
index 2e55b308d3..e9b1fde285 100644
--- a/worlds/alttp/test/owg/TestDungeons.py
+++ b/worlds/alttp/test/owg/TestDungeons.py
@@ -120,8 +120,8 @@ class TestDungeons(TestVanillaOWG):
             #todo: does clip require sword?
             #["Turtle Rock - Crystaroller Room", True, ['Moon Pearl', 'Pegasus Boots', 'Big Key (Turtle Rock)']],
             ["Turtle Rock - Crystaroller Room", True, ['Moon Pearl', 'Pegasus Boots', 'Big Key (Turtle Rock)', 'Progressive Sword']],
-            ["Turtle Rock - Crystaroller Room", True, ['Moon Pearl', 'Pegasus Boots', 'Big Key (Turtle Rock)', 'Hookshot']],
-            ["Turtle Rock - Crystaroller Room", True, ['Pegasus Boots', 'Magic Mirror', 'Big Key (Turtle Rock)']],
+            ["Turtle Rock - Crystaroller Room", True, ['Moon Pearl', 'Pegasus Boots', 'Big Key (Turtle Rock)', 'Hookshot', 'Bomb Upgrade (50)']],
+            ["Turtle Rock - Crystaroller Room", True, ['Pegasus Boots', 'Magic Mirror', 'Big Key (Turtle Rock)', 'Bomb Upgrade (50)']],
 
             ["Ganons Tower - Hope Room - Left", False, []],
             ["Ganons Tower - Hope Room - Left", False, ['Moon Pearl', 'Crystal 1']],
diff --git a/worlds/celeste64/CHANGELOG.md b/worlds/celeste64/CHANGELOG.md
index 5e562e17f4..3c37b4fcfe 100644
--- a/worlds/celeste64/CHANGELOG.md
+++ b/worlds/celeste64/CHANGELOG.md
@@ -1,6 +1,31 @@
 # Celeste 64 - Changelog
 
 
+## v1.3
+
+### Features:
+
+- New optional Location Checks
+	- Checkpointsanity
+- Hair Color
+	- Allows for setting of Maddy's hair color in each of No Dash, One Dash, Two Dash, and Feather states
+- Other Player Ghosts
+	- A game config option allows you to see ghosts of other Celeste 64 players in the multiworld
+
+### Quality of Life:
+
+- Checkpoint Warping
+	- Received Checkpoint items allow for warping to their respective checkpoint
+		- These items are on their respective checkpoint location if Checkpointsanity is disabled
+	- Logic accounts for being able to warp to otherwise inaccessible areas
+	- Checkpoints are a possible option for a starting item on Standard Logic + Move Shuffle + Checkpointsanity
+- New Options toggle to enable/disable background input
+
+### Bug Fixes:
+
+- Traffic Blocks now correctly appear disabled within Cassettes
+
+
 ## v1.2
 
 ### Features:
diff --git a/worlds/celeste64/Items.py b/worlds/celeste64/Items.py
index 36c9f670c7..b173ebc691 100644
--- a/worlds/celeste64/Items.py
+++ b/worlds/celeste64/Items.py
@@ -39,6 +39,22 @@ move_item_data_table: Dict[str, Celeste64ItemData] = {
     ItemName.climb:       Celeste64ItemData(celeste_64_base_id + 0xD, ItemClassification.progression),
 }
 
-item_data_table: Dict[str, Celeste64ItemData] = {**collectable_item_data_table, **unlockable_item_data_table, **move_item_data_table}
+checkpoint_item_data_table: Dict[str, Celeste64ItemData] = {
+    ItemName.checkpoint_1:  Celeste64ItemData(celeste_64_base_id + 0x20, ItemClassification.progression),
+    ItemName.checkpoint_2:  Celeste64ItemData(celeste_64_base_id + 0x21, ItemClassification.progression),
+    ItemName.checkpoint_3:  Celeste64ItemData(celeste_64_base_id + 0x22, ItemClassification.progression),
+    ItemName.checkpoint_4:  Celeste64ItemData(celeste_64_base_id + 0x23, ItemClassification.progression),
+    ItemName.checkpoint_5:  Celeste64ItemData(celeste_64_base_id + 0x24, ItemClassification.progression),
+    ItemName.checkpoint_6:  Celeste64ItemData(celeste_64_base_id + 0x25, ItemClassification.progression),
+    ItemName.checkpoint_7:  Celeste64ItemData(celeste_64_base_id + 0x26, ItemClassification.progression),
+    ItemName.checkpoint_8:  Celeste64ItemData(celeste_64_base_id + 0x27, ItemClassification.progression),
+    ItemName.checkpoint_9:  Celeste64ItemData(celeste_64_base_id + 0x28, ItemClassification.progression),
+    ItemName.checkpoint_10: Celeste64ItemData(celeste_64_base_id + 0x29, ItemClassification.progression),
+}
+
+item_data_table: Dict[str, Celeste64ItemData] = {**collectable_item_data_table,
+                                                 **unlockable_item_data_table,
+                                                 **move_item_data_table,
+                                                 **checkpoint_item_data_table}
 
 item_table = {name: data.code for name, data in item_data_table.items() if data.code is not None}
diff --git a/worlds/celeste64/Locations.py b/worlds/celeste64/Locations.py
index 6341529da3..9e202eca12 100644
--- a/worlds/celeste64/Locations.py
+++ b/worlds/celeste64/Locations.py
@@ -1,7 +1,7 @@
 from typing import Dict, NamedTuple, Optional
 
 from BaseClasses import Location
-from .Names import LocationName
+from .Names import LocationName, RegionName
 
 
 celeste_64_base_id: int = 0xCA0000
@@ -17,66 +17,80 @@ class Celeste64LocationData(NamedTuple):
 
 
 strawberry_location_data_table: Dict[str, Celeste64LocationData] = {
-    LocationName.strawberry_1:  Celeste64LocationData("Forsaken City", celeste_64_base_id + 0x00),
-    LocationName.strawberry_2:  Celeste64LocationData("Forsaken City", celeste_64_base_id + 0x01),
-    LocationName.strawberry_3:  Celeste64LocationData("Forsaken City", celeste_64_base_id + 0x02),
-    LocationName.strawberry_4:  Celeste64LocationData("Forsaken City", celeste_64_base_id + 0x03),
-    LocationName.strawberry_5:  Celeste64LocationData("Forsaken City", celeste_64_base_id + 0x04),
-    LocationName.strawberry_6:  Celeste64LocationData("Forsaken City", celeste_64_base_id + 0x05),
-    LocationName.strawberry_7:  Celeste64LocationData("Forsaken City", celeste_64_base_id + 0x06),
-    LocationName.strawberry_8:  Celeste64LocationData("Forsaken City", celeste_64_base_id + 0x07),
-    LocationName.strawberry_9:  Celeste64LocationData("Forsaken City", celeste_64_base_id + 0x08),
-    LocationName.strawberry_10: Celeste64LocationData("Forsaken City", celeste_64_base_id + 0x09),
-    LocationName.strawberry_11: Celeste64LocationData("Forsaken City", celeste_64_base_id + 0x0A),
-    LocationName.strawberry_12: Celeste64LocationData("Forsaken City", celeste_64_base_id + 0x0B),
-    LocationName.strawberry_13: Celeste64LocationData("Forsaken City", celeste_64_base_id + 0x0C),
-    LocationName.strawberry_14: Celeste64LocationData("Forsaken City", celeste_64_base_id + 0x0D),
-    LocationName.strawberry_15: Celeste64LocationData("Forsaken City", celeste_64_base_id + 0x0E),
-    LocationName.strawberry_16: Celeste64LocationData("Forsaken City", celeste_64_base_id + 0x0F),
-    LocationName.strawberry_17: Celeste64LocationData("Forsaken City", celeste_64_base_id + 0x10),
-    LocationName.strawberry_18: Celeste64LocationData("Forsaken City", celeste_64_base_id + 0x11),
-    LocationName.strawberry_19: Celeste64LocationData("Forsaken City", celeste_64_base_id + 0x12),
-    LocationName.strawberry_20: Celeste64LocationData("Forsaken City", celeste_64_base_id + 0x13),
-    LocationName.strawberry_21: Celeste64LocationData("Forsaken City", celeste_64_base_id + 0x14),
-    LocationName.strawberry_22: Celeste64LocationData("Forsaken City", celeste_64_base_id + 0x15),
-    LocationName.strawberry_23: Celeste64LocationData("Forsaken City", celeste_64_base_id + 0x16),
-    LocationName.strawberry_24: Celeste64LocationData("Forsaken City", celeste_64_base_id + 0x17),
-    LocationName.strawberry_25: Celeste64LocationData("Forsaken City", celeste_64_base_id + 0x18),
-    LocationName.strawberry_26: Celeste64LocationData("Forsaken City", celeste_64_base_id + 0x19),
-    LocationName.strawberry_27: Celeste64LocationData("Forsaken City", celeste_64_base_id + 0x1A),
-    LocationName.strawberry_28: Celeste64LocationData("Forsaken City", celeste_64_base_id + 0x1B),
-    LocationName.strawberry_29: Celeste64LocationData("Forsaken City", celeste_64_base_id + 0x1C),
-    LocationName.strawberry_30: Celeste64LocationData("Forsaken City", celeste_64_base_id + 0x1D),
+    LocationName.strawberry_1:  Celeste64LocationData(RegionName.intro_islands,        celeste_64_base_id + 0x00),
+    LocationName.strawberry_2:  Celeste64LocationData(RegionName.granny_island,        celeste_64_base_id + 0x01),
+    LocationName.strawberry_3:  Celeste64LocationData(RegionName.granny_island,        celeste_64_base_id + 0x02),
+    LocationName.strawberry_4:  Celeste64LocationData(RegionName.granny_island,        celeste_64_base_id + 0x03),
+    LocationName.strawberry_5:  Celeste64LocationData(RegionName.granny_island,        celeste_64_base_id + 0x04),
+    LocationName.strawberry_6:  Celeste64LocationData(RegionName.highway_island,       celeste_64_base_id + 0x05),
+    LocationName.strawberry_7:  Celeste64LocationData(RegionName.highway_island,       celeste_64_base_id + 0x06),
+    LocationName.strawberry_8:  Celeste64LocationData(RegionName.nw_girders_island,    celeste_64_base_id + 0x07),
+    LocationName.strawberry_9:  Celeste64LocationData(RegionName.granny_island,        celeste_64_base_id + 0x08),
+    LocationName.strawberry_10: Celeste64LocationData(RegionName.granny_island,        celeste_64_base_id + 0x09),
+    LocationName.strawberry_11: Celeste64LocationData(RegionName.granny_island,        celeste_64_base_id + 0x0A),
+    LocationName.strawberry_12: Celeste64LocationData(RegionName.badeline_tower_lower, celeste_64_base_id + 0x0B),
+    LocationName.strawberry_13: Celeste64LocationData(RegionName.highway_island,       celeste_64_base_id + 0x0C),
+    LocationName.strawberry_14: Celeste64LocationData(RegionName.ne_feathers_island,   celeste_64_base_id + 0x0D),
+    LocationName.strawberry_15: Celeste64LocationData(RegionName.ne_feathers_island,   celeste_64_base_id + 0x0E),
+    LocationName.strawberry_16: Celeste64LocationData(RegionName.ne_feathers_island,   celeste_64_base_id + 0x0F),
+    LocationName.strawberry_17: Celeste64LocationData(RegionName.se_house_island,      celeste_64_base_id + 0x10),
+    LocationName.strawberry_18: Celeste64LocationData(RegionName.se_house_island,      celeste_64_base_id + 0x11),
+    LocationName.strawberry_19: Celeste64LocationData(RegionName.se_house_island,      celeste_64_base_id + 0x12),
+    LocationName.strawberry_20: Celeste64LocationData(RegionName.badeline_tower_lower, celeste_64_base_id + 0x13),
+    LocationName.strawberry_21: Celeste64LocationData(RegionName.granny_island,        celeste_64_base_id + 0x14),
+    LocationName.strawberry_22: Celeste64LocationData(RegionName.granny_island,        celeste_64_base_id + 0x15),
+    LocationName.strawberry_23: Celeste64LocationData(RegionName.highway_island,       celeste_64_base_id + 0x16),
+    LocationName.strawberry_24: Celeste64LocationData(RegionName.granny_island,        celeste_64_base_id + 0x17),
+    LocationName.strawberry_25: Celeste64LocationData(RegionName.se_house_island,      celeste_64_base_id + 0x18),
+    LocationName.strawberry_26: Celeste64LocationData(RegionName.highway_island,       celeste_64_base_id + 0x19),
+    LocationName.strawberry_27: Celeste64LocationData(RegionName.ne_feathers_island,   celeste_64_base_id + 0x1A),
+    LocationName.strawberry_28: Celeste64LocationData(RegionName.ne_feathers_island,   celeste_64_base_id + 0x1B),
+    LocationName.strawberry_29: Celeste64LocationData(RegionName.badeline_tower_upper, celeste_64_base_id + 0x1C),
+    LocationName.strawberry_30: Celeste64LocationData(RegionName.badeline_island,      celeste_64_base_id + 0x1D),
 }
 
 friend_location_data_table: Dict[str, Celeste64LocationData] = {
-    LocationName.granny_1:   Celeste64LocationData("Forsaken City", celeste_64_base_id + 0x100 + 0x00),
-    LocationName.granny_2:   Celeste64LocationData("Forsaken City", celeste_64_base_id + 0x100 + 0x01),
-    LocationName.granny_3:   Celeste64LocationData("Forsaken City", celeste_64_base_id + 0x100 + 0x02),
-    LocationName.theo_1:     Celeste64LocationData("Forsaken City", celeste_64_base_id + 0x100 + 0x03),
-    LocationName.theo_2:     Celeste64LocationData("Forsaken City", celeste_64_base_id + 0x100 + 0x04),
-    LocationName.theo_3:     Celeste64LocationData("Forsaken City", celeste_64_base_id + 0x100 + 0x05),
-    LocationName.badeline_1: Celeste64LocationData("Forsaken City", celeste_64_base_id + 0x100 + 0x06),
-    LocationName.badeline_2: Celeste64LocationData("Forsaken City", celeste_64_base_id + 0x100 + 0x07),
-    LocationName.badeline_3: Celeste64LocationData("Forsaken City", celeste_64_base_id + 0x100 + 0x08),
+    LocationName.granny_1:   Celeste64LocationData(RegionName.granny_island,   celeste_64_base_id + 0x100 + 0x00),
+    LocationName.granny_2:   Celeste64LocationData(RegionName.granny_island,   celeste_64_base_id + 0x100 + 0x01),
+    LocationName.granny_3:   Celeste64LocationData(RegionName.granny_island,   celeste_64_base_id + 0x100 + 0x02),
+    LocationName.theo_1:     Celeste64LocationData(RegionName.granny_island,   celeste_64_base_id + 0x100 + 0x03),
+    LocationName.theo_2:     Celeste64LocationData(RegionName.granny_island,   celeste_64_base_id + 0x100 + 0x04),
+    LocationName.theo_3:     Celeste64LocationData(RegionName.granny_island,   celeste_64_base_id + 0x100 + 0x05),
+    LocationName.badeline_1: Celeste64LocationData(RegionName.badeline_island, celeste_64_base_id + 0x100 + 0x06),
+    LocationName.badeline_2: Celeste64LocationData(RegionName.badeline_island, celeste_64_base_id + 0x100 + 0x07),
+    LocationName.badeline_3: Celeste64LocationData(RegionName.badeline_island, celeste_64_base_id + 0x100 + 0x08),
 }
 
 sign_location_data_table: Dict[str, Celeste64LocationData] = {
-    LocationName.sign_1: Celeste64LocationData("Forsaken City", celeste_64_base_id + 0x200 + 0x00),
-    LocationName.sign_2: Celeste64LocationData("Forsaken City", celeste_64_base_id + 0x200 + 0x01),
-    LocationName.sign_3: Celeste64LocationData("Forsaken City", celeste_64_base_id + 0x200 + 0x02),
-    LocationName.sign_4: Celeste64LocationData("Forsaken City", celeste_64_base_id + 0x200 + 0x03),
-    LocationName.sign_5: Celeste64LocationData("Forsaken City", celeste_64_base_id + 0x200 + 0x04),
+    LocationName.sign_1: Celeste64LocationData(RegionName.granny_island,   celeste_64_base_id + 0x200 + 0x00),
+    LocationName.sign_2: Celeste64LocationData(RegionName.granny_island,   celeste_64_base_id + 0x200 + 0x01),
+    LocationName.sign_3: Celeste64LocationData(RegionName.highway_island,  celeste_64_base_id + 0x200 + 0x02),
+    LocationName.sign_4: Celeste64LocationData(RegionName.se_house_island, celeste_64_base_id + 0x200 + 0x03),
+    LocationName.sign_5: Celeste64LocationData(RegionName.badeline_island, celeste_64_base_id + 0x200 + 0x04),
 }
 
 car_location_data_table: Dict[str, Celeste64LocationData] = {
-    LocationName.car_1: Celeste64LocationData("Forsaken City", celeste_64_base_id + 0x300 + 0x00),
-    LocationName.car_2: Celeste64LocationData("Forsaken City", celeste_64_base_id + 0x300 + 0x01),
+    LocationName.car_1: Celeste64LocationData(RegionName.intro_islands, celeste_64_base_id + 0x300 + 0x00),
+    LocationName.car_2: Celeste64LocationData(RegionName.granny_island, celeste_64_base_id + 0x300 + 0x01),
+}
+
+checkpoint_location_data_table: Dict[str, Celeste64LocationData] = {
+    LocationName.checkpoint_1:  Celeste64LocationData(RegionName.intro_islands,        celeste_64_base_id + 0x400 + 0x00),
+    LocationName.checkpoint_2:  Celeste64LocationData(RegionName.granny_island,        celeste_64_base_id + 0x400 + 0x01),
+    LocationName.checkpoint_3:  Celeste64LocationData(RegionName.granny_island,        celeste_64_base_id + 0x400 + 0x02),
+    LocationName.checkpoint_4:  Celeste64LocationData(RegionName.granny_island,        celeste_64_base_id + 0x400 + 0x03),
+    LocationName.checkpoint_5:  Celeste64LocationData(RegionName.highway_island,       celeste_64_base_id + 0x400 + 0x04),
+    LocationName.checkpoint_6:  Celeste64LocationData(RegionName.highway_island,       celeste_64_base_id + 0x400 + 0x05),
+    LocationName.checkpoint_7:  Celeste64LocationData(RegionName.ne_feathers_island,   celeste_64_base_id + 0x400 + 0x06),
+    LocationName.checkpoint_8:  Celeste64LocationData(RegionName.se_house_island,      celeste_64_base_id + 0x400 + 0x07),
+    LocationName.checkpoint_9:  Celeste64LocationData(RegionName.badeline_tower_upper, celeste_64_base_id + 0x400 + 0x08),
+    LocationName.checkpoint_10: Celeste64LocationData(RegionName.badeline_island,      celeste_64_base_id + 0x400 + 0x09),
 }
 
 location_data_table: Dict[str, Celeste64LocationData] = {**strawberry_location_data_table,
                                                          **friend_location_data_table,
                                                          **sign_location_data_table,
-                                                         **car_location_data_table}
+                                                         **car_location_data_table,
+                                                         **checkpoint_location_data_table}
 
 location_table = {name: data.address for name, data in location_data_table.items() if data.address is not None}
diff --git a/worlds/celeste64/Names/ItemName.py b/worlds/celeste64/Names/ItemName.py
index d4fb949600..b4c02115cb 100644
--- a/worlds/celeste64/Names/ItemName.py
+++ b/worlds/celeste64/Names/ItemName.py
@@ -15,3 +15,18 @@ ground_dash = "Ground Dash"
 air_dash    = "Air Dash"
 skid_jump   = "Skid Jump"
 climb       = "Climb"
+
+# Checkpoint Items
+checkpoint_1  = "Intro Checkpoint"
+checkpoint_2  = "Granny Checkpoint"
+checkpoint_3  = "South-East Tower Checkpoint"
+checkpoint_4  = "Climb Sign Checkpoint"
+checkpoint_5  = "Freeway Checkpoint"
+checkpoint_6  = "Freeway Feather Checkpoint"
+checkpoint_7  = "Feather Maze Checkpoint"
+checkpoint_8  = "Double Dash House Checkpoint"
+checkpoint_9  = "Badeline Tower Checkpoint"
+checkpoint_10 = "Badeline Island Checkpoint"
+
+# Item used for logic definitions that are not possible with the given options
+cannot_access = "CANNOT ACCESS"
diff --git a/worlds/celeste64/Names/LocationName.py b/worlds/celeste64/Names/LocationName.py
index 1b784f3875..784d2049cf 100644
--- a/worlds/celeste64/Names/LocationName.py
+++ b/worlds/celeste64/Names/LocationName.py
@@ -10,7 +10,7 @@ strawberry_8  = "Traffic Block Strawberry"
 strawberry_9  = "South-West Dash Refills Strawberry"
 strawberry_10 = "South-East Tower Side Strawberry"
 strawberry_11 = "Girders Strawberry"
-strawberry_12 = "North-East Tower Bottom Strawberry"
+strawberry_12 = "Badeline Tower Bottom Strawberry"
 strawberry_13 = "Breakable Blocks Strawberry"
 strawberry_14 = "Feather Maze Strawberry"
 strawberry_15 = "Feather Chain Strawberry"
@@ -18,7 +18,7 @@ strawberry_16 = "Feather Hidden Strawberry"
 strawberry_17 = "Double Dash Puzzle Strawberry"
 strawberry_18 = "Double Dash Spike Climb Strawberry"
 strawberry_19 = "Double Dash Spring Strawberry"
-strawberry_20 = "North-East Tower Breakable Bottom Strawberry"
+strawberry_20 = "Badeline Tower Breakable Bottom Strawberry"
 strawberry_21 = "Theo Tower Lower Cassette Strawberry"
 strawberry_22 = "Theo Tower Upper Cassette Strawberry"
 strawberry_23 = "South End of Bridge Cassette Strawberry"
@@ -27,8 +27,8 @@ strawberry_25 = "Cassette Hidden in the House Strawberry"
 strawberry_26 = "North End of Bridge Cassette Strawberry"
 strawberry_27 = "Distant Feather Cassette Strawberry"
 strawberry_28 = "Feather Arches Cassette Strawberry"
-strawberry_29 = "North-East Tower Cassette Strawberry"
-strawberry_30 = "Badeline Cassette Strawberry"
+strawberry_29 = "Badeline Tower Cassette Strawberry"
+strawberry_30 = "Badeline Island Cassette Strawberry"
 
 # Friend Locations
 granny_1   = "Granny Conversation 1"
@@ -51,3 +51,15 @@ sign_5 = "Credits Sign"
 # Car Locations
 car_1 = "Intro Car"
 car_2 = "Secret Car"
+
+# Checkpoint Locations
+checkpoint_1  = "Intro Checkpoint"
+checkpoint_2  = "Granny Checkpoint"
+checkpoint_3  = "South-East Tower Checkpoint"
+checkpoint_4  = "Climb Sign Checkpoint"
+checkpoint_5  = "Freeway Checkpoint"
+checkpoint_6  = "Freeway Feather Checkpoint"
+checkpoint_7  = "Feather Maze Checkpoint"
+checkpoint_8  = "Double Dash House Checkpoint"
+checkpoint_9  = "Badeline Tower Checkpoint"
+checkpoint_10 = "Badeline Island Checkpoint"
diff --git a/worlds/celeste64/Names/RegionName.py b/worlds/celeste64/Names/RegionName.py
new file mode 100644
index 0000000000..ddb07a5bda
--- /dev/null
+++ b/worlds/celeste64/Names/RegionName.py
@@ -0,0 +1,13 @@
+# Level Base Regions
+forsaken_city = "Forsaken City"
+
+# Forsaken City Regions
+intro_islands        = "Intro Islands"
+granny_island        = "Granny Island"
+highway_island       = "Freeway Island"
+nw_girders_island    = "North-West Girders Island"
+ne_feathers_island   = "North-East Feathers Island"
+se_house_island      = "South-East House Island"
+badeline_tower_lower = "Badeline Tower Lower"
+badeline_tower_upper = "Badeline Tower Upper"
+badeline_island      = "Badeline Island"
diff --git a/worlds/celeste64/Options.py b/worlds/celeste64/Options.py
index 9a67e7d7d4..71e0cfa763 100644
--- a/worlds/celeste64/Options.py
+++ b/worlds/celeste64/Options.py
@@ -1,6 +1,8 @@
 from dataclasses import dataclass
+import random
 
-from Options import Choice, Range, Toggle, DeathLink, OptionGroup, PerGameCommonOptions
+from Options import Choice, TextChoice, Range, Toggle, DeathLink, OptionGroup, PerGameCommonOptions, OptionError
+from worlds.AutoWorld import World
 
 
 class DeathLinkAmnesty(Range):
@@ -18,7 +20,7 @@ class TotalStrawberries(Range):
     """
     display_name = "Total Strawberries"
     range_start = 0
-    range_end = 46
+    range_end = 55
     default = 20
 
 class StrawberriesRequiredPercentage(Range):
@@ -73,6 +75,93 @@ class Carsanity(Toggle):
     """
     display_name = "Carsanity"
 
+class Checkpointsanity(Toggle):
+    """
+    Whether activating Checkpoints grants location checks
+
+    Activating this will also shuffle items into the pool which allow usage and warping to each Checkpoint
+    """
+    display_name = "Checkpointsanity"
+
+
+class ColorChoice(TextChoice):
+    option_strawberry = 0xDB2C00
+    option_empty = 0x6EC0FF
+    option_double = 0xFA91FF
+    option_golden = 0xF2D450
+    option_baddy = 0x9B3FB5
+    option_fire_red = 0xFF0000
+    option_maroon = 0x800000
+    option_salmon = 0xFF3A65
+    option_orange = 0xD86E0A
+    option_lime_green = 0x8DF920
+    option_bright_green = 0x0DAF05
+    option_forest_green = 0x132818
+    option_royal_blue = 0x0036BF
+    option_brown = 0xB78726
+    option_black = 0x000000
+    option_white = 0xFFFFFF
+    option_grey = 0x808080
+    option_any_color = -1
+
+    @classmethod
+    def from_text(cls, text: str) -> Choice:
+        text = text.lower()
+        if text == "random":
+            choice_list = list(cls.name_lookup)
+            choice_list.remove(cls.option_any_color)
+            return cls(random.choice(choice_list))
+        return super().from_text(text)
+
+
+class MadelineOneDashHairColor(ColorChoice):
+    """
+    What color Madeline's hair is when she has one dash
+
+    The `any_color` option will choose a fully random color
+
+    A custom color entry may be supplied as a 6-character RGB hex color code
+    e.g. F542C8
+    """
+    display_name = "Madeline One Dash Hair Color"
+    default = ColorChoice.option_strawberry
+
+class MadelineTwoDashHairColor(ColorChoice):
+    """
+    What color Madeline's hair is when she has two dashes
+
+    The `any_color` option will choose a fully random color
+
+    A custom color entry may be supplied as a 6-character RGB hex color code
+    e.g. F542C8
+    """
+    display_name = "Madeline Two Dash Hair Color"
+    default = ColorChoice.option_double
+
+class MadelineNoDashHairColor(ColorChoice):
+    """
+    What color Madeline's hair is when she has no dashes
+
+    The `any_color` option will choose a fully random color
+
+    A custom color entry may be supplied as a 6-character RGB hex color code
+    e.g. F542C8
+    """
+    display_name = "Madeline No Dash Hair Color"
+    default = ColorChoice.option_empty
+
+class MadelineFeatherHairColor(ColorChoice):
+    """
+    What color Madeline's hair is when she has a feather
+
+    The `any_color` option will choose a fully random color
+
+    A custom color entry may be supplied as a 6-character RGB hex color code
+    e.g. F542C8
+    """
+    display_name = "Madeline Feather Hair Color"
+    default = ColorChoice.option_golden
+
 
 class BadelineChaserSource(Choice):
     """
@@ -119,6 +208,13 @@ celeste_64_option_groups = [
         Friendsanity,
         Signsanity,
         Carsanity,
+        Checkpointsanity,
+    ]),
+    OptionGroup("Aesthetic Options", [
+        MadelineOneDashHairColor,
+        MadelineTwoDashHairColor,
+        MadelineNoDashHairColor,
+        MadelineFeatherHairColor,
     ]),
     OptionGroup("Badeline Chasers", [
         BadelineChaserSource,
@@ -142,7 +238,68 @@ class Celeste64Options(PerGameCommonOptions):
     friendsanity: Friendsanity
     signsanity: Signsanity
     carsanity: Carsanity
+    checkpointsanity: Checkpointsanity
+
+    madeline_one_dash_hair_color: MadelineOneDashHairColor
+    madeline_two_dash_hair_color: MadelineTwoDashHairColor
+    madeline_no_dash_hair_color: MadelineNoDashHairColor
+    madeline_feather_hair_color: MadelineFeatherHairColor
 
     badeline_chaser_source: BadelineChaserSource
     badeline_chaser_frequency: BadelineChaserFrequency
     badeline_chaser_speed: BadelineChaserSpeed
+
+
+def resolve_options(world: World):
+    # One Dash Hair
+    if isinstance(world.options.madeline_one_dash_hair_color.value, str):
+        try:
+            world.madeline_one_dash_hair_color = int(world.options.madeline_one_dash_hair_color.value.strip("#")[:6], 16)
+        except ValueError:
+            raise OptionError(f"Invalid input for option `madeline_one_dash_hair_color`:"
+                              f"{world.options.madeline_one_dash_hair_color.value} for "
+                              f"{world.player_name}")
+    elif world.options.madeline_one_dash_hair_color.value == ColorChoice.option_any_color:
+        world.madeline_one_dash_hair_color = world.random.randint(0, 0xFFFFFF)
+    else:
+        world.madeline_one_dash_hair_color = world.options.madeline_one_dash_hair_color.value
+
+    # Two Dash Hair
+    if isinstance(world.options.madeline_two_dash_hair_color.value, str):
+        try:
+            world.madeline_two_dash_hair_color = int(world.options.madeline_two_dash_hair_color.value.strip("#")[:6], 16)
+        except ValueError:
+            raise OptionError(f"Invalid input for option `madeline_two_dash_hair_color`:"
+                              f"{world.options.madeline_two_dash_hair_color.value} for "
+                              f"{world.player_name}")
+    elif world.options.madeline_two_dash_hair_color.value == ColorChoice.option_any_color:
+        world.madeline_two_dash_hair_color = world.random.randint(0, 0xFFFFFF)
+    else:
+        world.madeline_two_dash_hair_color = world.options.madeline_two_dash_hair_color.value
+
+    # No Dash Hair
+    if isinstance(world.options.madeline_no_dash_hair_color.value, str):
+        try:
+            world.madeline_no_dash_hair_color = int(world.options.madeline_no_dash_hair_color.value.strip("#")[:6], 16)
+        except ValueError:
+            raise OptionError(f"Invalid input for option `madeline_no_dash_hair_color`:"
+                              f"{world.options.madeline_no_dash_hair_color.value} for "
+                              f"{world.player_name}")
+    elif world.options.madeline_no_dash_hair_color.value == ColorChoice.option_any_color:
+        world.madeline_no_dash_hair_color = world.random.randint(0, 0xFFFFFF)
+    else:
+        world.madeline_no_dash_hair_color = world.options.madeline_no_dash_hair_color.value
+
+    # Feather Hair
+    if isinstance(world.options.madeline_feather_hair_color.value, str):
+        try:
+            world.madeline_feather_hair_color = int(world.options.madeline_feather_hair_color.value.strip("#")[:6], 16)
+        except ValueError:
+            raise OptionError(f"Invalid input for option `madeline_feather_hair_color`:"
+                              f"{world.options.madeline_feather_hair_color.value} for "
+                              f"{world.player_name}")
+    elif world.options.madeline_feather_hair_color.value == ColorChoice.option_any_color:
+        world.madeline_feather_hair_color = world.random.randint(0, 0xFFFFFF)
+    else:
+        world.madeline_feather_hair_color = world.options.madeline_feather_hair_color.value
+
diff --git a/worlds/celeste64/Regions.py b/worlds/celeste64/Regions.py
index 6f01c873a4..7db683bbb9 100644
--- a/worlds/celeste64/Regions.py
+++ b/worlds/celeste64/Regions.py
@@ -1,11 +1,23 @@
 from typing import Dict, List, NamedTuple
 
+from .Names import RegionName
 
 class Celeste64RegionData(NamedTuple):
     connecting_regions: List[str] = []
 
 
 region_data_table: Dict[str, Celeste64RegionData] = {
-    "Menu": Celeste64RegionData(["Forsaken City"]),
-    "Forsaken City": Celeste64RegionData(),
+    "Menu": Celeste64RegionData([RegionName.forsaken_city]),
+
+    RegionName.forsaken_city: Celeste64RegionData([RegionName.intro_islands, RegionName.granny_island, RegionName.highway_island, RegionName.ne_feathers_island, RegionName.se_house_island, RegionName.badeline_tower_upper, RegionName.badeline_island]),
+
+    RegionName.intro_islands:        Celeste64RegionData([RegionName.granny_island]),
+    RegionName.granny_island:        Celeste64RegionData([RegionName.highway_island, RegionName.nw_girders_island, RegionName.badeline_tower_lower, RegionName.se_house_island]),
+    RegionName.highway_island:       Celeste64RegionData([RegionName.granny_island, RegionName.ne_feathers_island, RegionName.nw_girders_island]),
+    RegionName.nw_girders_island:    Celeste64RegionData([RegionName.highway_island]),
+    RegionName.ne_feathers_island:   Celeste64RegionData([RegionName.se_house_island, RegionName.highway_island, RegionName.badeline_tower_lower, RegionName.badeline_tower_upper]),
+    RegionName.se_house_island:      Celeste64RegionData([RegionName.ne_feathers_island, RegionName.granny_island, RegionName.badeline_tower_lower]),
+    RegionName.badeline_tower_lower: Celeste64RegionData([RegionName.se_house_island, RegionName.ne_feathers_island, RegionName.granny_island, RegionName.badeline_tower_upper]),
+    RegionName.badeline_tower_upper: Celeste64RegionData([RegionName.badeline_island, RegionName.badeline_tower_lower, RegionName.se_house_island, RegionName.ne_feathers_island, RegionName.granny_island]),
+    RegionName.badeline_island:      Celeste64RegionData([RegionName.badeline_tower_upper, RegionName.granny_island, RegionName.highway_island]),
 }
diff --git a/worlds/celeste64/Rules.py b/worlds/celeste64/Rules.py
index ebb47cca30..3365a7cf95 100644
--- a/worlds/celeste64/Rules.py
+++ b/worlds/celeste64/Rules.py
@@ -1,265 +1,85 @@
-from typing import Dict, List
+from typing import Dict, List, Tuple, Callable
 
-from BaseClasses import CollectionState
+from BaseClasses import CollectionState, Region
 from worlds.generic.Rules import set_rule
 
 from . import Celeste64World
-from .Names import ItemName, LocationName
+from .Names import ItemName, LocationName, RegionName
 
 
 def set_rules(world: Celeste64World):
     if world.options.logic_difficulty == "standard":
-        if world.options.move_shuffle:
-            world.active_logic_mapping = location_standard_moves_logic
-        else:
-            world.active_logic_mapping = location_standard_logic
+        world.active_logic_mapping = location_standard_moves_logic
+        world.active_region_logic_mapping = region_standard_moves_logic
     else:
-        if world.options.move_shuffle:
-            world.active_logic_mapping = location_hard_moves_logic
-        else:
-            world.active_logic_mapping = location_hard_logic
+        world.active_logic_mapping = location_hard_moves_logic
+        world.active_region_logic_mapping = region_hard_moves_logic
 
     for location in world.multiworld.get_locations(world.player):
         set_rule(location, lambda state, location=location: location_rule(state, world, location.name))
 
-    if world.options.logic_difficulty == "standard":
-        if world.options.move_shuffle:
-            world.goal_logic_mapping = goal_standard_moves_logic
-        else:
-            world.goal_logic_mapping = goal_standard_logic
-    else:
-        if world.options.move_shuffle:
-            world.goal_logic_mapping = goal_hard_moves_logic
-        else:
-            world.goal_logic_mapping = goal_hard_logic
-
     # Completion condition.
     world.multiworld.completion_condition[world.player] = lambda state: goal_rule(state, world)
 
 
-goal_standard_logic: List[List[str]] = [[ItemName.feather, ItemName.traffic_block, ItemName.breakables, ItemName.double_dash_refill]]
-goal_hard_logic: List[List[str]] = [[]]
-goal_standard_moves_logic: List[List[str]] = [[ItemName.double_dash_refill, ItemName.feather, ItemName.traffic_block, ItemName.breakables, ItemName.air_dash, ItemName.climb]]
-goal_hard_moves_logic: List[List[str]] = [[ItemName.double_dash_refill, ItemName.feather, ItemName.traffic_block, ItemName.breakables, ItemName.air_dash, ItemName.climb],
-                                          [ItemName.traffic_block, ItemName.air_dash, ItemName.skid_jump],
-                                          [ItemName.ground_dash, ItemName.air_dash, ItemName.skid_jump],
-                                          [ItemName.feather, ItemName.traffic_block, ItemName.air_dash],
-                                          [ItemName.traffic_block, ItemName.ground_dash, ItemName.air_dash]]
-
-
-location_standard_logic: Dict[str, List[List[str]]] = {
-    LocationName.strawberry_4:  [[ItemName.traffic_block, ItemName.breakables]],
-    LocationName.strawberry_6:  [[ItemName.dash_refill],
-                                 [ItemName.traffic_block]],
-    LocationName.strawberry_7:  [[ItemName.dash_refill],
-                                 [ItemName.traffic_block]],
-    LocationName.strawberry_8:  [[ItemName.traffic_block]],
-    LocationName.strawberry_9:  [[ItemName.dash_refill]],
-    LocationName.strawberry_11: [[ItemName.dash_refill],
-                                 [ItemName.traffic_block]],
-    LocationName.strawberry_12: [[ItemName.dash_refill, ItemName.double_dash_refill],
-                                 [ItemName.traffic_block, ItemName.double_dash_refill]],
-    LocationName.strawberry_13: [[ItemName.dash_refill, ItemName.breakables],
-                                 [ItemName.traffic_block, ItemName.breakables]],
-    LocationName.strawberry_14: [[ItemName.dash_refill, ItemName.feather],
-                                 [ItemName.traffic_block, ItemName.feather]],
-    LocationName.strawberry_15: [[ItemName.dash_refill, ItemName.feather],
-                                 [ItemName.traffic_block, ItemName.feather]],
-    LocationName.strawberry_16: [[ItemName.dash_refill, ItemName.feather],
-                                 [ItemName.traffic_block, ItemName.feather]],
-    LocationName.strawberry_17: [[ItemName.double_dash_refill, ItemName.feather, ItemName.traffic_block]],
-    LocationName.strawberry_18: [[ItemName.dash_refill, ItemName.double_dash_refill],
-                                 [ItemName.traffic_block, ItemName.feather, ItemName.double_dash_refill]],
-    LocationName.strawberry_19: [[ItemName.dash_refill, ItemName.double_dash_refill, ItemName.spring],
-                                 [ItemName.traffic_block, ItemName.double_dash_refill, ItemName.feather, ItemName.spring]],
-    LocationName.strawberry_20: [[ItemName.dash_refill, ItemName.feather, ItemName.breakables],
-                                 [ItemName.traffic_block, ItemName.feather, ItemName.breakables]],
-
-    LocationName.strawberry_21: [[ItemName.cassette, ItemName.traffic_block, ItemName.breakables]],
-    LocationName.strawberry_22: [[ItemName.cassette, ItemName.dash_refill, ItemName.breakables]],
-    LocationName.strawberry_23: [[ItemName.cassette, ItemName.dash_refill, ItemName.coin],
-                                 [ItemName.cassette, ItemName.traffic_block, ItemName.coin]],
-    LocationName.strawberry_24: [[ItemName.cassette, ItemName.dash_refill, ItemName.traffic_block]],
-    LocationName.strawberry_25: [[ItemName.cassette, ItemName.dash_refill, ItemName.double_dash_refill],
-                                 [ItemName.cassette, ItemName.traffic_block, ItemName.feather, ItemName.double_dash_refill]],
-    LocationName.strawberry_26: [[ItemName.cassette, ItemName.dash_refill],
-                                 [ItemName.cassette, ItemName.traffic_block]],
-    LocationName.strawberry_27: [[ItemName.cassette, ItemName.dash_refill, ItemName.feather, ItemName.coin],
-                                 [ItemName.cassette, ItemName.traffic_block, ItemName.feather, ItemName.coin]],
-    LocationName.strawberry_28: [[ItemName.cassette, ItemName.dash_refill, ItemName.feather, ItemName.coin],
-                                 [ItemName.cassette, ItemName.traffic_block, ItemName.feather, ItemName.coin]],
-    LocationName.strawberry_29: [[ItemName.cassette, ItemName.dash_refill, ItemName.feather, ItemName.coin]],
-    LocationName.strawberry_30: [[ItemName.cassette, ItemName.dash_refill, ItemName.double_dash_refill, ItemName.feather, ItemName.traffic_block, ItemName.spring, ItemName.breakables]],
-
-    LocationName.theo_1:     [[ItemName.traffic_block, ItemName.breakables]],
-    LocationName.theo_2:     [[ItemName.traffic_block, ItemName.breakables]],
-    LocationName.theo_3:     [[ItemName.traffic_block, ItemName.breakables]],
-    LocationName.badeline_1: [[ItemName.double_dash_refill, ItemName.feather, ItemName.traffic_block, ItemName.breakables]],
-    LocationName.badeline_2: [[ItemName.double_dash_refill, ItemName.feather, ItemName.traffic_block, ItemName.breakables]],
-    LocationName.badeline_3: [[ItemName.double_dash_refill, ItemName.feather, ItemName.traffic_block, ItemName.breakables]],
-
-    LocationName.sign_2: [[ItemName.breakables]],
-    LocationName.sign_3: [[ItemName.dash_refill],
-                          [ItemName.traffic_block]],
-    LocationName.sign_4: [[ItemName.dash_refill, ItemName.double_dash_refill],
-                          [ItemName.dash_refill, ItemName.feather],
-                          [ItemName.traffic_block, ItemName.feather]],
-    LocationName.sign_5: [[ItemName.double_dash_refill, ItemName.feather, ItemName.traffic_block, ItemName.breakables]],
-
-    LocationName.car_2: [[ItemName.breakables]],
-}
-
-location_hard_logic: Dict[str, List[List[str]]] = {
-    LocationName.strawberry_13: [[ItemName.breakables]],
-    LocationName.strawberry_17: [[ItemName.double_dash_refill, ItemName.traffic_block]],
-    LocationName.strawberry_20: [[ItemName.breakables]],
-
-    LocationName.strawberry_21: [[ItemName.cassette, ItemName.traffic_block, ItemName.breakables]],
-    LocationName.strawberry_22: [[ItemName.cassette]],
-    LocationName.strawberry_23: [[ItemName.cassette, ItemName.coin]],
-    LocationName.strawberry_24: [[ItemName.cassette]],
-    LocationName.strawberry_25: [[ItemName.cassette, ItemName.double_dash_refill]],
-    LocationName.strawberry_26: [[ItemName.cassette]],
-    LocationName.strawberry_27: [[ItemName.cassette]],
-    LocationName.strawberry_28: [[ItemName.cassette, ItemName.feather]],
-    LocationName.strawberry_29: [[ItemName.cassette]],
-    LocationName.strawberry_30: [[ItemName.cassette, ItemName.dash_refill, ItemName.double_dash_refill, ItemName.traffic_block, ItemName.breakables]],
-
-    LocationName.sign_2: [[ItemName.breakables]],
-
-    LocationName.car_2: [[ItemName.breakables]],
-}
-
 location_standard_moves_logic: Dict[str, List[List[str]]] = {
     LocationName.strawberry_1:  [[ItemName.ground_dash],
                                  [ItemName.air_dash],
-                                 [ItemName.skid_jump],
-                                 [ItemName.climb]],
-    LocationName.strawberry_2:  [[ItemName.ground_dash],
-                                 [ItemName.air_dash],
-                                 [ItemName.skid_jump],
                                  [ItemName.climb]],
+    LocationName.strawberry_2:  [[ItemName.air_dash],
+                                 [ItemName.skid_jump]],
     LocationName.strawberry_3:  [[ItemName.air_dash],
                                  [ItemName.skid_jump]],
     LocationName.strawberry_4:  [[ItemName.traffic_block, ItemName.breakables, ItemName.air_dash]],
     LocationName.strawberry_5:  [[ItemName.air_dash]],
-    LocationName.strawberry_6:  [[ItemName.dash_refill, ItemName.air_dash],
-                                 [ItemName.traffic_block, ItemName.ground_dash],
-                                 [ItemName.traffic_block, ItemName.air_dash],
-                                 [ItemName.traffic_block, ItemName.skid_jump],
-                                 [ItemName.traffic_block, ItemName.climb]],
-    LocationName.strawberry_7:  [[ItemName.dash_refill, ItemName.air_dash],
-                                 [ItemName.traffic_block, ItemName.ground_dash],
-                                 [ItemName.traffic_block, ItemName.air_dash],
-                                 [ItemName.traffic_block, ItemName.skid_jump],
-                                 [ItemName.traffic_block, ItemName.climb]],
-    LocationName.strawberry_8:  [[ItemName.traffic_block, ItemName.ground_dash],
-                                 [ItemName.traffic_block, ItemName.air_dash],
-                                 [ItemName.traffic_block, ItemName.skid_jump],
-                                 [ItemName.traffic_block, ItemName.climb]],
     LocationName.strawberry_9:  [[ItemName.dash_refill, ItemName.air_dash]],
     LocationName.strawberry_10: [[ItemName.climb]],
-    LocationName.strawberry_11: [[ItemName.dash_refill, ItemName.air_dash, ItemName.climb],
-                                 [ItemName.traffic_block, ItemName.climb]],
-    LocationName.strawberry_12: [[ItemName.dash_refill, ItemName.double_dash_refill, ItemName.air_dash],
-                                 [ItemName.traffic_block, ItemName.double_dash_refill, ItemName.air_dash]],
-    LocationName.strawberry_13: [[ItemName.dash_refill, ItemName.breakables, ItemName.air_dash],
-                                 [ItemName.traffic_block, ItemName.breakables, ItemName.ground_dash],
-                                 [ItemName.traffic_block, ItemName.breakables, ItemName.air_dash]],
-    LocationName.strawberry_14: [[ItemName.dash_refill, ItemName.feather, ItemName.air_dash],
-                                 [ItemName.traffic_block, ItemName.feather, ItemName.air_dash]],
-    LocationName.strawberry_15: [[ItemName.dash_refill, ItemName.feather, ItemName.air_dash, ItemName.climb],
-                                 [ItemName.traffic_block, ItemName.feather, ItemName.climb]],
-    LocationName.strawberry_16: [[ItemName.dash_refill, ItemName.feather, ItemName.air_dash],
-                                 [ItemName.traffic_block, ItemName.feather]],
-    LocationName.strawberry_17: [[ItemName.double_dash_refill, ItemName.feather, ItemName.traffic_block, ItemName.ground_dash],
-                                 [ItemName.double_dash_refill, ItemName.feather, ItemName.traffic_block, ItemName.air_dash],
-                                 [ItemName.double_dash_refill, ItemName.feather, ItemName.traffic_block, ItemName.skid_jump],
-                                 [ItemName.double_dash_refill, ItemName.feather, ItemName.traffic_block, ItemName.climb]],
-    LocationName.strawberry_18: [[ItemName.dash_refill, ItemName.double_dash_refill, ItemName.air_dash, ItemName.climb],
-                                 [ItemName.traffic_block, ItemName.feather, ItemName.double_dash_refill, ItemName.air_dash, ItemName.climb]],
-    LocationName.strawberry_19: [[ItemName.dash_refill, ItemName.double_dash_refill, ItemName.spring, ItemName.air_dash],
-                                 [ItemName.traffic_block, ItemName.double_dash_refill, ItemName.feather, ItemName.spring, ItemName.air_dash]],
-    LocationName.strawberry_20: [[ItemName.dash_refill, ItemName.feather, ItemName.breakables, ItemName.air_dash],
-                                 [ItemName.traffic_block, ItemName.feather, ItemName.breakables, ItemName.air_dash]],
+    LocationName.strawberry_11: [[ItemName.air_dash, ItemName.climb]],
+    LocationName.strawberry_13: [[ItemName.breakables, ItemName.air_dash],
+                                 [ItemName.breakables, ItemName.ground_dash]],
+    LocationName.strawberry_14: [[ItemName.feather, ItemName.air_dash]],
+    LocationName.strawberry_15: [[ItemName.feather, ItemName.air_dash, ItemName.climb]],
+    LocationName.strawberry_16: [[ItemName.feather]],
+    LocationName.strawberry_17: [[ItemName.double_dash_refill, ItemName.feather, ItemName.traffic_block]],
+    LocationName.strawberry_18: [[ItemName.double_dash_refill, ItemName.air_dash, ItemName.climb]],
+    LocationName.strawberry_19: [[ItemName.double_dash_refill, ItemName.spring, ItemName.air_dash, ItemName.skid_jump]],
+    LocationName.strawberry_20: [[ItemName.feather, ItemName.breakables, ItemName.air_dash]],
 
     LocationName.strawberry_21: [[ItemName.cassette, ItemName.traffic_block, ItemName.breakables, ItemName.air_dash]],
     LocationName.strawberry_22: [[ItemName.cassette, ItemName.dash_refill, ItemName.breakables, ItemName.air_dash]],
-    LocationName.strawberry_23: [[ItemName.cassette, ItemName.dash_refill, ItemName.coin, ItemName.air_dash, ItemName.climb],
-                                 [ItemName.cassette, ItemName.traffic_block, ItemName.coin, ItemName.air_dash, ItemName.climb]],
+    LocationName.strawberry_23: [[ItemName.cassette, ItemName.coin, ItemName.air_dash, ItemName.climb]],
     LocationName.strawberry_24: [[ItemName.cassette, ItemName.dash_refill, ItemName.traffic_block, ItemName.air_dash]],
-    LocationName.strawberry_25: [[ItemName.cassette, ItemName.dash_refill, ItemName.double_dash_refill, ItemName.air_dash, ItemName.climb],
-                                 [ItemName.cassette, ItemName.traffic_block, ItemName.feather, ItemName.double_dash_refill, ItemName.air_dash, ItemName.climb]],
-    LocationName.strawberry_26: [[ItemName.cassette, ItemName.dash_refill, ItemName.air_dash, ItemName.climb],
-                                 [ItemName.cassette, ItemName.traffic_block, ItemName.air_dash, ItemName.climb]],
-    LocationName.strawberry_27: [[ItemName.cassette, ItemName.dash_refill, ItemName.feather, ItemName.coin, ItemName.air_dash],
-                                 [ItemName.cassette, ItemName.traffic_block, ItemName.feather, ItemName.coin, ItemName.air_dash]],
-    LocationName.strawberry_28: [[ItemName.cassette, ItemName.dash_refill, ItemName.feather, ItemName.coin, ItemName.air_dash, ItemName.climb],
-                                 [ItemName.cassette, ItemName.traffic_block, ItemName.feather, ItemName.coin, ItemName.air_dash, ItemName.climb]],
-    LocationName.strawberry_29: [[ItemName.cassette, ItemName.dash_refill, ItemName.feather, ItemName.coin, ItemName.air_dash, ItemName.skid_jump]],
+    LocationName.strawberry_25: [[ItemName.cassette, ItemName.double_dash_refill, ItemName.air_dash, ItemName.climb]],
+    LocationName.strawberry_26: [[ItemName.cassette, ItemName.air_dash, ItemName.climb]],
+    LocationName.strawberry_27: [[ItemName.cassette, ItemName.feather, ItemName.coin, ItemName.air_dash, ItemName.climb]],
+    LocationName.strawberry_28: [[ItemName.cassette, ItemName.feather, ItemName.coin, ItemName.air_dash, ItemName.climb]],
+    LocationName.strawberry_29: [[ItemName.cassette, ItemName.dash_refill, ItemName.coin, ItemName.air_dash, ItemName.skid_jump]],
     LocationName.strawberry_30: [[ItemName.cassette, ItemName.dash_refill, ItemName.double_dash_refill, ItemName.feather, ItemName.traffic_block, ItemName.spring, ItemName.breakables, ItemName.air_dash, ItemName.climb]],
 
-    LocationName.granny_1:   [[ItemName.ground_dash],
-                              [ItemName.air_dash],
-                              [ItemName.skid_jump],
-                              [ItemName.climb]],
-    LocationName.granny_2:   [[ItemName.ground_dash],
-                              [ItemName.air_dash],
-                              [ItemName.skid_jump],
-                              [ItemName.climb]],
-    LocationName.granny_3:   [[ItemName.ground_dash],
-                              [ItemName.air_dash],
-                              [ItemName.skid_jump],
-                              [ItemName.climb]],
     LocationName.theo_1:     [[ItemName.traffic_block, ItemName.breakables, ItemName.air_dash]],
     LocationName.theo_2:     [[ItemName.traffic_block, ItemName.breakables, ItemName.air_dash]],
     LocationName.theo_3:     [[ItemName.traffic_block, ItemName.breakables, ItemName.air_dash]],
-    LocationName.badeline_1: [[ItemName.double_dash_refill, ItemName.feather, ItemName.traffic_block, ItemName.breakables, ItemName.air_dash, ItemName.climb]],
-    LocationName.badeline_2: [[ItemName.double_dash_refill, ItemName.feather, ItemName.traffic_block, ItemName.breakables, ItemName.air_dash, ItemName.climb]],
-    LocationName.badeline_3: [[ItemName.double_dash_refill, ItemName.feather, ItemName.traffic_block, ItemName.breakables, ItemName.air_dash, ItemName.climb]],
 
-    LocationName.sign_1: [[ItemName.ground_dash],
-                          [ItemName.air_dash],
-                          [ItemName.skid_jump],
-                          [ItemName.climb]],
     LocationName.sign_2: [[ItemName.breakables, ItemName.ground_dash],
                           [ItemName.breakables, ItemName.air_dash]],
-    LocationName.sign_3:  [[ItemName.dash_refill, ItemName.air_dash],
-                           [ItemName.traffic_block, ItemName.ground_dash],
-                           [ItemName.traffic_block, ItemName.air_dash],
-                           [ItemName.traffic_block, ItemName.skid_jump],
-                           [ItemName.traffic_block, ItemName.climb]],
-    LocationName.sign_4: [[ItemName.dash_refill, ItemName.double_dash_refill, ItemName.air_dash],
-                          [ItemName.dash_refill, ItemName.feather, ItemName.air_dash],
-                          [ItemName.traffic_block, ItemName.feather, ItemName.ground_dash],
-                          [ItemName.traffic_block, ItemName.feather, ItemName.air_dash],
-                          [ItemName.traffic_block, ItemName.feather, ItemName.skid_jump],
-                          [ItemName.traffic_block, ItemName.feather, ItemName.climb]],
-    LocationName.sign_5: [[ItemName.double_dash_refill, ItemName.feather, ItemName.traffic_block, ItemName.breakables, ItemName.air_dash, ItemName.climb]],
 
-    LocationName.car_2: [[ItemName.breakables, ItemName.ground_dash],
-                         [ItemName.breakables, ItemName.air_dash]],
+    LocationName.car_2: [[ItemName.breakables, ItemName.ground_dash, ItemName.climb],
+                         [ItemName.breakables, ItemName.air_dash, ItemName.climb]],
 }
 
 location_hard_moves_logic: Dict[str, List[List[str]]] = {
-    LocationName.strawberry_3:  [[ItemName.air_dash],
-                                 [ItemName.skid_jump]],
     LocationName.strawberry_5:  [[ItemName.ground_dash],
                                  [ItemName.air_dash]],
-    LocationName.strawberry_8:  [[ItemName.traffic_block],
-                                 [ItemName.ground_dash, ItemName.air_dash]],
     LocationName.strawberry_10: [[ItemName.air_dash],
                                  [ItemName.climb]],
     LocationName.strawberry_11: [[ItemName.ground_dash],
                                  [ItemName.air_dash],
                                  [ItemName.skid_jump]],
-    LocationName.strawberry_12: [[ItemName.feather],
-                                 [ItemName.ground_dash],
-                                 [ItemName.air_dash]],
     LocationName.strawberry_13: [[ItemName.breakables, ItemName.ground_dash],
                                  [ItemName.breakables, ItemName.air_dash]],
     LocationName.strawberry_14: [[ItemName.feather, ItemName.air_dash],
-                                 [ItemName.air_dash, ItemName.climb]],
+                                 [ItemName.air_dash, ItemName.climb],
+                                 [ItemName.double_dash_refill, ItemName.air_dash]],
     LocationName.strawberry_15: [[ItemName.feather],
                                  [ItemName.ground_dash, ItemName.air_dash]],
     LocationName.strawberry_17: [[ItemName.double_dash_refill, ItemName.traffic_block]],
@@ -287,42 +107,94 @@ location_hard_moves_logic: Dict[str, List[List[str]]] = {
                                  [ItemName.cassette, ItemName.feather, ItemName.climb]],
     LocationName.strawberry_29: [[ItemName.cassette, ItemName.dash_refill, ItemName.air_dash, ItemName.skid_jump],
                                  [ItemName.cassette, ItemName.ground_dash, ItemName.air_dash]],
-    LocationName.strawberry_30: [[ItemName.cassette, ItemName.dash_refill, ItemName.double_dash_refill, ItemName.traffic_block, ItemName.breakables, ItemName.ground_dash, ItemName.air_dash, ItemName.climb, ItemName.skid_jump],
-                                 [ItemName.cassette, ItemName.dash_refill, ItemName.double_dash_refill, ItemName.traffic_block, ItemName.breakables, ItemName.feather, ItemName.air_dash, ItemName.climb, ItemName.skid_jump],
-                                 [ItemName.cassette, ItemName.dash_refill, ItemName.double_dash_refill, ItemName.traffic_block, ItemName.breakables, ItemName.spring, ItemName.ground_dash, ItemName.air_dash, ItemName.climb],
-                                 [ItemName.cassette, ItemName.dash_refill, ItemName.double_dash_refill, ItemName.traffic_block, ItemName.breakables, ItemName.spring, ItemName.feather, ItemName.air_dash, ItemName.climb]],
-
-    LocationName.badeline_1: [[ItemName.double_dash_refill, ItemName.feather, ItemName.traffic_block, ItemName.breakables, ItemName.air_dash, ItemName.climb],
-                              [ItemName.traffic_block, ItemName.air_dash, ItemName.skid_jump],
-                              [ItemName.ground_dash, ItemName.air_dash, ItemName.skid_jump],
-                              [ItemName.feather, ItemName.traffic_block, ItemName.air_dash],
-                              [ItemName.traffic_block, ItemName.ground_dash, ItemName.air_dash]],
-    LocationName.badeline_2: [[ItemName.double_dash_refill, ItemName.feather, ItemName.traffic_block, ItemName.breakables, ItemName.air_dash, ItemName.climb],
-                              [ItemName.traffic_block, ItemName.air_dash, ItemName.skid_jump],
-                              [ItemName.ground_dash, ItemName.air_dash, ItemName.skid_jump],
-                              [ItemName.feather, ItemName.traffic_block, ItemName.air_dash],
-                              [ItemName.traffic_block, ItemName.ground_dash, ItemName.air_dash]],
-    LocationName.badeline_3: [[ItemName.double_dash_refill, ItemName.feather, ItemName.traffic_block, ItemName.breakables, ItemName.air_dash, ItemName.climb],
-                              [ItemName.traffic_block, ItemName.air_dash, ItemName.skid_jump],
-                              [ItemName.ground_dash, ItemName.air_dash, ItemName.skid_jump],
-                              [ItemName.feather, ItemName.traffic_block, ItemName.air_dash],
-                              [ItemName.traffic_block, ItemName.ground_dash, ItemName.air_dash]],
+    LocationName.strawberry_30: [[ItemName.cassette, ItemName.dash_refill, ItemName.double_dash_refill, ItemName.traffic_block, ItemName.breakables, ItemName.air_dash, ItemName.climb, ItemName.skid_jump],
+                                 [ItemName.cassette, ItemName.dash_refill, ItemName.double_dash_refill, ItemName.traffic_block, ItemName.breakables, ItemName.spring, ItemName.air_dash, ItemName.climb]],
 
     LocationName.sign_2: [[ItemName.breakables, ItemName.ground_dash],
                           [ItemName.breakables, ItemName.air_dash]],
-    LocationName.sign_5: [[ItemName.double_dash_refill, ItemName.feather, ItemName.traffic_block, ItemName.breakables, ItemName.air_dash, ItemName.climb],
-                          [ItemName.traffic_block, ItemName.air_dash, ItemName.skid_jump],
-                          [ItemName.ground_dash, ItemName.air_dash, ItemName.skid_jump],
-                          [ItemName.feather, ItemName.traffic_block, ItemName.air_dash],
-                          [ItemName.traffic_block, ItemName.ground_dash, ItemName.air_dash]],
 
     LocationName.car_2: [[ItemName.breakables, ItemName.ground_dash],
                          [ItemName.breakables, ItemName.air_dash]],
 }
 
 
-def location_rule(state: CollectionState, world: Celeste64World, loc: str) -> bool:
+region_standard_moves_logic: Dict[Tuple[str], List[List[str]]] = {
+    (RegionName.forsaken_city, RegionName.granny_island):        [[ItemName.checkpoint_2], [ItemName.checkpoint_3], [ItemName.checkpoint_4]],
+    (RegionName.forsaken_city, RegionName.highway_island):       [[ItemName.checkpoint_5], [ItemName.checkpoint_6]],
+    (RegionName.forsaken_city, RegionName.ne_feathers_island):   [[ItemName.checkpoint_7]],
+    (RegionName.forsaken_city, RegionName.se_house_island):      [[ItemName.checkpoint_8]],
+    (RegionName.forsaken_city, RegionName.badeline_tower_upper): [[ItemName.checkpoint_9]],
+    (RegionName.forsaken_city, RegionName.badeline_island):      [[ItemName.checkpoint_10]],
 
+    (RegionName.intro_islands, RegionName.granny_island): [[ItemName.ground_dash],
+                                                           [ItemName.air_dash],
+                                                           [ItemName.skid_jump],
+                                                           [ItemName.climb]],
+
+    (RegionName.granny_island, RegionName.highway_island): [[ItemName.air_dash, ItemName.dash_refill]],
+    (RegionName.granny_island, RegionName.nw_girders_island): [[ItemName.traffic_block]],
+    (RegionName.granny_island, RegionName.badeline_tower_lower): [[ItemName.air_dash, ItemName.climb, ItemName.dash_refill]],
+    (RegionName.granny_island, RegionName.se_house_island): [[ItemName.air_dash, ItemName.climb, ItemName.double_dash_refill]],
+    
+    (RegionName.highway_island, RegionName.granny_island): [[ItemName.traffic_block], [ItemName.air_dash, ItemName.dash_refill]],
+    (RegionName.highway_island, RegionName.ne_feathers_island): [[ItemName.feather]],
+    (RegionName.highway_island, RegionName.nw_girders_island): [[ItemName.cannot_access]],
+    
+    (RegionName.nw_girders_island, RegionName.highway_island): [[ItemName.traffic_block]],
+    
+    (RegionName.ne_feathers_island, RegionName.highway_island): [[ItemName.feather]],
+    (RegionName.ne_feathers_island, RegionName.badeline_tower_lower): [[ItemName.feather]],
+    (RegionName.ne_feathers_island, RegionName.badeline_tower_upper): [[ItemName.climb, ItemName.air_dash, ItemName.feather]],
+    
+    (RegionName.se_house_island, RegionName.granny_island): [[ItemName.air_dash, ItemName.traffic_block, ItemName.double_dash_refill]],
+    (RegionName.se_house_island, RegionName.badeline_tower_lower): [[ItemName.air_dash, ItemName.double_dash_refill]],
+    
+    (RegionName.badeline_tower_lower, RegionName.se_house_island): [[ItemName.cannot_access]],
+    (RegionName.badeline_tower_lower, RegionName.ne_feathers_island): [[ItemName.air_dash, ItemName.breakables, ItemName.feather]],
+    (RegionName.badeline_tower_lower, RegionName.granny_island): [[ItemName.cannot_access]],
+    (RegionName.badeline_tower_lower, RegionName.badeline_tower_upper): [[ItemName.cannot_access]],
+    
+    (RegionName.badeline_tower_upper, RegionName.badeline_island): [[ItemName.air_dash, ItemName.climb, ItemName.double_dash_refill, ItemName.feather, ItemName.traffic_block, ItemName.breakables]],
+    (RegionName.badeline_tower_upper, RegionName.se_house_island): [[ItemName.air_dash], [ItemName.ground_dash]],
+    (RegionName.badeline_tower_upper, RegionName.ne_feathers_island): [[ItemName.air_dash], [ItemName.ground_dash]],
+    (RegionName.badeline_tower_upper, RegionName.granny_island): [[ItemName.dash_refill]],
+    
+    (RegionName.badeline_island, RegionName.badeline_tower_upper): [[ItemName.air_dash], [ItemName.ground_dash]],
+}
+
+region_hard_moves_logic: Dict[Tuple[str], List[List[str]]] = {
+    (RegionName.forsaken_city, RegionName.granny_island):        [[ItemName.checkpoint_2], [ItemName.checkpoint_3], [ItemName.checkpoint_4]],
+    (RegionName.forsaken_city, RegionName.highway_island):       [[ItemName.checkpoint_5], [ItemName.checkpoint_6]],
+    (RegionName.forsaken_city, RegionName.ne_feathers_island):   [[ItemName.checkpoint_7]],
+    (RegionName.forsaken_city, RegionName.se_house_island):      [[ItemName.checkpoint_8]],
+    (RegionName.forsaken_city, RegionName.badeline_tower_upper): [[ItemName.checkpoint_9]],
+    (RegionName.forsaken_city, RegionName.badeline_island):      [[ItemName.checkpoint_10]],
+
+    (RegionName.granny_island, RegionName.nw_girders_island): [[ItemName.traffic_block]],
+    (RegionName.granny_island, RegionName.badeline_tower_lower): [[ItemName.air_dash], [ItemName.ground_dash]],
+    (RegionName.granny_island, RegionName.se_house_island): [[ItemName.air_dash, ItemName.double_dash_refill], [ItemName.ground_dash]],
+    
+    (RegionName.highway_island, RegionName.nw_girders_island): [[ItemName.air_dash, ItemName.ground_dash]],
+    
+    (RegionName.nw_girders_island, RegionName.highway_island): [[ItemName.traffic_block], [ItemName.air_dash, ItemName.ground_dash]],
+    
+    (RegionName.ne_feathers_island, RegionName.highway_island): [[ItemName.feather], [ItemName.air_dash], [ItemName.ground_dash], [ItemName.skid_jump]],
+    (RegionName.ne_feathers_island, RegionName.badeline_tower_lower): [[ItemName.feather], [ItemName.air_dash], [ItemName.ground_dash]],
+    (RegionName.ne_feathers_island, RegionName.badeline_tower_upper): [[ItemName.feather]],
+    
+    (RegionName.se_house_island, RegionName.granny_island): [[ItemName.traffic_block]],
+    (RegionName.se_house_island, RegionName.badeline_tower_lower): [[ItemName.air_dash], [ItemName.ground_dash]],
+    
+    (RegionName.badeline_tower_upper, RegionName.badeline_island): [[ItemName.air_dash, ItemName.climb, ItemName.feather, ItemName.traffic_block],
+                                                                    [ItemName.air_dash, ItemName.climb, ItemName.feather, ItemName.skid_jump],
+                                                                    [ItemName.air_dash, ItemName.climb, ItemName.ground_dash, ItemName.traffic_block],
+                                                                    [ItemName.air_dash, ItemName.climb, ItemName.ground_dash, ItemName.skid_jump]],
+
+    (RegionName.badeline_island, RegionName.badeline_tower_upper): [[ItemName.air_dash], [ItemName.ground_dash]],
+}
+
+
+def location_rule(state: CollectionState, world: Celeste64World, loc: str) -> bool:
     if loc not in world.active_logic_mapping:
         return True
 
@@ -332,12 +204,28 @@ def location_rule(state: CollectionState, world: Celeste64World, loc: str) -> bo
 
     return False
 
-def goal_rule(state: CollectionState, world: Celeste64World) -> bool:
-    if not state.has(ItemName.strawberry, world.player, world.strawberries_required):
-        return False
+def region_connection_rule(state: CollectionState, world: Celeste64World, region_connection: Tuple[str]) -> bool:
+    if region_connection not in world.active_region_logic_mapping:
+        return True
 
-    for possible_access in world.goal_logic_mapping:
+    for possible_access in world.active_region_logic_mapping[region_connection]:
         if state.has_all(possible_access, world.player):
             return True
 
     return False
+
+def goal_rule(state: CollectionState, world: Celeste64World) -> bool:
+    if not state.has(ItemName.strawberry, world.player, world.strawberries_required):
+        return False
+
+    goal_region: Region = world.multiworld.get_region(RegionName.badeline_island, world.player)
+    return state.can_reach(goal_region)
+
+def connect_region(world: Celeste64World, region: Region, dest_regions: List[str]):
+    rules: Dict[str, Callable[[CollectionState], bool]] = {}
+
+    for dest_region in dest_regions:
+        region_connection: Tuple[str] = (region.name, dest_region)
+        rules[dest_region] = lambda state, region_connection=region_connection: region_connection_rule(state, world, region_connection)
+
+    region.add_exits(dest_regions, rules)
diff --git a/worlds/celeste64/__init__.py b/worlds/celeste64/__init__.py
index 7786e38123..04eae0c444 100644
--- a/worlds/celeste64/__init__.py
+++ b/worlds/celeste64/__init__.py
@@ -1,13 +1,15 @@
 from copy import deepcopy
-from typing import Dict, List
+from typing import Dict, List, Tuple
 
 from BaseClasses import ItemClassification, Location, Region, Tutorial
 from worlds.AutoWorld import WebWorld, World
-from .Items import Celeste64Item, unlockable_item_data_table, move_item_data_table, item_data_table, item_table
+from .Items import Celeste64Item, unlockable_item_data_table, move_item_data_table, item_data_table,\
+                                  checkpoint_item_data_table, item_table
 from .Locations import Celeste64Location, strawberry_location_data_table, friend_location_data_table,\
-                                          sign_location_data_table, car_location_data_table, location_table
+                                          sign_location_data_table, car_location_data_table, checkpoint_location_data_table,\
+                                          location_table
 from .Names import ItemName, LocationName
-from .Options import Celeste64Options, celeste_64_option_groups
+from .Options import Celeste64Options, celeste_64_option_groups, resolve_options
 
 
 class Celeste64WebWorld(WebWorld):
@@ -42,8 +44,15 @@ class Celeste64World(World):
     # Instance Data
     strawberries_required: int
     active_logic_mapping: Dict[str, List[List[str]]]
-    goal_logic_mapping: Dict[str, List[List[str]]]
+    active_region_logic_mapping: Dict[Tuple[str], List[List[str]]]
 
+    madeline_one_dash_hair_color: int
+    madeline_two_dash_hair_color: int
+    madeline_no_dash_hair_color: int
+    madeline_feather_hair_color: int
+
+    def generate_early(self) -> None:
+        resolve_options(self)
 
     def create_item(self, name: str) -> Celeste64Item:
         # Only make required amount of strawberries be Progression
@@ -76,25 +85,49 @@ class Celeste64World(World):
                       for name in unlockable_item_data_table.keys()
                       if name not in self.options.start_inventory]
 
-        if self.options.move_shuffle:
-            move_items_for_itempool: List[str] = deepcopy(list(move_item_data_table.keys()))
+        chosen_start_item: str = ""
 
+        if self.options.move_shuffle:
             if self.options.logic_difficulty == "standard":
-                # If the start_inventory already includes a move, don't worry about giving it one
-                if not [move for move in move_items_for_itempool if move in self.options.start_inventory]:
-                    chosen_start_move = self.random.choice(move_items_for_itempool)
-                    move_items_for_itempool.remove(chosen_start_move)
+                possible_unwalls: List[str] = [name for name in move_item_data_table.keys()
+                                                if name != ItemName.skid_jump]
+
+                if self.options.checkpointsanity:
+                    possible_unwalls.extend([name for name in checkpoint_item_data_table.keys()
+                                                if name != ItemName.checkpoint_1 and name != ItemName.checkpoint_10])
+
+                # If the start_inventory already includes a move or checkpoint, don't worry about giving it one
+                if not [item for item in possible_unwalls if item in self.multiworld.precollected_items[self.player]]:
+                    chosen_start_item = self.random.choice(possible_unwalls)
 
                     if self.options.carsanity:
                         intro_car_loc: Location = self.multiworld.get_location(LocationName.car_1, self.player)
-                        intro_car_loc.place_locked_item(self.create_item(chosen_start_move))
+                        intro_car_loc.place_locked_item(self.create_item(chosen_start_item))
                         location_count -= 1
                     else:
-                        self.multiworld.push_precollected(self.create_item(chosen_start_move))
+                        self.multiworld.push_precollected(self.create_item(chosen_start_item))
 
             item_pool += [self.create_item(name)
-                          for name in move_items_for_itempool
-                          if name not in self.options.start_inventory]
+                          for name in move_item_data_table.keys()
+                          if name not in self.multiworld.precollected_items[self.player]
+                          and name != chosen_start_item]
+        else:
+            for start_move in move_item_data_table.keys():
+                self.multiworld.push_precollected(self.create_item(start_move))
+
+        if self.options.checkpointsanity:
+            location_count += 9
+            goal_checkpoint_loc: Location = self.multiworld.get_location(LocationName.checkpoint_10, self.player)
+            goal_checkpoint_loc.place_locked_item(self.create_item(ItemName.checkpoint_10))
+            item_pool += [self.create_item(name)
+                          for name in checkpoint_item_data_table.keys()
+                          if name not in self.multiworld.precollected_items[self.player]
+                          and name != ItemName.checkpoint_10
+                          and name != chosen_start_item]
+        else:
+            for item_name in checkpoint_item_data_table.keys():
+                checkpoint_loc: Location = self.multiworld.get_location(item_name, self.player)
+                checkpoint_loc.place_locked_item(self.create_item(item_name))
 
         real_total_strawberries: int = min(self.options.total_strawberries.value, location_count - len(item_pool))
         self.strawberries_required = int(real_total_strawberries * (self.options.strawberries_required_percentage / 100))
@@ -140,18 +173,23 @@ class Celeste64World(World):
                     if location_data.region == region_name
                 }, Celeste64Location)
 
-            region.add_exits(region_data_table[region_name].connecting_regions)
+            region.add_locations({
+                location_name: location_data.address for location_name, location_data in checkpoint_location_data_table.items()
+                if location_data.region == region_name
+            }, Celeste64Location)
+
+            from .Rules import connect_region
+            connect_region(self, region, region_data_table[region_name].connecting_regions)
+
+        # Have to do this here because of other games using State in a way that's bad
+        from .Rules import set_rules
+        set_rules(self)
 
 
     def get_filler_item_name(self) -> str:
         return ItemName.raspberry
 
 
-    def set_rules(self) -> None:
-        from .Rules import set_rules
-        set_rules(self)
-
-
     def fill_slot_data(self):
         return {
             "death_link": self.options.death_link.value,
@@ -161,6 +199,11 @@ class Celeste64World(World):
             "friendsanity": self.options.friendsanity.value,
             "signsanity": self.options.signsanity.value,
             "carsanity": self.options.carsanity.value,
+            "checkpointsanity": self.options.checkpointsanity.value,
+            "madeline_one_dash_hair_color": self.madeline_one_dash_hair_color,
+            "madeline_two_dash_hair_color": self.madeline_two_dash_hair_color,
+            "madeline_no_dash_hair_color": self.madeline_no_dash_hair_color,
+            "madeline_feather_hair_color": self.madeline_feather_hair_color,
             "badeline_chaser_source": self.options.badeline_chaser_source.value,
             "badeline_chaser_frequency": self.options.badeline_chaser_frequency.value,
             "badeline_chaser_speed": self.options.badeline_chaser_speed.value,
diff --git a/worlds/civ_6/Container.py b/worlds/civ_6/Container.py
index 26bb08c03b..f920781bd1 100644
--- a/worlds/civ_6/Container.py
+++ b/worlds/civ_6/Container.py
@@ -1,9 +1,10 @@
 from dataclasses import dataclass
 import os
+import io
 from typing import TYPE_CHECKING, Dict, List, Optional, cast
 import zipfile
 from BaseClasses import Location
-from worlds.Files import APContainer
+from worlds.Files import APContainer, AutoPatchRegister
 
 from .Enum import CivVICheckType
 from .Locations import CivVILocation, CivVILocationData
@@ -25,18 +26,22 @@ class CivTreeItem:
     ui_tree_row: int
 
 
-class CivVIContainer(APContainer):
+class CivVIContainer(APContainer, metaclass=AutoPatchRegister):
     """
     Responsible for generating the dynamic mod files for the Civ VI multiworld
     """
     game: Optional[str] = "Civilization VI"
+    patch_file_ending = ".apcivvi"
 
-    def __init__(self, patch_data: Dict[str, str], base_path: str, output_directory: str,
+    def __init__(self, patch_data: Dict[str, str] | io.BytesIO, base_path: str = "", output_directory: str = "",
                  player: Optional[int] = None, player_name: str = "", server: str = ""):
-        self.patch_data = patch_data
-        self.file_path = base_path
-        container_path = os.path.join(output_directory, base_path + ".apcivvi")
-        super().__init__(container_path, player, player_name, server)
+        if isinstance(patch_data, io.BytesIO):
+            super().__init__(patch_data, player, player_name, server)
+        else:
+            self.patch_data = patch_data
+            self.file_path = base_path
+            container_path = os.path.join(output_directory, base_path + ".apcivvi")
+            super().__init__(container_path, player, player_name, server)
 
     def write_contents(self, opened_zipfile: zipfile.ZipFile) -> None:
         for filename, yml in self.patch_data.items():
diff --git a/worlds/cvcotm/__init__.py b/worlds/cvcotm/__init__.py
index 4466ed79bd..0f5077e709 100644
--- a/worlds/cvcotm/__init__.py
+++ b/worlds/cvcotm/__init__.py
@@ -19,8 +19,8 @@ from worlds.AutoWorld import WebWorld, World
 
 from .aesthetics import shuffle_sub_weapons, get_location_data, get_countdown_flags, populate_enemy_drops, \
     get_start_inventory_data
-from .rom import RomData, patch_rom, get_base_rom_path, CVCotMProcedurePatch, CVCOTM_CT_US_HASH, CVCOTM_AC_US_HASH, \
-    CVCOTM_VC_US_HASH
+from .rom import RomData, patch_rom, get_base_rom_path, CVCotMProcedurePatch, CVCOTM_CT_US_HASH, CVCOTM_AC_US_HASH
+    # CVCOTM_VC_US_HASH
 from .client import CastlevaniaCotMClient
 
 
@@ -29,7 +29,8 @@ class CVCotMSettings(settings.Group):
         """File name of the Castlevania CotM US rom"""
         copy_to = "Castlevania - Circle of the Moon (USA).gba"
         description = "Castlevania CotM (US) ROM File"
-        md5s = [CVCOTM_CT_US_HASH, CVCOTM_AC_US_HASH, CVCOTM_VC_US_HASH]
+        # md5s = [CVCOTM_CT_US_HASH, CVCOTM_AC_US_HASH, CVCOTM_VC_US_HASH]
+        md5s = [CVCOTM_CT_US_HASH, CVCOTM_AC_US_HASH]
 
     rom_file: RomFile = RomFile(RomFile.copy_to)
 
diff --git a/worlds/cvcotm/docs/en_Castlevania - Circle of the Moon.md b/worlds/cvcotm/docs/en_Castlevania - Circle of the Moon.md
index e81b79bf20..695c5f0ff9 100644
--- a/worlds/cvcotm/docs/en_Castlevania - Circle of the Moon.md	
+++ b/worlds/cvcotm/docs/en_Castlevania - Circle of the Moon.md	
@@ -153,11 +153,10 @@ Advance Collection ROM; most notably the fact that the audio does not function w
 which is currently a requirement to connect to a multiworld. This happens because all audio code was stripped
 from the ROM, and all sound is instead played by the collection through external means.
 
-For this reason, it is most recommended to obtain the ROM by dumping it from an original cartridge of the game that you legally own.
-Though, the Advance Collection *can* still technically be an option if you cannot do that and don't mind the lack of sound.
+The Wii U Virtual Console version does not work due to changes in the code in that version.
 
-The Wii U Virtual Console version is currently untested. If you happen to have purchased it before the Wii U eShop shut down, you can try
-dumping and playing with it. However, at the moment, we cannot guarantee that it will work well due to it being untested.
+Due to the reasons mentioned above, it is most recommended to obtain the ROM by dumping it from an original cartridge of the
+game that you legally own. However, the Advance Collection *is* an option if you cannot do that and don't mind the lack of sound.
 
 Regardless of which released ROM you intend to try playing with, the US version of the game is required.
 
diff --git a/worlds/cvcotm/docs/setup_en.md b/worlds/cvcotm/docs/setup_en.md
index 7899ac9973..459e0d6afb 100644
--- a/worlds/cvcotm/docs/setup_en.md
+++ b/worlds/cvcotm/docs/setup_en.md
@@ -4,7 +4,7 @@
 
 - [Archipelago](https://github.com/ArchipelagoMW/Archipelago/releases/latest).
 - A Castlevania: Circle of the Moon ROM of the US version specifically. The Archipelago community cannot provide this.
-The Castlevania Advance Collection ROM can technically be used, but it has no audio. The Wii U Virtual Console ROM is untested.
+The Castlevania Advance Collection ROM can be used, but it has no audio. The Wii U Virtual Console ROM does not work.
 - [BizHawk](https://tasvideos.org/BizHawk/ReleaseHistory) 2.7 or later.
 
 ### Configuring BizHawk
diff --git a/worlds/cvcotm/rom.py b/worlds/cvcotm/rom.py
index e7b0710d13..6ae0b6e438 100644
--- a/worlds/cvcotm/rom.py
+++ b/worlds/cvcotm/rom.py
@@ -22,11 +22,9 @@ if TYPE_CHECKING:
 
 CVCOTM_CT_US_HASH = "50a1089600603a94e15ecf287f8d5a1f"  # Original GBA cartridge ROM
 CVCOTM_AC_US_HASH = "87a1bd6577b6702f97a60fc55772ad74"  # Castlevania Advance Collection ROM
-CVCOTM_VC_US_HASH = "2cc38305f62b337281663bad8c901cf9"  # Wii U Virtual Console ROM
+# CVCOTM_VC_US_HASH = "2cc38305f62b337281663bad8c901cf9"  # Wii U Virtual Console ROM
 
-# NOTE: The Wii U VC version is untested as of when this comment was written. I am only including its hash in case it
-# does work. If someone who has it can confirm it does indeed work, this comment should be removed. If it doesn't, the
-# hash should be removed in addition. See the Game Page for more information about supported versions.
+# The Wii U VC version is not currently supported. See the Game Page for more info.
 
 ARCHIPELAGO_IDENTIFIER_START = 0x7FFF00
 ARCHIPELAGO_IDENTIFIER = "ARCHIPELAG03"
@@ -518,7 +516,8 @@ class CVCotMPatchExtensions(APPatchExtension):
 
 
 class CVCotMProcedurePatch(APProcedurePatch, APTokenMixin):
-    hash = [CVCOTM_CT_US_HASH, CVCOTM_AC_US_HASH, CVCOTM_VC_US_HASH]
+    # hash = [CVCOTM_CT_US_HASH, CVCOTM_AC_US_HASH, CVCOTM_VC_US_HASH]
+    hash = [CVCOTM_CT_US_HASH, CVCOTM_AC_US_HASH]
     patch_file_ending: str = ".apcvcotm"
     result_file_ending: str = ".gba"
 
@@ -585,7 +584,8 @@ def get_base_rom_bytes(file_name: str = "") -> bytes:
 
         basemd5 = hashlib.md5()
         basemd5.update(base_rom_bytes)
-        if basemd5.hexdigest() not in [CVCOTM_CT_US_HASH, CVCOTM_AC_US_HASH, CVCOTM_VC_US_HASH]:
+        # if basemd5.hexdigest() not in [CVCOTM_CT_US_HASH, CVCOTM_AC_US_HASH, CVCOTM_VC_US_HASH]:
+        if basemd5.hexdigest() not in [CVCOTM_CT_US_HASH, CVCOTM_AC_US_HASH]:
             raise Exception("Supplied Base ROM does not match known MD5s for Castlevania: Circle of the Moon USA."
                             "Get the correct game and version, then dump it.")
         setattr(get_base_rom_bytes, "base_rom_bytes", base_rom_bytes)
diff --git a/worlds/factorio/Client.py b/worlds/factorio/Client.py
index ac58339c5e..ff1de17f0b 100644
--- a/worlds/factorio/Client.py
+++ b/worlds/factorio/Client.py
@@ -530,7 +530,7 @@ server_args = ("--rcon-port", rcon_port, "--rcon-password", rcon_password)
 def launch():
     import colorama
     global executable, server_settings, server_args
-    colorama.init()
+    colorama.just_fix_windows_console()
 
     if server_settings:
         server_settings = os.path.abspath(server_settings)
diff --git a/worlds/hk/docs/setup_en.md b/worlds/hk/docs/setup_en.md
index 21cdcb68b3..25f7c78075 100644
--- a/worlds/hk/docs/setup_en.md
+++ b/worlds/hk/docs/setup_en.md
@@ -8,8 +8,14 @@
 
 ## Installing the Archipelago Mod using Lumafly
 1. Launch Lumafly and ensure it locates your Hollow Knight installation directory.
-2. Click the "Install" button near the "Archipelago" mod entry.
-   * If desired, also install "Archipelago Map Mod" to use as an in-game tracker.
+2. Install the Archipelago mods by doing either of the following:
+   * Click one of the links below to allow Lumafly to install the mods. Lumafly will prompt for confirmation.
+     * [Archipelago and dependencies only](https://themulhima.github.io/Lumafly/commands/download/?mods=Archipelago)
+     * [Archipelago with rando essentials](https://themulhima.github.io/Lumafly/commands/download/?mods=Archipelago/Archipelago%20Map%20Mod/RecentItemsDisplay/DebugMod/RandoStats/Additional%20Timelines/CompassAlwaysOn/AdditionalMaps/)
+       (includes Archipelago Map Mod, RecentItemsDisplay, DebugMod, RandoStats, AdditionalTimelines, CompassAlwaysOn,
+       and AdditionalMaps).
+   * Click the "Install" button near the "Archipelago" mod entry. If desired, also install "Archipelago Map Mod"
+     to use as an in-game tracker.
 3. Launch the game, you're all set!
 
 ### What to do if Lumafly fails to find your installation directory
diff --git a/worlds/kh1/Client.py b/worlds/kh1/Client.py
index 33fba85f6c..b98f215312 100644
--- a/worlds/kh1/Client.py
+++ b/worlds/kh1/Client.py
@@ -295,6 +295,6 @@ def launch():
     parser = get_base_parser(description="KH1 Client, for text interfacing.")
 
     args, rest = parser.parse_known_args()
-    colorama.init()
+    colorama.just_fix_windows_console()
     asyncio.run(main(args))
     colorama.deinit()
diff --git a/worlds/kh2/Client.py b/worlds/kh2/Client.py
index 15a103c2a1..96b406c72f 100644
--- a/worlds/kh2/Client.py
+++ b/worlds/kh2/Client.py
@@ -981,6 +981,6 @@ def launch():
     parser = get_base_parser(description="KH2 Client, for text interfacing.")
 
     args, rest = parser.parse_known_args()
-    colorama.init()
+    colorama.just_fix_windows_console()
     asyncio.run(main(args))
     colorama.deinit()
diff --git a/worlds/ladx/ItemIconGuessing.py b/worlds/ladx/ItemIconGuessing.py
index e3d2ad7b82..907c466e81 100644
--- a/worlds/ladx/ItemIconGuessing.py
+++ b/worlds/ladx/ItemIconGuessing.py
@@ -107,6 +107,7 @@ SYNONYMS = {
     'JUMP': 'FEATHER',
     'PLUME': 'FEATHER',
     'WING': 'FEATHER',
+    "QUILL": "FEATHER",
 
     # SHOVEL
     'DIG': 'SHOVEL',
@@ -343,6 +344,8 @@ SYNONYMS = {
     # TRADING_ITEM_LETTER
     'CARD': 'TRADING_ITEM_LETTER',
     'MESSAGE': 'TRADING_ITEM_LETTER',
+    "TICKET": 'TRADING_ITEM_LETTER',
+    "PASS": 'TRADING_ITEM_LETTER',
 
     # TRADING_ITEM_BROOM
     'SWEEP': 'TRADING_ITEM_BROOM',
@@ -365,6 +368,8 @@ SYNONYMS = {
     'MIRROR': 'TRADING_ITEM_MAGNIFYING_GLASS',
     'SCOPE': 'TRADING_ITEM_MAGNIFYING_GLASS',
     'XRAY': 'TRADING_ITEM_MAGNIFYING_GLASS',
+    "DETECTOR": 'TRADING_ITEM_MAGNIFYING_GLASS',
+    "ITEMFINDER": 'TRADING_ITEM_MAGNIFYING_GLASS',
 
     # PIECE_OF_POWER
     'TRIANGLE': 'PIECE_OF_POWER',
@@ -378,6 +383,7 @@ PHRASES = {
     'BOSS KEY': 'NIGHTMARE_KEY',
     'HEART PIECE': 'HEART_PIECE',
     'PIECE OF HEART': 'HEART_PIECE',
+    "ROCK SMASH": 'BOMB', 
 }
 
 # All following will only be used to match items for the specific game.
@@ -404,6 +410,16 @@ GAME_SPECIFIC_PHRASES = {
 
     'Ocarina of Time': {
         'COJIRO': 'ROOSTER',
+        "Goron Tunic": "RED_TUNIC",
+        "Zora Tunic": "BLUE_TUNIC",
+        "Wallet": "MAGIC_POWDER",
+        "Medallion": "PIECE_OF_POWER",
+        "Kokiri Emerald": "RUPEES_500",
+        "Goron Ruby": "RUPEES_500",
+        "Zora Sapphire": "RUPEES_500",
+        "Dins Fire": "MAGIC_ROD", # Fire shield
+        "Nayrus Love": "MAGIC_ROD", # Protective barrier
+        "Farores Wind": "MAGIC_ROD", # Create/use warp point in dungeons
     },
 
     'SMZ3': {
@@ -417,10 +433,14 @@ GAME_SPECIFIC_PHRASES = {
 
     'Sonic Adventure 2 Battle': {
         'CHAOS EMERALD': 'PIECE_OF_POWER',
+        "Rings": "RUPEES_20", # This should only affect filler Rings currency, not Flame Ring upgrade
+        "Grapes": "TRADING_ITEM_PINEAPPLE",
+        "Pick Nails": "SHOVEL", # Digging upgrade
     },
 
     'Super Mario 64': {
         'POWER STAR': 'PIECE_OF_POWER',
+        "Key": "NIGHTMARE_KEY" # Affect 2nd Floor / Basement / Progressive keys
     },
 
     'Super Mario World': {
@@ -528,4 +548,336 @@ GAME_SPECIFIC_PHRASES = {
         '2500 Tokens': 'RUPEES_500',
         '5000 Tokens': 'RUPEES_500',
     },
+
+    "Donkey Kong Country 3": {
+        "Flupperius Petallus Pongus": "TRADING_ITEM_HIBISCUS", # It's a flower in the game
+        "Banana Bird": "ROOSTER", # Made sure this is a BIRD, not a BANANA
+    },
+
+    "Pokemon Red and Blue": {
+
+        # Key Items
+
+        "Old Amber": "STONE_BEAK", # Aerodactyl's fossil should still be a fossil
+        "Coin Case": "MAGIC_POWDER", # This shouldn't spawn as RUPEES
+        "Bike Voucher": "TRADING_ITEM_LETTER",
+        "Oak's Parcel": "TRADING_ITEM_LETTER",
+
+        # Drinks always get converted to MEDICINE
+        "Soda Pop": "MEDICINE",
+        "Fresh Water": "MEDICINE",
+
+        # Consumables
+        "Elixir": "MEDICINE",
+        "Ether": "MEDICINE",
+        "Antidote": "MEDICINE",
+        "Awakening": "MEDICINE",
+        "Burn Heal": "MEDICINE",
+        "Ice Heal": "MEDICINE",
+        "Paralyze Heal": "MEDICINE",
+        "Full Heal": "MEDICINE",
+        "Full Restore": "MEDICINE",
+    },
+
+    "Pokemon Emerald": {
+
+        "Coin Case": "MAGIC_POWDER", # This shouldn't spawn as RUPEES
+
+        # Drinks always get converted to MEDICINE
+        
+        "Soda Pop": "MEDICINE",
+        "Fresh Water": "MEDICINE",
+
+        # Consumables
+        "Elixir": "MEDICINE",
+        "Ether": "MEDICINE",
+        "Antidote": "MEDICINE",
+        "Awakening": "MEDICINE",
+        "Burn Heal": "MEDICINE",
+        "Ice Heal": "MEDICINE",
+        "Paralyze Heal": "MEDICINE",
+        "Full Heal": "MEDICINE",
+        "Full Restore": "MEDICINE",
+        "Nanab Berry": "TRADING_ITEM_BANANAS", # Special exception for Nanab Berry, which look like bananas
+        "Berry": "TRADING_ITEM_PINEAPPLE",
+        "Mail": "TRADING_ITEM_LETTER", # Snail mail, not chain mail
+    },
+
+    "Mario & Luigi Superstar Saga": {
+
+        # Key Items
+        "Peach's Extra Dress": "RED_TUNIC",
+        "Peasley's Rose": "TRADING_ITEM_HIBISCUS",
+        "Beanstar": "PIECE_OF_POWER", # Hits both Fake Beanstar and pieces of the real Beanstar, hopefully
+        "Beanstone": "RUPEES_500", # They're gemstones
+        "Firebrand": "POWER_BRACELET", # Magic power that affects Mario/Luigi's hands, either this or MAGIC_ROD would be okay
+        "Thunderhand": "POWER_BRACELET", # Ditto
+
+        # 1-UP Super fix
+        "1-UP Super": "TOADSTOOL",
+
+        # Drinks --> medicine
+
+        # Syrup bottles
+        "Syrup": "MEDICINE",
+
+        # Coffee blends
+        "Hoolumbian": "MEDICINE",
+        "Chuckoccino": "MEDICINE",
+        "Teeheespresso": "MEDICINE",
+        "Blend": "MEDICINE", # for all coffee blends
+
+        # Secret Scrolls --> MESSAGE
+        "Secret Scroll": "TRADING_ITEM_LETTER",
+
+        # Goblets --> MEDICINE
+        "Goblet": "MEDICINE",
+
+        # Pearl Beans --> Fruit
+        "Pearl Bean": 'TRADING_ITEM_PINEAPPLE',
+
+        # Bros. Armor --> Blue Tunic
+        "Pants": "BLUE_TUNIC",
+        "Jeans": "BLUE_TUNIC",
+        "Trousers": "BLUE_TUNIC",
+        "Slacks": "BLUE_TUNIC",
+        "Casual Coral": "BLUE_TUNIC",
+        "Shroom Bells": "BLUE_TUNIC",
+
+        # Badges --> Ribbon
+        "Badge": "TRADING_ITEM_RIBBON",
+        "Soulful Bros.": "TRADING_ITEM_RIBBON",
+        "Bros. Rock": "TRADING_ITEM_RIBBON",
+
+        # Misc. Beans --> Acorns
+        "Hoo Bean": "GUARDIAN_ACORN", # Beans and nuts are similar enough, right?
+        "Chuckle Bean": "GUARDIAN_ACORN",
+        "Hee Bean": "GUARDIAN_ACORN",
+        "Woo Bean": "GUARDIAN_ACORN", 
+    },
+
+    "DOOM 1993": {
+        "Keycard": "KEY",
+        "Computer area map": "MAP",
+        "Box of": "SINGLE_ARROW", # bullets, rockets, or shotgun shells
+        "Energy cell pack": "SINGLE_ARROW",
+        "Chainsaw": "SWORD",
+        "Medikit": "MEDICINE",
+        "Skull key": "NIGHTMARE_KEY",
+    },
+
+    "DOOM II": {
+        "Keycard": "KEY",
+        "Computer area map": "MAP",
+        "Box of": "SINGLE_ARROW", # bullets, rockets, or shotgun shells
+        "Energy cell pack": "SINGLE_ARROW",
+        "Chainsaw": "SWORD",
+        "Medikit": "MEDICINE",
+        "Skull key": "NIGHTMARE_KEY",
+    },
+
+    "Inscryption": {
+        "Extra Candle": "HEART_CONTAINER", # Candles act as extra health
+        "Magnificus Eye": "TRADING_ITEM_MAGNIFYING_GLASS", # Needed to see hidden drawings / messages
+        "Monocle": "TRADING_ITEM_MAGNIFYING_GLASS", # Ditto
+        "Pile Of Meat": "TRADING_ITEM_DOG_FOOD",
+        "Angler Hook": "TRADING_ITEM_FISHING_HOOK", # Good fish.
+        "Currency": "RUPEES_20",
+    },
+
+    "Minecraft": {
+        "Progressive Weapons": "SWORD",
+        "Progressive Tools": "SHOVEL",
+        "Archery": "BOW",
+        "Emerald": "RUPEES_20",
+        "Brewing": "MEDICINE",
+        "Spyglass": 'TRADING_ITEM_MAGNIFYING_GLASS',
+        "Porkchop": "TRADING_ITEM_DOG_FOOD"
+    },
+    "VVVVVV": {
+        "Trinket": "PIECE_OF_POWER",
+    },
+
+    "A Hat in Time": {
+        "Time Piece": "PIECE_OF_POWER",
+        "Metro Ticket": "TRADING_ITEM_LETTER",
+        "Snatcher's Contract": "TRADING_ITEM_LETTER",
+        "Pon": "RUPEES_20",
+    },
+
+    "Kingdom Hearts 2": {
+        # Goal items / Collectibles
+        "Proof of": "PIECE_OF_POWER",
+        "Lucky Emblem": "PIECE_OF_POWER",
+        "Secret Ansem's Report": "TRADING_ITEM_LETTER",
+
+        # Sora Keyblades
+        "Bond of Flame": "SWORD",
+        "Circle of Life": "SWORD",
+        "Decisive Pumpkin": "SWORD",
+        "Fatal Crest": "SWORD",
+        "Fenrir": "SWORD",
+        "Follow the Wind": "SWORD",
+        "Guardian Soul": "SWORD",
+        "Gull Wing": "SWORD",
+        "Hero's Crest": "SWORD",
+        "Hidden Dragon": "SWORD",
+        "Monochrome": "SWORD",
+        "Mysterious Abyss": "SWORD",
+        "Oathkeeper": "SWORD",
+        "Oblivion": "SWORD",
+        "Photon Debugger": "SWORD",
+        "Pureblood": "SWORD",
+        "Rumbling Rose": "SWORD",
+        "Sleeping Lion": "SWORD",
+        "Star Seeker": "SWORD",
+        "Sweet Memories": "SWORD",
+        "Two Become One": "SWORD",
+        "Ultima Weapon": "SWORD",
+        "Winner's Proof": "SWORD",
+        "Wishing Lamp": "SWORD",
+
+        # Donald Staves
+        "Centurion+": "MAGIC_ROD",
+        "Nobody Lance": "MAGIC_ROD",
+        "Precious Mushroom": "MAGIC_ROD",
+        "Precious Mushroom+": "MAGIC_ROD",
+        "Premium Mushroom": "MAGIC_ROD",
+        "Rising Dragon": "MAGIC_ROD",
+        "Save The Queen+": "MAGIC_ROD",
+        "Shaman's Relic": "MAGIC_ROD",
+        "Victory Bell": "MAGIC_ROD",
+
+        # Goofy Shields
+        "Akashic Record": "SHIELD",
+        "Frozen Pride+": "SHIELD",
+        "Majestic Mushroom": "SHIELD",
+        "Majestic Mushroom+": "SHIELD",
+        "Nobody Guard": "SHIELD",
+        "Ogre Shield": "SHIELD",
+        "Save The King+": "SHIELD",
+        "Ultimate Mushroom": "SHIELD",
+
+        # Accessories as RIBBON
+        "Star Charm": "TRADING_ITEM_RIBBON",
+        "Ring": "TRADING_ITEM_RIBBON",
+        "Earring": "TRADING_ITEM_RIBBON",
+        "Shadow Archive": "TRADING_ITEM_RIBBON",
+        "Shadow Archive+": "TRADING_ITEM_RIBBON",
+        "Full Bloom": "TRADING_ITEM_RIBBON",
+        "Full Bloom+": "TRADING_ITEM_RIBBON",
+
+        # Armor as BLUE_TUNIC
+       "Bandanna": "BLUE_TUNIC",
+       "Belt": "BLUE_TUNIC",
+       "Band": "BLUE_TUNIC",
+       "Bangle": "BLUE_TUNIC",
+       "Armlet": "BLUE_TUNIC",
+       "Trinket": "BLUE_TUNIC",
+       "Charm": "BLUE_TUNIC",
+       "Anklet": "BLUE_TUNIC",
+       "Chain": "BLUE_TUNIC",
+       "Acrisius": "BLUE_TUNIC",
+       "Ribbon": "BLUE_TUNIC",
+
+        # Magic
+        "Element": "MAGIC_ROD",
+
+        # Other
+        "Munny Pouch": "MAGIC_POWDER",
+        "Ether": "MEDICINE",
+        "Elixir": "MEDICINE",
+        "Megalixir": "MEDICINE",
+    },
+
+    "Kingdom Hearts": {
+        # Goal/collectible items
+        "Ansem's Report": "TRADING_ITEM_LETTER",
+
+        # Dalmatian puppies
+        "Puppy": "BOWWOW",
+        "Puppies": "BOWWOW",
+        
+        # Sora Keyblades
+        "Jungle King": "SWORD",
+        "Three Wishes": "SWORD",
+        "Fairy Harp": "SWORD",
+        "Pumpkinhead": "SWORD",
+        "Crabclaw": "SWORD",
+        "Divine Rose": "SWORD",
+        "Spellbinder": "SWORD",
+        "Olympia": "SWORD",
+        "Lionheart": "SWORD",
+        "Metal Chocobo": "SWORD",
+        "Oathkeeper": "SWORD",
+        "Oblivion": "SWORD",
+        "Lady Luck": "SWORD",
+        "Wishing Star": "SWORD",
+        "Ultima Weapon": "SWORD",
+        "Diamond Dust": "SWORD",
+        "One-Winged Angel": "SWORD",
+
+        # Donald Staves
+        "Morning Star": "MAGIC_ROD",
+        "Shooting Star": "MAGIC_ROD",
+        "Warhammer": "MAGIC_ROD",
+        "Silver Mallet": "MAGIC_ROD",
+        "Grand Mallet": "MAGIC_ROD",
+        "Lord Fortune": "MAGIC_ROD",
+        "Violetta": "MAGIC_ROD",
+        "Save the Queen": "MAGIC_ROD",
+        "Wizard's Relic": "MAGIC_ROD",
+        "Meteor Strike": "MAGIC_ROD",
+        "Fantasista": "MAGIC_ROD",
+
+        # Goofy Shields
+        "Smasher": "SHIELD",
+        "Gigas Fist": "SHIELD",
+        "Save the King": "SHIELD",
+        "Defender": "SHIELD",
+        "Seven Elements": "SHIELD",
+
+        # Magic
+        "Progressive Fire": "MAGIC_ROD",
+        "Progressive Blizzard": "MAGIC_ROD",
+        "Progressive Thunder": "MAGIC_ROD",
+        "Progressive Cure": "MAGIC_ROD",
+        "Progressive Gravity": "MAGIC_ROD",
+        "Progressive Stop": "MAGIC_ROD",
+        "Progressive Aero": "MAGIC_ROD",
+
+        # Accessories / armor (Let's go with BLUE_TUNIC for these, these items are closer to RPG armor anyways)
+        "Chain": "BLUE_TUNIC",
+        "Ring": "BLUE_TUNIC",
+        "Band": "BLUE_TUNIC",
+        "Three Stars": "BLUE_TUNIC",
+        "Stud": "BLUE_TUNIC",
+        "Earring": "BLUE_TUNIC",
+        "Bangle": "BLUE_TUNIC",
+        "Armlet": "BLUE_TUNIC",
+        "Moogle Badge": "BLUE_TUNIC",
+        "Cosmic Arts": "BLUE_TUNIC",
+        "Heartguard": "BLUE_TUNIC",
+        "Crystal Crown": "BLUE_TUNIC",
+        "Ribbon": "BLUE_TUNIC",
+        "Brave Warrior": "BLUE_TUNIC",
+        "Ifrit's Horn": "BLUE_TUNIC",
+        "White Fang": "BLUE_TUNIC",
+        "Ray of Light": "BLUE_TUNIC",
+        "Circlet": "BLUE_TUNIC",
+        "Raven's Claw": "BLUE_TUNIC",
+        "Omega Arts": "BLUE_TUNIC",
+        "Royal Crown": "BLUE_TUNIC",
+        "Prime Cap": "BLUE_TUNIC",
+        "Belt": "BLUE_TUNIC",
+        "EXP Bracelet": "BLUE_TUNIC",
+        "EXP Necklace": "BLUE_TUNIC",
+
+        # Other
+        "Glide": "FEATHER",
+        "Ether": "MEDICINE",
+        "Elixir": "MEDICINE",
+        "Megalixir": "MEDICINE",
+        
+    }
 }
diff --git a/worlds/ladx/__init__.py b/worlds/ladx/__init__.py
index 4c22693c8f..ff017c144b 100644
--- a/worlds/ladx/__init__.py
+++ b/worlds/ladx/__init__.py
@@ -444,7 +444,7 @@ class LinksAwakeningWorld(World):
             phrases.update(ItemIconGuessing.GAME_SPECIFIC_PHRASES[foreign_game])
 
         for phrase, icon in phrases.items():
-            if phrase in uppered:
+            if phrase.upper() in uppered:
                 return icon
         # pattern for breaking down camelCase, also separates out digits
         pattern = re.compile(r"(?<=[a-z])(?=[A-Z])|(?<=[A-Z])(?=[A-Z][a-z])|(?<=[a-zA-Z])(?=\d)")
diff --git a/worlds/landstalker/Hints.py b/worlds/landstalker/Hints.py
index 4211e0ef3b..366925c64d 100644
--- a/worlds/landstalker/Hints.py
+++ b/worlds/landstalker/Hints.py
@@ -131,7 +131,7 @@ def generate_random_hints(world: "LandstalkerWorld"):
     hint_texts = list(set(hint_texts))
     random.shuffle(hint_texts)
 
-    hint_count = world.options.hint_count.value
+    hint_count = min(world.options.hint_count.value, len(hint_texts))
     del hint_texts[hint_count:]
 
     hint_source_names = [source["description"] for source in HINT_SOURCES_JSON if
diff --git a/worlds/landstalker/__init__.py b/worlds/landstalker/__init__.py
index cfdc335c48..98172eb6a7 100644
--- a/worlds/landstalker/__init__.py
+++ b/worlds/landstalker/__init__.py
@@ -39,7 +39,7 @@ class LandstalkerWorld(World):
     item_name_to_id = build_item_name_to_id_table()
     location_name_to_id = build_location_name_to_id_table()
 
-    cached_spheres: List[Set[Location]]
+    cached_spheres: List[Set[Location]] = []
 
     def __init__(self, multiworld, player):
         super().__init__(multiworld, player)
@@ -48,9 +48,11 @@ class LandstalkerWorld(World):
         self.dark_region_ids = []
         self.teleport_tree_pairs = []
         self.jewel_items = []
-        self.cached_spheres = []
 
     def fill_slot_data(self) -> dict:
+        if not LandstalkerWorld.cached_spheres:
+            LandstalkerWorld.cached_spheres = list(self.multiworld.get_spheres())
+
         # Generate hints.
         self.adjust_shop_prices()
         hints = Hints.generate_random_hints(self)
@@ -232,18 +234,9 @@ class LandstalkerWorld(World):
         else:
             return 4
 
-    @classmethod
-    def stage_post_fill(cls, multiworld: MultiWorld):
-        # Cache spheres for hint calculation after fill completes.
-        cached_spheres = list(multiworld.get_spheres())
-        for world in multiworld.get_game_worlds(cls.game):
-            world.cached_spheres = cached_spheres
-
     @classmethod
     def stage_modify_multidata(cls, multiworld: MultiWorld, *_):
-        # Clean up all references in cached spheres after generation completes.
-        for world in multiworld.get_game_worlds(cls.game):
-            world.cached_spheres = []
+        LandstalkerWorld.cached_spheres = []
 
     def adjust_shop_prices(self):
         # Calculate prices for items in shops once all items have their final position
@@ -254,7 +247,7 @@ class LandstalkerWorld(World):
 
         global_price_factor = self.options.shop_prices_factor / 100.0
 
-        spheres = self.cached_spheres
+        spheres = LandstalkerWorld.cached_spheres
         sphere_count = len(spheres)
         for sphere_id, sphere in enumerate(spheres):
             location: LandstalkerLocation  # after conditional, we guarantee it's this kind of location.
diff --git a/worlds/landstalker/docs/landstalker_setup_en.md b/worlds/landstalker/docs/landstalker_setup_en.md
index 30f85dd8f1..05cf35f8b0 100644
--- a/worlds/landstalker/docs/landstalker_setup_en.md
+++ b/worlds/landstalker/docs/landstalker_setup_en.md
@@ -6,7 +6,7 @@
 - A compatible emulator to run the game
   - [RetroArch](https://retroarch.com?page=platforms) with the Genesis Plus GX core
   - [Bizhawk 2.9.1 (x64)](https://tasvideos.org/BizHawk/ReleaseHistory) with the Genesis Plus GX core
-- Your legally obtained Landstalker US ROM file (which can be acquired on [Steam](https://store.steampowered.com/app/71118/Landstalker_The_Treasures_of_King_Nole/))
+- A Landstalker US ROM file dumped from the original cartridge
 
 ## Installation Instructions
 
diff --git a/worlds/messenger/__init__.py b/worlds/messenger/__init__.py
index a6effc31d5..8bde3bbc7a 100644
--- a/worlds/messenger/__init__.py
+++ b/worlds/messenger/__init__.py
@@ -1,7 +1,7 @@
 import logging
 from typing import Any, ClassVar, TextIO
 
-from BaseClasses import CollectionState, Entrance, Item, ItemClassification, MultiWorld, Tutorial
+from BaseClasses import CollectionState, Entrance, EntranceType, Item, ItemClassification, MultiWorld, Tutorial
 from Options import Accessibility
 from Utils import output_path
 from settings import FilePath, Group
@@ -17,6 +17,7 @@ from .regions import LEVELS, MEGA_SHARDS, LOCATIONS, REGION_CONNECTIONS
 from .rules import MessengerHardRules, MessengerOOBRules, MessengerRules
 from .shop import FIGURINES, PROG_SHOP_ITEMS, SHOP_ITEMS, USEFUL_SHOP_ITEMS, shuffle_shop_prices
 from .subclasses import MessengerEntrance, MessengerItem, MessengerRegion, MessengerShopLocation
+from .transitions import shuffle_transitions
 
 components.append(
     Component("The Messenger", component_type=Type.CLIENT, func=launch_game, game_name="The Messenger", supports_uri=True)
@@ -128,7 +129,7 @@ class MessengerWorld(World):
     spoiler_portal_mapping: dict[str, str]
     portal_mapping: list[int]
     transitions: list[Entrance]
-    reachable_locs: int = 0
+    reachable_locs: bool = False
     filler: dict[str, int]
 
     def generate_early(self) -> None:
@@ -145,13 +146,13 @@ class MessengerWorld(World):
 
         self.shop_prices, self.figurine_prices = shuffle_shop_prices(self)
 
-        starting_portals = ["Autumn Hills", "Howling Grotto", "Glacial Peak", "Riviere Turquoise", "Sunken Shrine", "Searing Crags"]
+        starting_portals = ["Autumn Hills", "Howling Grotto", "Glacial Peak", "Riviere Turquoise", "Sunken Shrine",
+                            "Searing Crags"]
         self.starting_portals = [f"{portal} Portal"
                                  for portal in starting_portals[:3] +
                                  self.random.sample(starting_portals[3:], k=self.options.available_portals - 3)]
 
         # super complicated method for adding searing crags to starting portals if it wasn't chosen
-        # TODO add a check for transition shuffle when that gets added back in
         if not self.options.shuffle_portals and "Searing Crags Portal" not in self.starting_portals:
             self.starting_portals.append("Searing Crags Portal")
             portals_to_strip = [portal for portal in ["Riviere Turquoise Portal", "Sunken Shrine Portal"]
@@ -181,7 +182,7 @@ class MessengerWorld(World):
             region_name = region.name.removeprefix(f"{region.parent} - ")
             connection_data = CONNECTIONS[region.parent][region_name]
             for exit_region in connection_data:
-                region.connect(self.multiworld.get_region(exit_region, self.player))
+                region.connect(self.get_region(exit_region))
 
         # all regions need to be created before i can do these connections so we create and connect the complex first
         for region in [level for level in simple_regions if level.name in REGION_CONNECTIONS]:
@@ -256,6 +257,7 @@ class MessengerWorld(World):
                              f" {logic} for {self.multiworld.get_player_name(self.player)}")
         #     MessengerOOBRules(self).set_messenger_rules()
 
+    def connect_entrances(self) -> None:
         add_closed_portal_reqs(self)
         # i need portal shuffle to happen after rules exist so i can validate it
         attempts = 5
@@ -271,6 +273,9 @@ class MessengerWorld(World):
             else:
                 raise RuntimeError("Unable to generate valid portal output.")
 
+        if self.options.shuffle_transitions:
+            shuffle_transitions(self)
+
     def write_spoiler_header(self, spoiler_handle: TextIO) -> None:
         if self.options.available_portals < 6:
             spoiler_handle.write(f"\nStarting Portals:\n\n")
@@ -286,9 +291,54 @@ class MessengerWorld(World):
                 key=lambda portal:
                 ["Autumn Hills", "Riviere Turquoise",
                  "Howling Grotto", "Sunken Shrine",
-                 "Searing Crags", "Glacial Peak"].index(portal[0]))
+                 "Searing Crags", "Glacial Peak"].index(portal[0])
+            )
             for portal, output in portal_info:
-                spoiler.set_entrance(f"{portal} Portal", output, "I can write anything I want here lmao", self.player)
+                spoiler.set_entrance(f"{portal} Portal", output, "", self.player)
+
+        if self.options.shuffle_transitions:
+            for transition in self.transitions:
+                if (transition.randomization_type == EntranceType.TWO_WAY
+                        and (transition.connected_region.name, "both", self.player) in spoiler.entrances):
+                    continue
+                spoiler.set_entrance(
+                    transition.name if "->" not in transition.name else transition.parent_region.name,
+                    transition.connected_region.name,
+                    "both" if transition.randomization_type == EntranceType.TWO_WAY
+                              and self.options.shuffle_transitions == ShuffleTransitions.option_coupled else "",
+                    self.player
+                )
+
+    def extend_hint_information(self, hint_data: dict[int, dict[int, str]]) -> None:
+        if not self.options.shuffle_transitions:
+            return
+
+        hint_data.update({self.player: {}})
+
+        all_state = self.multiworld.get_all_state(True)
+        # sometimes some of my regions aren't in path for some reason?
+        all_state.update_reachable_regions(self.player)
+        paths = all_state.path
+        start = self.get_region("Tower HQ")
+        start_connections = [entrance.name for entrance in start.exits if entrance not in {"Home", "Shrink Down"}]
+        transition_names = [transition.name for transition in self.transitions] + start_connections
+        for loc in self.get_locations():
+            if (loc.parent_region.name in {"Tower HQ", "The Shop", "Music Box", "The Craftsman's Corner"}
+                    or loc.address is None):
+                continue
+            path_to_loc: list[str] = []
+            name, connection = paths.get(loc.parent_region, (None, None))
+            while connection != ("Menu", None) and name is not None:
+                name, connection = connection
+                if name in transition_names:
+                    if name in start_connections:
+                        name = f"{name} -> {self.get_entrance(name).connected_region.name}"
+                    path_to_loc.append(name)
+
+            text = " => ".join(reversed(path_to_loc))
+            if not text:
+                continue
+            hint_data[self.player][loc.address] = text
 
     def fill_slot_data(self) -> dict[str, Any]:
         slot_data = {
@@ -308,11 +358,13 @@ class MessengerWorld(World):
 
     def get_filler_item_name(self) -> str:
         if not getattr(self, "_filler_items", None):
-            self._filler_items = [name for name in self.random.choices(
-                list(self.filler),
-                weights=list(self.filler.values()),
-                k=20
-            )]
+            self._filler_items = [
+                name for name in self.random.choices(
+                    list(self.filler),
+                    weights=list(self.filler.values()),
+                    k=20
+                )
+            ]
         return self._filler_items.pop(0)
 
     def create_item(self, name: str) -> MessengerItem:
@@ -331,7 +383,7 @@ class MessengerWorld(World):
             self.total_shards += count
             return ItemClassification.progression_skip_balancing if count else ItemClassification.filler
 
-        if name == "Windmill Shuriken" and getattr(self, "multiworld", None) is not None:
+        if name == "Windmill Shuriken":
             return ItemClassification.progression if self.options.logic_level else ItemClassification.filler
 
         if name == "Power Seal":
@@ -344,7 +396,7 @@ class MessengerWorld(World):
 
         if name in {*USEFUL_ITEMS, *USEFUL_SHOP_ITEMS}:
             return ItemClassification.useful
-        
+
         if name in TRAPS:
             return ItemClassification.trap
 
@@ -354,7 +406,7 @@ class MessengerWorld(World):
     def create_group(cls, multiworld: "MultiWorld", new_player_id: int, players: set[int]) -> World:
         group = super().create_group(multiworld, new_player_id, players)
         assert isinstance(group, MessengerWorld)
-        
+
         group.filler = FILLER.copy()
         group.options.traps.value = all(multiworld.worlds[player].options.traps for player in players)
         if group.options.traps:
diff --git a/worlds/messenger/connections.py b/worlds/messenger/connections.py
index 79912a5688..84f7f9b242 100644
--- a/worlds/messenger/connections.py
+++ b/worlds/messenger/connections.py
@@ -244,14 +244,12 @@ CONNECTIONS: dict[str, dict[str, list[str]]] = {
         "Bottom Left": [
             "Howling Grotto - Top",
             "Quillshroom Marsh - Sand Trap Shop",
-            "Quillshroom Marsh - Bottom Right",
         ],
         "Top Right": [
             "Quillshroom Marsh - Queen of Quills Shop",
             "Searing Crags - Left",
         ],
         "Bottom Right": [
-            "Quillshroom Marsh - Bottom Left",
             "Quillshroom Marsh - Sand Trap Shop",
             "Searing Crags - Bottom",
         ],
@@ -639,43 +637,43 @@ CONNECTIONS: dict[str, dict[str, list[str]]] = {
 }
 
 RANDOMIZED_CONNECTIONS: dict[str, str] = {
-    "Ninja Village - Right": "Autumn Hills - Left",
-    "Autumn Hills - Left": "Ninja Village - Right",
-    "Autumn Hills - Right": "Forlorn Temple - Left",
-    "Autumn Hills - Bottom": "Catacombs - Bottom Left",
-    "Forlorn Temple - Left": "Autumn Hills - Right",
-    "Forlorn Temple - Right": "Bamboo Creek - Top Left",
-    "Forlorn Temple - Bottom": "Catacombs - Top Left",
-    "Catacombs - Top Left": "Forlorn Temple - Bottom",
-    "Catacombs - Bottom Left": "Autumn Hills - Bottom",
-    "Catacombs - Bottom": "Dark Cave - Right",
-    "Catacombs - Right": "Bamboo Creek - Bottom Left",
-    "Bamboo Creek - Bottom Left": "Catacombs - Right",
-    "Bamboo Creek - Right": "Howling Grotto - Left",
-    "Bamboo Creek - Top Left": "Forlorn Temple - Right",
-    "Howling Grotto - Left": "Bamboo Creek - Right",
-    "Howling Grotto - Top": "Quillshroom Marsh - Bottom Left",
-    "Howling Grotto - Right": "Quillshroom Marsh - Top Left",
-    "Howling Grotto - Bottom": "Sunken Shrine - Left",
-    "Quillshroom Marsh - Top Left": "Howling Grotto - Right",
-    "Quillshroom Marsh - Bottom Left": "Howling Grotto - Top",
-    "Quillshroom Marsh - Top Right": "Searing Crags - Left",
+    "Ninja Village - Right":            "Autumn Hills - Left",
+    "Autumn Hills - Left":              "Ninja Village - Right",
+    "Autumn Hills - Right":             "Forlorn Temple - Left",
+    "Autumn Hills - Bottom":            "Catacombs - Bottom Left",
+    "Forlorn Temple - Left":            "Autumn Hills - Right",
+    "Forlorn Temple - Right":           "Bamboo Creek - Top Left",
+    "Forlorn Temple - Bottom":          "Catacombs - Top Left",
+    "Catacombs - Top Left":             "Forlorn Temple - Bottom",
+    "Catacombs - Bottom Left":          "Autumn Hills - Bottom",
+    "Catacombs - Bottom":               "Dark Cave - Right",
+    "Catacombs - Right":                "Bamboo Creek - Bottom Left",
+    "Bamboo Creek - Bottom Left":       "Catacombs - Right",
+    "Bamboo Creek - Right":             "Howling Grotto - Left",
+    "Bamboo Creek - Top Left":          "Forlorn Temple - Right",
+    "Howling Grotto - Left":            "Bamboo Creek - Right",
+    "Howling Grotto - Top":             "Quillshroom Marsh - Bottom Left",
+    "Howling Grotto - Right":           "Quillshroom Marsh - Top Left",
+    "Howling Grotto - Bottom":          "Sunken Shrine - Left",
+    "Quillshroom Marsh - Top Left":     "Howling Grotto - Right",
+    "Quillshroom Marsh - Bottom Left":  "Howling Grotto - Top",
+    "Quillshroom Marsh - Top Right":    "Searing Crags - Left",
     "Quillshroom Marsh - Bottom Right": "Searing Crags - Bottom",
-    "Searing Crags - Left": "Quillshroom Marsh - Top Right",
-    "Searing Crags - Top": "Glacial Peak - Bottom",
-    "Searing Crags - Bottom": "Quillshroom Marsh - Bottom Right",
-    "Searing Crags - Right": "Underworld - Left",
-    "Glacial Peak - Bottom": "Searing Crags - Top",
-    "Glacial Peak - Top": "Cloud Ruins - Left",
-    "Glacial Peak - Left": "Elemental Skylands - Air Shmup",
-    "Cloud Ruins - Left": "Glacial Peak - Top",
-    "Elemental Skylands - Right": "Glacial Peak - Left",
-    "Tower HQ": "Tower of Time - Left",
-    "Artificer": "Corrupted Future",
-    "Underworld - Left": "Searing Crags - Right",
-    "Dark Cave - Right": "Catacombs - Bottom",
-    "Dark Cave - Left": "Riviere Turquoise - Right",
-    "Sunken Shrine - Left": "Howling Grotto - Bottom",
+    "Searing Crags - Left":             "Quillshroom Marsh - Top Right",
+    "Searing Crags - Top":              "Glacial Peak - Bottom",
+    "Searing Crags - Bottom":           "Quillshroom Marsh - Bottom Right",
+    "Searing Crags - Right":            "Underworld - Left",
+    "Glacial Peak - Bottom":            "Searing Crags - Top",
+    "Glacial Peak - Top":               "Cloud Ruins - Left",
+    "Glacial Peak - Left":              "Elemental Skylands - Air Shmup",
+    "Cloud Ruins - Left":               "Glacial Peak - Top",
+    "Elemental Skylands - Right":       "Glacial Peak - Left",
+    "Tower HQ":                         "Tower of Time - Left",
+    "Artificer":                        "Corrupted Future",
+    "Underworld - Left":                "Searing Crags - Right",
+    "Dark Cave - Right":                "Catacombs - Bottom",
+    "Dark Cave - Left":                 "Riviere Turquoise - Right",
+    "Sunken Shrine - Left":             "Howling Grotto - Bottom",
 }
 
 TRANSITIONS: list[str] = [
diff --git a/worlds/messenger/options.py b/worlds/messenger/options.py
index 8b61a94354..c7a0f543ba 100644
--- a/worlds/messenger/options.py
+++ b/worlds/messenger/options.py
@@ -3,7 +3,8 @@ from dataclasses import dataclass
 from schema import And, Optional, Or, Schema
 
 from Options import Choice, DeathLinkMixin, DefaultOnToggle, ItemsAccessibility, OptionDict, PerGameCommonOptions, \
-    PlandoConnections, Range, StartInventoryPool, Toggle, Visibility
+    PlandoConnections, Range, StartInventoryPool, Toggle
+from . import RANDOMIZED_CONNECTIONS
 from .portals import CHECKPOINTS, PORTALS, SHOP_POINTS
 
 
@@ -27,20 +28,36 @@ class PortalPlando(PlandoConnections):
     - entrance: Searing Crags
       exit: Glacial Peak Portal
     """
+    display_name = "Portal Plando Connections"
     portals = [f"{portal} Portal" for portal in PORTALS]
     shop_points = [point for points in SHOP_POINTS.values() for point in points]
     checkpoints = [point for points in CHECKPOINTS.values() for point in points]
-    portal_entrances = PORTALS
-    portal_exits = portals + shop_points + checkpoints
-    entrances = portal_entrances
-    exits = portal_exits
+
+    entrances = frozenset(PORTALS)
+    exits = frozenset(portals + shop_points + checkpoints)
 
 
-# for back compatibility. To later be replaced with transition plando
-class HiddenPortalPlando(PortalPlando):
-    visibility = Visibility.none
-    entrances = PortalPlando.entrances
-    exits = PortalPlando.exits
+class TransitionPlando(PlandoConnections):
+    """
+    Plando connections to be used with transition shuffle.
+    List of valid connections can be found at https://github.com/ArchipelagoMW/Archipelago/blob/main/worlds/messenger/connections.py#L641.
+    Dictionary keys (left) are entrances and values (right) are exits. If transition shuffle is on coupled all plando
+    connections will be coupled. If on decoupled, "entrance" and "exit" will be treated the same, simply making the
+    plando connection one-way from entrance to exit.
+    Example:
+    - entrance: Searing Crags - Top
+      exit: Dark Cave - Right
+      direction: both
+    """
+    display_name = "Transition Plando Connections"
+    entrances = frozenset(RANDOMIZED_CONNECTIONS.keys())
+    exits = frozenset(RANDOMIZED_CONNECTIONS.values())
+
+    @classmethod
+    def can_connect(cls, entrance: str, exit: str) -> bool:
+        if entrance != "Glacial Peak - Left" and entrance.lower() in cls.exits:
+            return exit.lower() in cls.entrances
+        return exit.lower() not in cls.entrances
 
 
 class Logic(Choice):
@@ -226,7 +243,7 @@ class MessengerOptions(DeathLinkMixin, PerGameCommonOptions):
     early_meditation: EarlyMed
     available_portals: AvailablePortals
     shuffle_portals: ShufflePortals
-    # shuffle_transitions: ShuffleTransitions
+    shuffle_transitions: ShuffleTransitions
     goal: Goal
     music_box: MusicBox
     notes_needed: NotesNeeded
@@ -236,4 +253,4 @@ class MessengerOptions(DeathLinkMixin, PerGameCommonOptions):
     shop_price: ShopPrices
     shop_price_plan: PlannedShopPrices
     portal_plando: PortalPlando
-    plando_connections: HiddenPortalPlando
+    plando_connections: TransitionPlando
diff --git a/worlds/messenger/portals.py b/worlds/messenger/portals.py
index 896fefa686..704285896c 100644
--- a/worlds/messenger/portals.py
+++ b/worlds/messenger/portals.py
@@ -1,7 +1,7 @@
 from copy import deepcopy
 from typing import TYPE_CHECKING
 
-from BaseClasses import CollectionState, PlandoOptions
+from BaseClasses import CollectionState
 from Options import PlandoConnection
 
 if TYPE_CHECKING:
@@ -252,9 +252,7 @@ def shuffle_portals(world: "MessengerWorld") -> None:
     world.random.shuffle(available_portals)
 
     plando = world.options.portal_plando.value
-    if not plando:
-        plando = world.options.plando_connections.value
-    if plando and world.multiworld.plando_options & PlandoOptions.connections and not world.plando_portals:
+    if plando and not world.plando_portals:
         try:
             handle_planned_portals(plando)
         # any failure i expect will trigger on available_portals.remove
@@ -294,8 +292,8 @@ def disconnect_portals(world: "MessengerWorld") -> None:
 
 
 def validate_portals(world: "MessengerWorld") -> bool:
-    # if world.options.shuffle_transitions:
-    #     return True
+    if world.options.shuffle_transitions:
+        return True
     new_state = CollectionState(world.multiworld)
     new_state.update_reachable_regions(world.player)
     reachable_locs = 0
diff --git a/worlds/messenger/rules.py b/worlds/messenger/rules.py
index 2a3434266f..2d5ee1b8a9 100644
--- a/worlds/messenger/rules.py
+++ b/worlds/messenger/rules.py
@@ -32,7 +32,7 @@ class MessengerRules:
         self.connection_rules = {
             # from ToTHQ
             "Artificer's Portal":
-                lambda state: state.has_all({"Demon King Crown", "Magic Firefly"}, self.player),
+                lambda state: state.has("Demon King Crown", self.player),
             "Shrink Down":
                 lambda state: state.has_all(NOTES, self.player),
             # the shop
@@ -267,6 +267,8 @@ class MessengerRules:
             # tower of time
             "Tower of Time Seal - Time Waster":
                 self.has_dart,
+            # corrupted future
+            "Corrupted Future - Key of Courage": lambda state: state.has("Magic Firefly", self.player),
             # cloud ruins
             "Time Warp Mega Shard":
                 lambda state: self.has_vertical(state) or self.can_dboost(state),
@@ -370,7 +372,7 @@ class MessengerRules:
             add_rule(multiworld.get_entrance("Shrink Down", self.player), self.has_dart)
         multiworld.completion_condition[self.player] = lambda state: state.has("Do the Thing!", self.player)
         if self.world.options.accessibility:  # not locations accessibility
-            set_self_locking_items(self.world, self.player)
+            set_self_locking_items(self.world)
 
 
 class MessengerHardRules(MessengerRules):
@@ -530,9 +532,11 @@ class MessengerOOBRules(MessengerRules):
         self.world.options.accessibility.value = MessengerAccessibility.option_minimal
 
 
-def set_self_locking_items(world: "MessengerWorld", player: int) -> None:
+def set_self_locking_items(world: "MessengerWorld") -> None:
     # locations where these placements are always valid
     allow_self_locking_items(world.get_location("Searing Crags - Key of Strength").parent_region, "Power Thistle")
     allow_self_locking_items(world.get_location("Sunken Shrine - Key of Love"), "Sun Crest", "Moon Crest")
-    allow_self_locking_items(world.get_location("Corrupted Future - Key of Courage").parent_region, "Demon King Crown")
     allow_self_locking_items(world.get_location("Elemental Skylands Seal - Water"), "Currents Master")
+    if not world.options.shuffle_transitions:
+        allow_self_locking_items(world.get_location("Corrupted Future - Key of Courage").parent_region,
+                                 "Demon King Crown")
diff --git a/worlds/messenger/subclasses.py b/worlds/messenger/subclasses.py
index 29e3ea8953..0138a3f074 100644
--- a/worlds/messenger/subclasses.py
+++ b/worlds/messenger/subclasses.py
@@ -1,7 +1,8 @@
 from functools import cached_property
 from typing import TYPE_CHECKING
 
-from BaseClasses import CollectionState, Entrance, Item, ItemClassification, Location, Region
+from BaseClasses import CollectionState, Entrance, EntranceType, Item, ItemClassification, Location, Region
+from entrance_rando import ERPlacementState
 from .regions import LOCATIONS, MEGA_SHARDS
 from .shop import FIGURINES, SHOP_ITEMS
 
@@ -12,9 +13,21 @@ if TYPE_CHECKING:
 class MessengerEntrance(Entrance):
     world: "MessengerWorld | None" = None
 
+    def can_connect_to(self, other: Entrance, dead_end: bool, state: "ERPlacementState") -> bool:
+        can_connect = super().can_connect_to(other, dead_end, state)
+        world: MessengerWorld = getattr(self, "world", None)
+        if not world or world.reachable_locs or not can_connect:
+            return can_connect
+        empty_state = CollectionState(world.multiworld, True)
+        self.connected_region = other.connected_region
+        empty_state.update_reachable_regions(world.player)
+        world.reachable_locs = any(loc.can_reach(empty_state) and not loc.is_event for loc in world.get_locations())
+        self.connected_region = None
+        return world.reachable_locs and (not state.coupled or self.name != other.name)
+
 
 class MessengerRegion(Region):
-    parent: str
+    parent: str | None
     entrance_type = MessengerEntrance
 
     def __init__(self, name: str, world: "MessengerWorld", parent: str | None = None) -> None:
@@ -32,8 +45,9 @@ class MessengerRegion(Region):
                               for shop_loc in SHOP_ITEMS}
             self.add_locations(shop_locations, MessengerShopLocation)
         elif name == "The Craftsman's Corner":
-            self.add_locations({figurine: world.location_name_to_id[figurine] for figurine in FIGURINES},
-                               MessengerLocation)
+            self.add_locations(
+                {figurine: world.location_name_to_id[figurine] for figurine in FIGURINES},
+                MessengerLocation)
         elif name == "Tower HQ":
             locations.append("Money Wrench")
 
@@ -57,6 +71,7 @@ class MessengerLocation(Location):
 
 
 class MessengerShopLocation(MessengerLocation):
+
     @cached_property
     def cost(self) -> int:
         name = self.name.removeprefix("The Shop - ")
diff --git a/worlds/messenger/test/test_entrance_randomization.py b/worlds/messenger/test/test_entrance_randomization.py
new file mode 100644
index 0000000000..2a06a2e034
--- /dev/null
+++ b/worlds/messenger/test/test_entrance_randomization.py
@@ -0,0 +1,19 @@
+import unittest
+
+from . import MessengerTestBase
+
+
+class StrictEntranceRandoTest(MessengerTestBase):
+    """Bare-bones world that tests the strictest possible settings to ensure it doesn't crash"""
+    auto_construct = True
+    options = {
+        "limited_movement": 1,
+        "available_portals": 3,
+        "shuffle_portals": 1,
+        "shuffle_transitions": 1,
+    }
+
+    @unittest.skip
+    def test_all_state_can_reach_everything(self) -> None:
+        """It's not possible to reach everything with these options so skip this test."""
+        pass
diff --git a/worlds/messenger/transitions.py b/worlds/messenger/transitions.py
new file mode 100644
index 0000000000..53cfd836d5
--- /dev/null
+++ b/worlds/messenger/transitions.py
@@ -0,0 +1,101 @@
+from typing import TYPE_CHECKING
+
+from BaseClasses import Region
+from entrance_rando import EntranceType, randomize_entrances
+from .connections import RANDOMIZED_CONNECTIONS, TRANSITIONS
+from .options import ShuffleTransitions, TransitionPlando
+
+if TYPE_CHECKING:
+    from . import MessengerWorld
+
+
+def connect_plando(world: "MessengerWorld", plando_connections: TransitionPlando) -> None:
+    def remove_dangling_exit(region: Region) -> None:
+        # find the disconnected exit and remove references to it
+        for _exit in region.exits:
+            if not _exit.connected_region:
+                break
+        else:
+            raise ValueError(f"Unable to find randomized transition for {plando_connection}")
+        region.exits.remove(_exit)
+
+    def remove_dangling_entrance(region: Region) -> None:
+        # find the disconnected entrance and remove references to it
+        for _entrance in region.entrances:
+            if not _entrance.parent_region:
+                break
+        else:
+            raise ValueError(f"Invalid target region for {plando_connection}")
+        region.entrances.remove(_entrance)
+
+    for plando_connection in plando_connections:
+        # get the connecting regions
+        # need to handle these special because the names are unique but have the same parent region
+        if plando_connection.entrance in ("Artificer", "Tower HQ"):
+            reg1 = world.get_region("Tower HQ")
+            if plando_connection.entrance == "Artificer":
+                dangling_exit = world.get_entrance("Artificer's Portal")
+            else:
+                dangling_exit = world.get_entrance("Artificer's Challenge")
+            reg1.exits.remove(dangling_exit)
+        else:
+            reg1 = world.get_region(plando_connection.entrance)
+            remove_dangling_exit(reg1)
+        
+        reg2 = world.get_region(plando_connection.exit)
+        remove_dangling_entrance(reg2)
+        # connect the regions
+        reg1.connect(reg2)
+
+        # pretend the user set the plando direction as "both" regardless of what they actually put on coupled
+        if ((world.options.shuffle_transitions == ShuffleTransitions.option_coupled
+             or plando_connection.direction == "both")
+                and plando_connection.exit in RANDOMIZED_CONNECTIONS):
+            remove_dangling_exit(reg2)
+            remove_dangling_entrance(reg1)
+            reg2.connect(reg1)
+
+
+def shuffle_transitions(world: "MessengerWorld") -> None:
+    coupled = world.options.shuffle_transitions == ShuffleTransitions.option_coupled
+
+    def disconnect_entrance() -> None:
+        child_region.entrances.remove(entrance)
+        entrance.connected_region = None
+
+        er_type = EntranceType.ONE_WAY if child == "Glacial Peak - Left" else \
+            EntranceType.TWO_WAY if child in RANDOMIZED_CONNECTIONS else EntranceType.ONE_WAY
+        if er_type == EntranceType.TWO_WAY:
+            mock_entrance = parent_region.create_er_target(entrance.name)
+        else:
+            mock_entrance = child_region.create_er_target(child)
+
+        entrance.randomization_type = er_type
+        mock_entrance.randomization_type = er_type
+
+    for parent, child in RANDOMIZED_CONNECTIONS.items():
+        if child == "Corrupted Future":
+            entrance = world.get_entrance("Artificer's Portal")
+        elif child == "Tower of Time - Left":
+            entrance = world.get_entrance("Artificer's Challenge")
+        else:
+            entrance = world.get_entrance(f"{parent} -> {child}")
+        parent_region = entrance.parent_region
+        child_region = entrance.connected_region
+        entrance.world = world
+        disconnect_entrance()
+
+    plando = world.options.plando_connections
+    if plando:
+        connect_plando(world, plando)
+
+    result = randomize_entrances(world, coupled, {0: [0]})
+
+    world.transitions = sorted(result.placements, key=lambda entrance: TRANSITIONS.index(entrance.parent_region.name))
+
+    for transition in world.transitions:
+        if "->" not in transition.name:
+            continue
+        transition.parent_region.exits.remove(transition)
+        transition.name = f"{transition.parent_region.name} -> {transition.connected_region.name}"
+        transition.parent_region.exits.append(transition)
diff --git a/worlds/oot/__init__.py b/worlds/oot/__init__.py
index 3de55f6824..1742ab72dd 100644
--- a/worlds/oot/__init__.py
+++ b/worlds/oot/__init__.py
@@ -100,14 +100,15 @@ class OOTWeb(WebWorld):
         ["Edos"]
     )
 
-    setup_es = Tutorial(
-        setup.tutorial_name,
-        setup.description,
-        "Español",
-        "setup_es.md",
-        "setup/es",
-        setup.authors
-    )
+    # Very out of date, requires updating to match current
+    # setup_es = Tutorial(
+    #     setup.tutorial_name,
+    #     setup.description,
+    #     "Español",
+    #     "setup_es.md",
+    #     "setup/es",
+    #     setup.authors
+    # )
 
     setup_fr = Tutorial(
         setup.tutorial_name,
@@ -127,7 +128,7 @@ class OOTWeb(WebWorld):
         ["Held_der_Zeit"]
     )
 
-    tutorials = [setup, setup_es, setup_fr, setup_de]
+    tutorials = [setup, setup_fr, setup_de]
     option_groups = oot_option_groups
 
 
diff --git a/worlds/oot/data/LogicHelpers.json b/worlds/oot/data/LogicHelpers.json
index 7f3641062a..a05fe66066 100644
--- a/worlds/oot/data/LogicHelpers.json
+++ b/worlds/oot/data/LogicHelpers.json
@@ -66,6 +66,7 @@
     "can_break_heated_crate": "deadly_bonks != 'ohko' or (Fairy and (can_use(Goron_Tunic) or damage_multiplier != 'ohko')) or can_use(Nayrus_Love) or can_blast_or_smash",
     "can_break_lower_beehive": "can_use(Boomerang) or can_use(Hookshot) or Bombs or (logic_beehives_bombchus and has_bombchus)",
     "can_break_upper_beehive": "can_use(Boomerang) or can_use(Hookshot) or (logic_beehives_bombchus and has_bombchus)",
+    "can_break_upper_beehive_child": "can_use(Boomerang) or (logic_beehives_bombchus and has_bombchus and is_child)",
     # can_use and helpers
     # The parser reduces this to smallest form based on item category.
     # Note that can_use(item) is False for any item not covered here.
diff --git a/worlds/oot/data/World/Overworld.json b/worlds/oot/data/World/Overworld.json
index de2b4a61dc..87b24a6e57 100644
--- a/worlds/oot/data/World/Overworld.json
+++ b/worlds/oot/data/World/Overworld.json
@@ -2233,8 +2233,8 @@
             "ZD Pot 3": "True",
             "ZD Pot 4": "True",
             "ZD Pot 5": "True",
-            "ZD In Front of King Zora Beehive 1": "is_child and can_break_upper_beehive",
-            "ZD In Front of King Zora Beehive 2": "is_child and can_break_upper_beehive",
+            "ZD In Front of King Zora Beehive 1": "can_break_upper_beehive_child",
+            "ZD In Front of King Zora Beehive 2": "can_break_upper_beehive_child",
             "ZD GS Frozen Waterfall": "
                 is_adult and at_night and
                 (Hookshot or Bow or Magic_Meter or logic_domain_gs)",
@@ -2259,7 +2259,7 @@
         "scene": "Zoras Domain",
         "hint": "ZORAS_DOMAIN",
         "locations": {
-            "ZD Behind King Zora Beehive": "is_child and can_break_upper_beehive"
+            "ZD Behind King Zora Beehive": "can_break_upper_beehive_child"
         },
         "exits": {
             "Zoras Domain": "
diff --git a/worlds/pokemon_emerald/CHANGELOG.md b/worlds/pokemon_emerald/CHANGELOG.md
index 8d33d70900..4721c58d5e 100644
--- a/worlds/pokemon_emerald/CHANGELOG.md
+++ b/worlds/pokemon_emerald/CHANGELOG.md
@@ -5,6 +5,10 @@
 - New option `free_fly_blacklist` limits which cities can show up as a free fly location.
 - Spoiler log and hint text for maps where a species can be found now use human-friendly labels.
 - Added many item and location groups based on item type, location type, and location geography.
+- Dexsanity locations for species which evolve via item use (Fire Stone, Metal Coat, etc.) now contribute those items to
+the randomized item pool instead of Great Balls.
+- Rock smash encounters are now randomized according to your wild pokemon randomization option. These encounters are
+_not_ used for logical access (the seed will never require you to catch something through one of these encounters).
 
 ### Fixes
 
diff --git a/worlds/pokemon_rb/__init__.py b/worlds/pokemon_rb/__init__.py
index 809179cbef..644aa1ed9c 100644
--- a/worlds/pokemon_rb/__init__.py
+++ b/worlds/pokemon_rb/__init__.py
@@ -111,6 +111,7 @@ class PokemonRedBlueWorld(World):
         self.dexsanity_table = []
         self.trainersanity_table = []
         self.local_locs = []
+        self.pc_item = None
 
     @classmethod
     def stage_assert_generate(cls, multiworld: MultiWorld):
@@ -289,7 +290,9 @@ class PokemonRedBlueWorld(World):
             multiworld.random.shuffle(itempool)
             unplaced_items = []
             for i, item in enumerate(itempool):
-                if item.player == loc.player and loc.can_fill(multiworld.state, item, False):
+                if ((item.player == loc.player or (item.player in multiworld.groups
+                                                   and loc.player in multiworld.groups[item.player]["players"]))
+                        and loc.can_fill(multiworld.state, item, False)):
                     if item.advancement:
                         pool = progitempool
                     elif item.useful:
@@ -308,8 +311,6 @@ class PokemonRedBlueWorld(World):
                         break
                     else:
                         unplaced_items.append(item)
-            else:
-                raise FillError(f"Pokemon Red and Blue local item fill failed for player {loc.player}: could not place {item.name}")
             progitempool += [item for item in unplaced_items if item.advancement]
             usefulitempool += [item for item in unplaced_items if item.useful]
             filleritempool += [item for item in unplaced_items if (not item.advancement) and (not item.useful)]
@@ -446,15 +447,12 @@ class PokemonRedBlueWorld(World):
                 if loc.item is None:
                     locs.add(loc)
 
-        if not self.options.key_items_only:
-            loc = self.multiworld.get_location("Player's House 2F - Player's PC", self.player)
-            if loc.item is None:
-                locs.add(loc)
-
         for loc in sorted(locs):
             if loc.name in self.options.priority_locations.value:
                 add_item_rule(loc, lambda i: i.advancement)
-            add_item_rule(loc, lambda i: i.player == self.player)
+            add_item_rule(loc, lambda i: i.player == self.player
+                                         or (i.player in self.multiworld.groups
+                                             and self.player in self.multiworld.groups[i.player]["players"]))
             if self.options.old_man == "early_parcel" and loc.name != "Player's House 2F - Player's PC":
                 add_item_rule(loc, lambda i: i.name != "Oak's Parcel")
 
@@ -520,6 +518,14 @@ class PokemonRedBlueWorld(World):
                     else:
                         raise Exception("Failed to remove corresponding item while deleting unreachable Dexsanity location")
 
+        if not self.options.key_items_only:
+            loc = self.multiworld.get_location("Player's House 2F - Player's PC", self.player)
+            # Absolutely cannot have another player's item
+            if loc.item is not None and loc.item.player != self.player:
+                self.multiworld.itempool.append(loc.item)
+                loc.item = None
+            loc.place_locked_item(self.pc_item)
+
     @classmethod
     def stage_post_fill(cls, multiworld):
         # Convert all but one of each instance of a wild Pokemon to useful classification.
diff --git a/worlds/pokemon_rb/regions.py b/worlds/pokemon_rb/regions.py
index d4b8a8f506..aef0b945a2 100644
--- a/worlds/pokemon_rb/regions.py
+++ b/worlds/pokemon_rb/regions.py
@@ -1579,6 +1579,18 @@ def create_regions(world):
                     world.item_pool.append(item)
 
     world.random.shuffle(world.item_pool)
+    if not world.options.key_items_only:
+        if "Player's House 2F - Player's PC" in world.options.exclude_locations:
+            acceptable_item = lambda item: item.excludable
+        elif "Player's House 2F - Player's PC" in world.options.priority_locations:
+            acceptable_item = lambda item: item.advancement
+        else:
+            acceptable_item = lambda item: True
+        for i, item in enumerate(world.item_pool):
+            if acceptable_item(item):
+                world.pc_item = world.item_pool.pop(i)
+                break
+
     advancement_items = [item.name for item in world.item_pool if item.advancement] \
                         + [item.name for item in world.multiworld.precollected_items[world.player] if
                            item.advancement]
diff --git a/worlds/pokemon_rb/rock_tunnel.py b/worlds/pokemon_rb/rock_tunnel.py
index 3a70709eb0..46b2be3040 100644
--- a/worlds/pokemon_rb/rock_tunnel.py
+++ b/worlds/pokemon_rb/rock_tunnel.py
@@ -177,7 +177,11 @@ def randomize_rock_tunnel(data, random):
         if random.randint(0, 1):
             floor(10, 7)
             floor(11, 7)
-            tall(random.randint(12, 17), 8)
+            if current_map[10][13]==1:
+                # (13,10) is floor
+                tall(random.randint(14, 16), 8)
+            else:
+                tall(random.randint(12, 16), 8)
         else:
             floor(12, 5)
             floor(12, 6)
@@ -185,8 +189,10 @@ def randomize_rock_tunnel(data, random):
             wide(17, random.randint(3, 5))
         r = random.choice([1, 3])
         floor(12, r)
-        floor(12,  + 1)
-
+        floor(12, r + 1)
+        if current_map[4][12] + current_map[5][12] == 2:
+            # (12,4) and (12,5) are floor
+            wide(11,4)
     elif c == 2:
         r = random.randint(0, 6)
         if r == 0:
@@ -221,6 +227,9 @@ def randomize_rock_tunnel(data, random):
             #early block
             wide(13, random.randint(2, 5))
             tall(random.randint(14, 15), 1)
+            if not 1 in (current_map[1][14],current_map[2][13]):
+                # wide(13,2) and tall(14,1) overlap
+                single(13,2)
         elif r == 1:
             if random.randint(0, 1):
                 tall(16, 5)
@@ -243,19 +252,34 @@ def randomize_rock_tunnel(data, random):
         r = random.randint(r, 6)
         if r == 6:
             #late open
-            r2 = random.randint(0, 2)
-            floor(1 + (r2 * 2), 14)
-            floor(2 + (r2 * 2), 14)
+            if random.randint(0, 1):
+                floor(1, 14)
+                floor(2, 14)
+            else:
+                floor(3, 14)
+                floor(4, 14)
         elif r == 5:
-            floor(6, 12)
-            floor(6, 13)
+            if random.randint(0,1):
+                floor(6, 12)
+                floor(6, 13)
+            else:
+                floor(5, 14)
+                floor(6, 14)
         elif r == 4:
             if random.randint(0, 1):
                 floor(6, 11)
                 floor(7, 11)
             else:
                 floor(8, 11)
-                floor(9, 11)
+                if current_map[12][10]==32:
+                    # (10,12) is wide
+                    single(9, 11)
+                else:
+                    floor(9, 11)
+            if 31 in (current_map[8][6],current_map[8][7]):
+                # (6,7) or (7,7) are tall
+                floor(6, 10)
+                wide(7, 9)
         elif r == 3:
             floor(9, 9)
             floor(9, 10)
diff --git a/worlds/sa2b/AestheticData.py b/worlds/sa2b/AestheticData.py
index 077f35fc01..386b2850df 100644
--- a/worlds/sa2b/AestheticData.py
+++ b/worlds/sa2b/AestheticData.py
@@ -150,6 +150,26 @@ sample_chao_names = [
 	"Hubert",
 	"Corvus",
 	"Nigel",
+	"Benjamin",
+	"Gooey",
+	"Maddy",
+	"AFGNCAAP",
+	"Reinhardt",
+	"Claire",
+	"Yoshi",
+	"Peasley",
+	"Faux",
+	"Naija",
+	"Kaiba",
+	"Hat Kid",
+	"TzTokJad",
+	"Sora",
+	"WoodMan",
+	"Yachty",
+	"Grieve",
+	"Portia",
+	"Graves",
+	"Kaycee",
 ]
 
 totally_real_item_names = [
@@ -240,6 +260,35 @@ totally_real_item_names = [
 	"Ladder",
 
 	"Visible Dots",
+
+	"CooCoo",
+
+	"Blueberry",
+
+	"Ear of Luigi",
+
+	"Mega Nut",
+
+	"DUELIST ALLIANCE",
+	"DUEL OVERLOAD",
+	"POWER OF THE ELEMENTS",
+	"S:P Little Knight",
+	"Red-Eyes Dark Dragoon",
+
+	"Fire Hat",
+
+	"Area: Taverly",
+	"Area: Meiyerditch",
+	"Fire Cape",
+
+	"Donald Zeta Flare",
+
+	"Category One of a Kind",
+	"Category Fuller House",
+
+	"Passive Camoflage",
+
+	"Earth Card",
 ]
 
 all_exits = [
diff --git a/worlds/sa2b/CHANGELOG.md b/worlds/sa2b/CHANGELOG.md
index af6c4afd22..1a4aea3eaa 100644
--- a/worlds/sa2b/CHANGELOG.md
+++ b/worlds/sa2b/CHANGELOG.md
@@ -1,6 +1,82 @@
 # Sonic Adventure 2 Battle - Changelog
 
 
+## v2.4 - Minigame Madness
+
+### Features:
+- New Goal
+  - Minigame Madness
+	- Win a certain number of each type of Minigame Trap, then defeat the Finalhazard to win!
+	- How many of each Minigame are required can be set by an Option
+	- When the required amount of a Minigame has been received, that Minigame can be replayed in the Chao World Lobby
+- New optional Location Checks
+  - Bigsanity
+	- Go fishing with Big in each stage for a Location Check
+  - Itemboxsanity
+	- Either Extra Life Boxes or All Item Boxes
+- New Items
+  - New Traps
+	- Literature Trap
+	- Controller Drift Trap
+	- Poison Trap
+	- Bee Trap
+  - New Minigame Traps
+	- Breakout Trap
+	- Fishing Trap
+	- Trivia Trap
+	- Pokemon Trivia Trap
+	- Pokemon Count Trap
+	- Number Sequence Trap
+	- Light Up Path Trap
+	- Pinball Trap
+	- Math Quiz Trap
+	- Snake Trap
+	- Input Sequence Trap
+- Trap Link
+  - When you receive a trap, you send a copy of it to every other player with Trap Link enabled
+- Boss Gate Plando
+- Expert Logic Difficulty
+	- Use at your own risk. This difficulty requires complete mastery of SA2.
+- Missions can now be enabled and disabled per-character, instead of just per-style
+- Minigame Difficulty can now be set to "Chaos", which selects a new difficulty randomly per-trap received
+
+### Quality of Life:
+- Gate Stages and Mission Orders are now displayed in the spoiler log
+- Additional play stats are saved and displayed with the randomizer credits
+- Stage Locations progress UI now displays in multiple pages when Itemboxsanity is enabled
+- Current stage mission order and progress are now shown when paused in-level
+- Chaos Emeralds are now shown when paused in-level
+- Location Name Groups were created
+- Moved SA2B to the new Options system
+- Option Presets were created
+- Error Messages are more obvious
+
+### Bug Fixes:
+- Added missing `Dry Lagoon - 12 Animals` location
+- Flying Dog boss should no longer crash when you have done at least 3 Intermediate Kart Races
+- Invincibility can no longer be received in the King Boom Boo fight, preventing a crash
+- Chaos Emeralds should no longer disproportionately end up in Cannon's Core or the final Level Gate
+- Going into submenus from the pause menu should no longer reset traps
+- `Sonic - Magic Gloves` are now plural
+- Junk items will no longer cause a crash when in a falling state
+- Chao Garden:
+	- Prevent races from occasionally becoming uncompletable when using the "Prize Only" option
+	- Properly allow Hero Chao to participate in Dark Races
+	- Don't allow the Chao Garden to send locations when connected to an invalid server
+	- Prevent the Chao Garden from resetting your life count
+	- Fix Chao World Entrance Shuffle causing inaccessible Neutral Garden
+	- Fix pressing the 'B' button to take you to the proper location in Chao World Entrance Shuffle
+	- Prevent Chao Karate progress icon overflow
+	- Prevent changing Chao Timescale while paused or while a Minigame is active
+- Logic Fixes:
+	- `Mission Street - Chao Key 1` (Hard Logic) now requires no upgrades
+	- `Mission Street - Chao Key 2` (Hard Logic) now requires no upgrades
+	- `Crazy Gadget - Hidden 1` (Standard Logic) now requires `Sonic - Bounce Bracelet` instead of `Sonic - Light Shoes`
+	- `Lost Colony - Hidden 1` (Standard Logic) now requires `Eggman - Jet Engine`
+	- `Mad Space - Gold Beetle` (Standard Logic) now only requires `Rouge - Iron Boots`
+	- `Cosmic Wall - Gold Beetle` (Standard and Hard Logic) now only requires `Eggman - Jet Engine`
+
+
 ## v2.3 - The Chao Update
 
 ### Features:
diff --git a/worlds/sa2b/GateBosses.py b/worlds/sa2b/GateBosses.py
index 76dd71fa3c..9e1a81bae9 100644
--- a/worlds/sa2b/GateBosses.py
+++ b/worlds/sa2b/GateBosses.py
@@ -1,18 +1,23 @@
 import typing
+
 from BaseClasses import MultiWorld
 from worlds.AutoWorld import World
 
-speed_characters_1 = "Sonic vs Shadow 1"
-speed_characters_2 = "Sonic vs Shadow 2"
-mech_characters_1 = "Tails vs Eggman 1"
-mech_characters_2 = "Tails vs Eggman 2"
-hunt_characters_1 = "Knuckles vs Rouge 1"
-big_foot = "F-6t BIG FOOT"
-hot_shot = "B-3x HOT SHOT"
-flying_dog = "R-1/A FLYING DOG"
-egg_golem_sonic = "Egg Golem (Sonic)"
-egg_golem_eggman = "Egg Golem (Eggman)"
-king_boom_boo = "King Boom Boo"
+from .Names import LocationName
+from .Options import GateBossPlando
+
+
+speed_characters_1 = "sonic vs shadow 1"
+speed_characters_2 = "sonic vs shadow 2"
+mech_characters_1 = "tails vs eggman 1"
+mech_characters_2 = "tails vs eggman 2"
+hunt_characters_1 = "knuckles vs rouge 1"
+big_foot = "big foot"
+hot_shot = "hot shot"
+flying_dog = "flying dog"
+egg_golem_sonic = "egg golem (sonic)"
+egg_golem_eggman = "egg golem (eggman)"
+king_boom_boo = "king boom boo"
 
 gate_bosses_no_requirements_table = {
     speed_characters_1: 0,
@@ -45,44 +50,83 @@ all_gate_bosses_table = {
 }
 
 
+boss_id_to_name = {
+    0: "Sonic vs Shadow 1",
+    1: "Sonic vs Shadow 2",
+    2: "Tails vs Eggman 1",
+    3: "Tails vs Eggman 2",
+    4: "Knuckles vs Rouge 1",
+    5: "F-6t BIG FOOT",
+    6: "B-3x HOT SHOT",
+    7: "R-1/A FLYING DOG",
+    8: "Egg Golem (Sonic)",
+    9: "Egg Golem (Eggman)",
+    10: "King Boom Boo",
+    11: "Sonic vs Shadow 1",
+    12: "Sonic vs Shadow 2",
+    13: "Tails vs Eggman 1",
+    14: "Tails vs Eggman 2",
+    15: "Knuckles vs Rouge 1",
+}
+
 def get_boss_name(boss: int):
-    for key, value in gate_bosses_no_requirements_table.items():
-        if value == boss:
-            return key
-    for key, value in gate_bosses_with_requirements_table.items():
-        if value == boss:
-            return key
-    for key, value in extra_boss_rush_bosses_table.items():
-        if value == boss:
-            return key
+    return boss_id_to_name[boss]
 
 
 def boss_has_requirement(boss: int):
     return boss >= len(gate_bosses_no_requirements_table)
 
 
-def get_gate_bosses(multiworld: MultiWorld, world: World):
+def get_gate_bosses(world: World):
     selected_bosses: typing.List[int] = []
     boss_gates: typing.List[int] = []
     available_bosses: typing.List[str] = list(gate_bosses_no_requirements_table.keys())
-    multiworld.random.shuffle(available_bosses)
-    halfway = False
+    world.random.shuffle(available_bosses)
+
+    gate_boss_plando: typing.Union[int, str] = world.options.gate_boss_plando.value
+    plando_bosses = ["None", "None", "None", "None", "None"]
+    if isinstance(gate_boss_plando, str):
+        # boss plando
+        options = gate_boss_plando.split(";")
+        gate_boss_plando = GateBossPlando.options[options.pop()]
+        for option in options:
+            if "-" in option:
+                loc, boss = option.split("-")
+                boss_num = LocationName.boss_gate_names[loc]
+
+                if boss_num >= world.options.number_of_level_gates.value:
+                    # Don't reject bosses plando'd into gate bosses that won't exist
+                    pass
+
+                if boss in plando_bosses:
+                    # TODO: Raise error here. Duplicates not allowed
+                    pass
+
+                plando_bosses[boss_num] = boss
+
+                if boss in available_bosses:
+                    available_bosses.remove(boss)
 
     for x in range(world.options.number_of_level_gates):
-        if (not halfway) and ((x + 1) / world.options.number_of_level_gates) > 0.5:
+        if ("king boom boo" not in selected_bosses) and ("king boom boo" not in available_bosses) and ((x + 1) / world.options.number_of_level_gates) > 0.5:
             available_bosses.extend(gate_bosses_with_requirements_table)
-            multiworld.random.shuffle(available_bosses)
-            halfway = True
-        selected_bosses.append(all_gate_bosses_table[available_bosses[0]])
+            world.random.shuffle(available_bosses)
+
+        chosen_boss = available_bosses[0]
+        if plando_bosses[x] != "None":
+            available_bosses.append(plando_bosses[x])
+            chosen_boss = plando_bosses[x]
+
+        selected_bosses.append(all_gate_bosses_table[chosen_boss])
         boss_gates.append(x + 1)
-        available_bosses.remove(available_bosses[0])
+        available_bosses.remove(chosen_boss)
 
     bosses: typing.Dict[int, int] = dict(zip(boss_gates, selected_bosses))
 
     return bosses
 
 
-def get_boss_rush_bosses(multiworld: MultiWorld, world: World):
+def get_boss_rush_bosses(world: World):
 
     if world.options.boss_rush_shuffle == 0:
         boss_list_o = list(range(0, 16))
@@ -92,21 +136,21 @@ def get_boss_rush_bosses(multiworld: MultiWorld, world: World):
     elif world.options.boss_rush_shuffle == 1:
         boss_list_o = list(range(0, 16))
         boss_list_s = boss_list_o.copy()
-        multiworld.random.shuffle(boss_list_s)
+        world.random.shuffle(boss_list_s)
 
         return dict(zip(boss_list_o, boss_list_s))
     elif world.options.boss_rush_shuffle == 2:
         boss_list_o = list(range(0, 16))
-        boss_list_s = [multiworld.random.choice(boss_list_o) for i in range(0, 16)]
+        boss_list_s = [world.random.choice(boss_list_o) for i in range(0, 16)]
         if 10 not in boss_list_s:
-            boss_list_s[multiworld.random.randint(0, 15)] = 10
+            boss_list_s[world.random.randint(0, 15)] = 10
 
         return dict(zip(boss_list_o, boss_list_s))
     elif world.options.boss_rush_shuffle == 3:
         boss_list_o = list(range(0, 16))
-        boss_list_s = [multiworld.random.choice(boss_list_o)] * len(boss_list_o)
+        boss_list_s = [world.random.choice(boss_list_o)] * len(boss_list_o)
         if 10 not in boss_list_s:
-            boss_list_s[multiworld.random.randint(0, 15)] = 10
+            boss_list_s[world.random.randint(0, 15)] = 10
 
         return dict(zip(boss_list_o, boss_list_s))
     else:
diff --git a/worlds/sa2b/Items.py b/worlds/sa2b/Items.py
index 318a57f753..3dca74e1c8 100644
--- a/worlds/sa2b/Items.py
+++ b/worlds/sa2b/Items.py
@@ -2,7 +2,6 @@ import typing
 
 from BaseClasses import Item, ItemClassification
 from .Names import ItemName
-from worlds.alttp import ALTTPWorld
 
 
 class ItemData(typing.NamedTuple):
@@ -14,7 +13,7 @@ class ItemData(typing.NamedTuple):
 
 
 class SA2BItem(Item):
-    game: str = "Sonic Adventure 2: Battle"
+    game: str = "Sonic Adventure 2 Battle"
 
     def __init__(self, name, classification: ItemClassification, code: int = None, player: int = None):
         super(SA2BItem, self).__init__(name, classification, code, player)
@@ -73,19 +72,36 @@ junk_table = {
 }
 
 trap_table = {
-    ItemName.omochao_trap:    ItemData(0xFF0030, False, True),
-    ItemName.timestop_trap:   ItemData(0xFF0031, False, True),
-    ItemName.confuse_trap:    ItemData(0xFF0032, False, True),
-    ItemName.tiny_trap:       ItemData(0xFF0033, False, True),
-    ItemName.gravity_trap:    ItemData(0xFF0034, False, True),
-    ItemName.exposition_trap: ItemData(0xFF0035, False, True),
-    #ItemName.darkness_trap:   ItemData(0xFF0036, False, True),
-    ItemName.ice_trap:        ItemData(0xFF0037, False, True),
-    ItemName.slow_trap:       ItemData(0xFF0038, False, True),
-    ItemName.cutscene_trap:   ItemData(0xFF0039, False, True),
-    ItemName.reverse_trap:    ItemData(0xFF003A, False, True),
+    ItemName.omochao_trap:          ItemData(0xFF0030, False, True),
+    ItemName.timestop_trap:         ItemData(0xFF0031, False, True),
+    ItemName.confuse_trap:          ItemData(0xFF0032, False, True),
+    ItemName.tiny_trap:             ItemData(0xFF0033, False, True),
+    ItemName.gravity_trap:          ItemData(0xFF0034, False, True),
+    ItemName.exposition_trap:       ItemData(0xFF0035, False, True),
+    #ItemName.darkness_trap:         ItemData(0xFF0036, False, True),
+    ItemName.ice_trap:              ItemData(0xFF0037, False, True),
+    ItemName.slow_trap:             ItemData(0xFF0038, False, True),
+    ItemName.cutscene_trap:         ItemData(0xFF0039, False, True),
+    ItemName.reverse_trap:          ItemData(0xFF003A, False, True),
+    ItemName.literature_trap:       ItemData(0xFF003B, False, True),
+    ItemName.controller_drift_trap: ItemData(0xFF003C, False, True),
+    ItemName.poison_trap:           ItemData(0xFF003D, False, True),
+    ItemName.bee_trap:              ItemData(0xFF003E, False, True),
+}
 
-    ItemName.pong_trap:       ItemData(0xFF0050, False, True),
+minigame_trap_table = {
+    ItemName.pong_trap:            ItemData(0xFF0050, False, True),
+    ItemName.breakout_trap:        ItemData(0xFF0051, False, True),
+    ItemName.fishing_trap:         ItemData(0xFF0052, False, True),
+    ItemName.trivia_trap:          ItemData(0xFF0053, False, True),
+    ItemName.pokemon_trivia_trap:  ItemData(0xFF0054, False, True),
+    ItemName.pokemon_count_trap:   ItemData(0xFF0055, False, True),
+    ItemName.number_sequence_trap: ItemData(0xFF0056, False, True),
+    ItemName.light_up_path_trap:   ItemData(0xFF0057, False, True),
+    ItemName.pinball_trap:         ItemData(0xFF0058, False, True),
+    ItemName.math_quiz_trap:       ItemData(0xFF0059, False, True),
+    ItemName.snake_trap:           ItemData(0xFF005A, False, True),
+    ItemName.input_sequence_trap:  ItemData(0xFF005B, False, True),
 }
 
 emeralds_table = {
@@ -235,7 +251,7 @@ chaos_drives_table = {
 }
 
 event_table = {
-    ItemName.maria: ItemData(0xFF001D, True),
+    ItemName.maria: ItemData(None, True),
 }
 
 # Complete item table.
@@ -244,6 +260,7 @@ item_table = {
     **upgrades_table,
     **junk_table,
     **trap_table,
+    **minigame_trap_table,
     **emeralds_table,
     **eggs_table,
     **fruits_table,
@@ -251,7 +268,6 @@ item_table = {
     **hats_table,
     **animals_table,
     **chaos_drives_table,
-    **event_table,
 }
 
 lookup_id_to_name: typing.Dict[int, str] = {data.code: item_name for item_name, data in item_table.items() if data.code}
@@ -263,7 +279,12 @@ item_groups: typing.Dict[str, str] = {
     "Seeds":          list(seeds_table.keys()),
     "Hats":           list(hats_table.keys()),
     "Traps":          list(trap_table.keys()),
+    "Minigames":      list(minigame_trap_table.keys()),
 }
 
-ALTTPWorld.pedestal_credit_texts[item_table[ItemName.sonic_light_shoes].code] = "and the Soap Shoes"
-ALTTPWorld.pedestal_credit_texts[item_table[ItemName.shadow_air_shoes].code] = "and the Soap Shoes"
+try:
+    from worlds.alttp import ALTTPWorld
+    ALTTPWorld.pedestal_credit_texts[item_table[ItemName.sonic_light_shoes].code] = "and the Soap Shoes"
+    ALTTPWorld.pedestal_credit_texts[item_table[ItemName.shadow_air_shoes].code] = "and the Soap Shoes"
+except ModuleNotFoundError:
+    pass
diff --git a/worlds/sa2b/Locations.py b/worlds/sa2b/Locations.py
index c928e0c389..bbc7728555 100644
--- a/worlds/sa2b/Locations.py
+++ b/worlds/sa2b/Locations.py
@@ -7,7 +7,7 @@ from .Missions import stage_name_prefixes, mission_orders
 
 
 class SA2BLocation(Location):
-    game: str = "Sonic Adventure 2: Battle"
+    game: str = "Sonic Adventure 2 Battle"
 
 
 mission_location_table = {
@@ -1091,6 +1091,7 @@ animal_location_table = {
     LocationName.final_rush_animal_12: 0xFF0C6F,
 
     LocationName.iron_gate_animal_12: 0xFF0C70,
+    LocationName.dry_lagoon_animal_12: 0xFF0C71,
     LocationName.sand_ocean_animal_12: 0xFF0C72,
     LocationName.radical_highway_animal_12: 0xFF0C73,
     LocationName.lost_colony_animal_12: 0xFF0C75,
@@ -1216,6 +1217,652 @@ animal_location_table = {
     LocationName.sky_rail_animal_20: 0xFF0D7A,
 }
 
+lifebox_location_table = {
+    LocationName.city_escape_lifebox_1: 0xFF1400,
+    LocationName.wild_canyon_lifebox_1: 0xFF1401,
+    LocationName.prison_lane_lifebox_1: 0xFF1402,
+    LocationName.metal_harbor_lifebox_1: 0xFF1403,
+    LocationName.green_forest_lifebox_1: 0xFF1404,
+    LocationName.pumpkin_hill_lifebox_1: 0xFF1405,
+    LocationName.mission_street_lifebox_1: 0xFF1406,
+    LocationName.aquatic_mine_lifebox_1: 0xFF1407,
+    LocationName.hidden_base_lifebox_1: 0xFF1409,
+    LocationName.pyramid_cave_lifebox_1: 0xFF140A,
+    LocationName.death_chamber_lifebox_1: 0xFF140B,
+    LocationName.eternal_engine_lifebox_1: 0xFF140C,
+    LocationName.meteor_herd_lifebox_1: 0xFF140D,
+    LocationName.crazy_gadget_lifebox_1: 0xFF140E,
+    LocationName.final_rush_lifebox_1: 0xFF140F,
+
+    LocationName.iron_gate_lifebox_1: 0xFF1410,
+    LocationName.dry_lagoon_lifebox_1: 0xFF1411,
+    LocationName.sand_ocean_lifebox_1: 0xFF1412,
+    LocationName.radical_highway_lifebox_1: 0xFF1413,
+    LocationName.egg_quarters_lifebox_1: 0xFF1414,
+    LocationName.lost_colony_lifebox_1: 0xFF1415,
+    LocationName.weapons_bed_lifebox_1: 0xFF1416,
+    LocationName.security_hall_lifebox_1: 0xFF1417,
+    LocationName.white_jungle_lifebox_1: 0xFF1418,
+    LocationName.sky_rail_lifebox_1: 0xFF141A,
+    LocationName.mad_space_lifebox_1: 0xFF141B,
+    LocationName.final_chase_lifebox_1: 0xFF141D,
+
+    LocationName.cannon_core_lifebox_1: 0xFF141E,
+
+    LocationName.city_escape_lifebox_2: 0xFF1420,
+    LocationName.wild_canyon_lifebox_2: 0xFF1421,
+    LocationName.prison_lane_lifebox_2: 0xFF1422,
+    LocationName.metal_harbor_lifebox_2: 0xFF1423,
+    LocationName.green_forest_lifebox_2: 0xFF1424,
+    LocationName.mission_street_lifebox_2: 0xFF1426,
+    LocationName.pyramid_cave_lifebox_2: 0xFF142A,
+    LocationName.eternal_engine_lifebox_2: 0xFF142C,
+    LocationName.meteor_herd_lifebox_2: 0xFF142D,
+    LocationName.crazy_gadget_lifebox_2: 0xFF142E,
+    LocationName.final_rush_lifebox_2: 0xFF142F,
+
+    LocationName.iron_gate_lifebox_2: 0xFF1430,
+    LocationName.dry_lagoon_lifebox_2: 0xFF1431,
+    LocationName.sand_ocean_lifebox_2: 0xFF1432,
+    LocationName.radical_highway_lifebox_2: 0xFF1433,
+    LocationName.egg_quarters_lifebox_2: 0xFF1434,
+    LocationName.white_jungle_lifebox_2: 0xFF1438,
+    LocationName.sky_rail_lifebox_2: 0xFF143A,
+    LocationName.mad_space_lifebox_2: 0xFF143B,
+    LocationName.final_chase_lifebox_2: 0xFF143D,
+
+    LocationName.metal_harbor_lifebox_3: 0xFF1443,
+    LocationName.green_forest_lifebox_3: 0xFF1444,
+    LocationName.pyramid_cave_lifebox_3: 0xFF144A,
+    LocationName.meteor_herd_lifebox_3: 0xFF144D,
+    LocationName.crazy_gadget_lifebox_3: 0xFF144E,
+    LocationName.final_rush_lifebox_3: 0xFF144F,
+
+    LocationName.iron_gate_lifebox_3: 0xFF1450,
+    LocationName.dry_lagoon_lifebox_3: 0xFF1451,
+    LocationName.sand_ocean_lifebox_3: 0xFF1452,
+    LocationName.sky_rail_lifebox_3: 0xFF145A,
+    LocationName.mad_space_lifebox_3: 0xFF145B,
+    LocationName.final_chase_lifebox_3: 0xFF145D,
+
+    LocationName.green_forest_lifebox_4: 0xFF1464,
+    LocationName.pyramid_cave_lifebox_4: 0xFF146A,
+    LocationName.meteor_herd_lifebox_4: 0xFF146D,
+    LocationName.crazy_gadget_lifebox_4: 0xFF146E,
+    LocationName.final_rush_lifebox_4: 0xFF146F,
+
+    LocationName.iron_gate_lifebox_4: 0xFF1470,
+    LocationName.dry_lagoon_lifebox_4: 0xFF1471,
+    LocationName.sky_rail_lifebox_4: 0xFF147A,
+    LocationName.mad_space_lifebox_4: 0xFF147B,
+    LocationName.final_chase_lifebox_4: 0xFF147D,
+
+    LocationName.pyramid_cave_lifebox_5: 0xFF148A,
+    LocationName.meteor_herd_lifebox_5: 0xFF148D,
+    LocationName.final_rush_lifebox_5: 0xFF148F,
+
+    LocationName.sky_rail_lifebox_5: 0xFF149A,
+    LocationName.final_chase_lifebox_5: 0xFF149D,
+
+    LocationName.pyramid_cave_lifebox_6: 0xFF14AA,
+    LocationName.final_rush_lifebox_6: 0xFF14AF,
+
+    LocationName.sky_rail_lifebox_6: 0xFF14BA,
+    LocationName.final_chase_lifebox_6: 0xFF14BD,
+
+    LocationName.pyramid_cave_lifebox_7: 0xFF14CA,
+    LocationName.final_rush_lifebox_7: 0xFF14CF,
+
+    LocationName.sky_rail_lifebox_7: 0xFF14DA,
+    LocationName.final_chase_lifebox_7: 0xFF14DD,
+
+    LocationName.final_rush_lifebox_8: 0xFF14EF,
+
+    LocationName.sky_rail_lifebox_8: 0xFF14FA,
+    LocationName.final_chase_lifebox_8: 0xFF14FD,
+
+    LocationName.final_rush_lifebox_9: 0xFF150F,
+
+    LocationName.sky_rail_lifebox_9: 0xFF151A,
+    LocationName.final_chase_lifebox_9: 0xFF151D,
+
+    LocationName.final_rush_lifebox_10: 0xFF152F,
+
+    LocationName.final_rush_lifebox_11: 0xFF154F,
+
+    LocationName.final_rush_lifebox_12: 0xFF156F,
+
+    LocationName.final_rush_lifebox_13: 0xFF158F,
+}
+
+itembox_location_table = {
+    LocationName.city_escape_itembox_1: 0xFF1600,
+    LocationName.wild_canyon_itembox_1: 0xFF1601,
+    LocationName.prison_lane_itembox_1: 0xFF1602,
+    LocationName.metal_harbor_itembox_1: 0xFF1603,
+    LocationName.green_forest_itembox_1: 0xFF1604,
+    LocationName.pumpkin_hill_itembox_1: 0xFF1605,
+    LocationName.mission_street_itembox_1: 0xFF1606,
+    LocationName.aquatic_mine_itembox_1: 0xFF1607,
+    LocationName.route_101_itembox_1: 0xFF1608,
+    LocationName.hidden_base_itembox_1: 0xFF1609,
+    LocationName.pyramid_cave_itembox_1: 0xFF160A,
+    LocationName.death_chamber_itembox_1: 0xFF160B,
+    LocationName.eternal_engine_itembox_1: 0xFF160C,
+    LocationName.meteor_herd_itembox_1: 0xFF160D,
+    LocationName.crazy_gadget_itembox_1: 0xFF160E,
+    LocationName.final_rush_itembox_1: 0xFF160F,
+
+    LocationName.iron_gate_itembox_1: 0xFF1610,
+    LocationName.dry_lagoon_itembox_1: 0xFF1611,
+    LocationName.sand_ocean_itembox_1: 0xFF1612,
+    LocationName.radical_highway_itembox_1: 0xFF1613,
+    LocationName.egg_quarters_itembox_1: 0xFF1614,
+    LocationName.lost_colony_itembox_1: 0xFF1615,
+    LocationName.weapons_bed_itembox_1: 0xFF1616,
+    LocationName.security_hall_itembox_1: 0xFF1617,
+    LocationName.white_jungle_itembox_1: 0xFF1618,
+    LocationName.route_280_itembox_1: 0xFF1619,
+    LocationName.sky_rail_itembox_1: 0xFF161A,
+    LocationName.mad_space_itembox_1: 0xFF161B,
+    LocationName.cosmic_wall_itembox_1: 0xFF161C,
+    LocationName.final_chase_itembox_1: 0xFF161D,
+
+    LocationName.cannon_core_itembox_1: 0xFF161E,
+
+    LocationName.city_escape_itembox_2: 0xFF1620,
+    LocationName.wild_canyon_itembox_2: 0xFF1621,
+    LocationName.prison_lane_itembox_2: 0xFF1622,
+    LocationName.metal_harbor_itembox_2: 0xFF1623,
+    LocationName.green_forest_itembox_2: 0xFF1624,
+    LocationName.pumpkin_hill_itembox_2: 0xFF1625,
+    LocationName.mission_street_itembox_2: 0xFF1626,
+    LocationName.aquatic_mine_itembox_2: 0xFF1627,
+    LocationName.route_101_itembox_2: 0xFF1628,
+    LocationName.hidden_base_itembox_2: 0xFF1629,
+    LocationName.pyramid_cave_itembox_2: 0xFF162A,
+    LocationName.death_chamber_itembox_2: 0xFF162B,
+    LocationName.eternal_engine_itembox_2: 0xFF162C,
+    LocationName.meteor_herd_itembox_2: 0xFF162D,
+    LocationName.crazy_gadget_itembox_2: 0xFF162E,
+    LocationName.final_rush_itembox_2: 0xFF162F,
+
+    LocationName.iron_gate_itembox_2: 0xFF1630,
+    LocationName.dry_lagoon_itembox_2: 0xFF1631,
+    LocationName.sand_ocean_itembox_2: 0xFF1632,
+    LocationName.radical_highway_itembox_2: 0xFF1633,
+    LocationName.egg_quarters_itembox_2: 0xFF1634,
+    LocationName.lost_colony_itembox_2: 0xFF1635,
+    LocationName.weapons_bed_itembox_2: 0xFF1636,
+    LocationName.security_hall_itembox_2: 0xFF1637,
+    LocationName.white_jungle_itembox_2: 0xFF1638,
+    LocationName.route_280_itembox_2: 0xFF1639,
+    LocationName.sky_rail_itembox_2: 0xFF163A,
+    LocationName.mad_space_itembox_2: 0xFF163B,
+    LocationName.cosmic_wall_itembox_2: 0xFF163C,
+    LocationName.final_chase_itembox_2: 0xFF163D,
+
+    LocationName.cannon_core_itembox_2: 0xFF163E,
+
+    LocationName.city_escape_itembox_3: 0xFF1640,
+    LocationName.wild_canyon_itembox_3: 0xFF1641,
+    LocationName.prison_lane_itembox_3: 0xFF1642,
+    LocationName.metal_harbor_itembox_3: 0xFF1643,
+    LocationName.green_forest_itembox_3: 0xFF1644,
+    LocationName.pumpkin_hill_itembox_3: 0xFF1645,
+    LocationName.mission_street_itembox_3: 0xFF1646,
+    LocationName.aquatic_mine_itembox_3: 0xFF1647,
+    LocationName.route_101_itembox_3: 0xFF1648,
+    LocationName.hidden_base_itembox_3: 0xFF1649,
+    LocationName.pyramid_cave_itembox_3: 0xFF164A,
+    LocationName.death_chamber_itembox_3: 0xFF164B,
+    LocationName.eternal_engine_itembox_3: 0xFF164C,
+    LocationName.meteor_herd_itembox_3: 0xFF164D,
+    LocationName.crazy_gadget_itembox_3: 0xFF164E,
+    LocationName.final_rush_itembox_3: 0xFF164F,
+
+    LocationName.iron_gate_itembox_3: 0xFF1650,
+    LocationName.dry_lagoon_itembox_3: 0xFF1651,
+    LocationName.sand_ocean_itembox_3: 0xFF1652,
+    LocationName.radical_highway_itembox_3: 0xFF1653,
+    LocationName.egg_quarters_itembox_3: 0xFF1654,
+    LocationName.lost_colony_itembox_3: 0xFF1655,
+    LocationName.weapons_bed_itembox_3: 0xFF1656,
+    LocationName.security_hall_itembox_3: 0xFF1657,
+    LocationName.white_jungle_itembox_3: 0xFF1658,
+    LocationName.route_280_itembox_3: 0xFF1659,
+    LocationName.sky_rail_itembox_3: 0xFF165A,
+    LocationName.mad_space_itembox_3: 0xFF165B,
+    LocationName.cosmic_wall_itembox_3: 0xFF165C,
+    LocationName.final_chase_itembox_3: 0xFF165D,
+
+    LocationName.cannon_core_itembox_3: 0xFF165E,
+
+    LocationName.city_escape_itembox_4: 0xFF1660,
+    LocationName.wild_canyon_itembox_4: 0xFF1661,
+    LocationName.prison_lane_itembox_4: 0xFF1662,
+    LocationName.metal_harbor_itembox_4: 0xFF1663,
+    LocationName.green_forest_itembox_4: 0xFF1664,
+    LocationName.pumpkin_hill_itembox_4: 0xFF1665,
+    LocationName.mission_street_itembox_4: 0xFF1666,
+    LocationName.aquatic_mine_itembox_4: 0xFF1667,
+    LocationName.route_101_itembox_4: 0xFF1668,
+    LocationName.hidden_base_itembox_4: 0xFF1669,
+    LocationName.pyramid_cave_itembox_4: 0xFF166A,
+    LocationName.death_chamber_itembox_4: 0xFF166B,
+    LocationName.eternal_engine_itembox_4: 0xFF166C,
+    LocationName.meteor_herd_itembox_4: 0xFF166D,
+    LocationName.crazy_gadget_itembox_4: 0xFF166E,
+    LocationName.final_rush_itembox_4: 0xFF166F,
+
+    LocationName.iron_gate_itembox_4: 0xFF1670,
+    LocationName.dry_lagoon_itembox_4: 0xFF1671,
+    LocationName.sand_ocean_itembox_4: 0xFF1672,
+    LocationName.radical_highway_itembox_4: 0xFF1673,
+    LocationName.egg_quarters_itembox_4: 0xFF1674,
+    LocationName.lost_colony_itembox_4: 0xFF1675,
+    LocationName.weapons_bed_itembox_4: 0xFF1676,
+    LocationName.security_hall_itembox_4: 0xFF1677,
+    LocationName.white_jungle_itembox_4: 0xFF1678,
+    LocationName.sky_rail_itembox_4: 0xFF167A,
+    LocationName.mad_space_itembox_4: 0xFF167B,
+    LocationName.cosmic_wall_itembox_4: 0xFF167C,
+    LocationName.final_chase_itembox_4: 0xFF167D,
+
+    LocationName.cannon_core_itembox_4: 0xFF167E,
+
+    LocationName.city_escape_itembox_5: 0xFF1680,
+    LocationName.wild_canyon_itembox_5: 0xFF1681,
+    LocationName.prison_lane_itembox_5: 0xFF1682,
+    LocationName.metal_harbor_itembox_5: 0xFF1683,
+    LocationName.green_forest_itembox_5: 0xFF1684,
+    LocationName.pumpkin_hill_itembox_5: 0xFF1685,
+    LocationName.mission_street_itembox_5: 0xFF1686,
+    LocationName.aquatic_mine_itembox_5: 0xFF1687,
+    LocationName.route_101_itembox_5: 0xFF1688,
+    LocationName.hidden_base_itembox_5: 0xFF1689,
+    LocationName.pyramid_cave_itembox_5: 0xFF168A,
+    LocationName.death_chamber_itembox_5: 0xFF168B,
+    LocationName.eternal_engine_itembox_5: 0xFF168C,
+    LocationName.meteor_herd_itembox_5: 0xFF168D,
+    LocationName.crazy_gadget_itembox_5: 0xFF168E,
+    LocationName.final_rush_itembox_5: 0xFF168F,
+
+    LocationName.iron_gate_itembox_5: 0xFF1690,
+    LocationName.dry_lagoon_itembox_5: 0xFF1691,
+    LocationName.sand_ocean_itembox_5: 0xFF1692,
+    LocationName.radical_highway_itembox_5: 0xFF1693,
+    LocationName.egg_quarters_itembox_5: 0xFF1694,
+    LocationName.lost_colony_itembox_5: 0xFF1695,
+    LocationName.weapons_bed_itembox_5: 0xFF1696,
+    LocationName.security_hall_itembox_5: 0xFF1697,
+    LocationName.white_jungle_itembox_5: 0xFF1698,
+    LocationName.sky_rail_itembox_5: 0xFF169A,
+    LocationName.mad_space_itembox_5: 0xFF169B,
+    LocationName.cosmic_wall_itembox_5: 0xFF169C,
+    LocationName.final_chase_itembox_5: 0xFF169D,
+
+    LocationName.cannon_core_itembox_5: 0xFF169E,
+
+    LocationName.city_escape_itembox_6: 0xFF16A0,
+    LocationName.wild_canyon_itembox_6: 0xFF16A1,
+    LocationName.prison_lane_itembox_6: 0xFF16A2,
+    LocationName.green_forest_itembox_6: 0xFF16A4,
+    LocationName.pumpkin_hill_itembox_6: 0xFF16A5,
+    LocationName.mission_street_itembox_6: 0xFF16A6,
+    LocationName.aquatic_mine_itembox_6: 0xFF16A7,
+    LocationName.pyramid_cave_itembox_6: 0xFF16AA,
+    LocationName.death_chamber_itembox_6: 0xFF16AB,
+    LocationName.eternal_engine_itembox_6: 0xFF16AC,
+    LocationName.meteor_herd_itembox_6: 0xFF16AD,
+    LocationName.crazy_gadget_itembox_6: 0xFF16AE,
+    LocationName.final_rush_itembox_6: 0xFF16AF,
+
+    LocationName.iron_gate_itembox_6: 0xFF16B0,
+    LocationName.dry_lagoon_itembox_6: 0xFF16B1,
+    LocationName.sand_ocean_itembox_6: 0xFF16B2,
+    LocationName.radical_highway_itembox_6: 0xFF16B3,
+    LocationName.egg_quarters_itembox_6: 0xFF16B4,
+    LocationName.lost_colony_itembox_6: 0xFF16B5,
+    LocationName.weapons_bed_itembox_6: 0xFF16B6,
+    LocationName.security_hall_itembox_6: 0xFF16B7,
+    LocationName.white_jungle_itembox_6: 0xFF16B8,
+    LocationName.sky_rail_itembox_6: 0xFF16BA,
+    LocationName.mad_space_itembox_6: 0xFF16BB,
+    LocationName.cosmic_wall_itembox_6: 0xFF16BC,
+    LocationName.final_chase_itembox_6: 0xFF16BD,
+
+    LocationName.cannon_core_itembox_6: 0xFF16BE,
+
+    LocationName.city_escape_itembox_7: 0xFF16C0,
+    LocationName.wild_canyon_itembox_7: 0xFF16C1,
+    LocationName.green_forest_itembox_7: 0xFF16C4,
+    LocationName.pumpkin_hill_itembox_7: 0xFF16C5,
+    LocationName.pyramid_cave_itembox_7: 0xFF16CA,
+    LocationName.death_chamber_itembox_7: 0xFF16CB,
+    LocationName.eternal_engine_itembox_7: 0xFF16CC,
+    LocationName.meteor_herd_itembox_7: 0xFF16CD,
+    LocationName.crazy_gadget_itembox_7: 0xFF16CE,
+    LocationName.final_rush_itembox_7: 0xFF16CF,
+
+    LocationName.iron_gate_itembox_7: 0xFF16D0,
+    LocationName.sand_ocean_itembox_7: 0xFF16D2,
+    LocationName.radical_highway_itembox_7: 0xFF16D3,
+    LocationName.egg_quarters_itembox_7: 0xFF16D4,
+    LocationName.lost_colony_itembox_7: 0xFF16D5,
+    LocationName.weapons_bed_itembox_7: 0xFF16D6,
+    LocationName.security_hall_itembox_7: 0xFF16D7,
+    LocationName.white_jungle_itembox_7: 0xFF16D8,
+    LocationName.sky_rail_itembox_7: 0xFF16DA,
+    LocationName.mad_space_itembox_7: 0xFF16DB,
+    LocationName.cosmic_wall_itembox_7: 0xFF16DC,
+    LocationName.final_chase_itembox_7: 0xFF16DD,
+
+    LocationName.cannon_core_itembox_7: 0xFF16DE,
+
+    LocationName.city_escape_itembox_8: 0xFF16E0,
+    LocationName.wild_canyon_itembox_8: 0xFF16E1,
+    LocationName.green_forest_itembox_8: 0xFF16E4,
+    LocationName.pumpkin_hill_itembox_8: 0xFF16E5,
+    LocationName.pyramid_cave_itembox_8: 0xFF16EA,
+    LocationName.death_chamber_itembox_8: 0xFF16EB,
+    LocationName.eternal_engine_itembox_8: 0xFF16EC,
+    LocationName.meteor_herd_itembox_8: 0xFF16ED,
+    LocationName.crazy_gadget_itembox_8: 0xFF16EE,
+    LocationName.final_rush_itembox_8: 0xFF16EF,
+
+    LocationName.iron_gate_itembox_8: 0xFF16F0,
+    LocationName.sand_ocean_itembox_8: 0xFF16F2,
+    LocationName.egg_quarters_itembox_8: 0xFF16F4,
+    LocationName.lost_colony_itembox_8: 0xFF16F5,
+    LocationName.security_hall_itembox_8: 0xFF16F7,
+    LocationName.white_jungle_itembox_8: 0xFF16F8,
+    LocationName.sky_rail_itembox_8: 0xFF16FA,
+    LocationName.mad_space_itembox_8: 0xFF16FB,
+    LocationName.cosmic_wall_itembox_8: 0xFF16FC,
+    LocationName.final_chase_itembox_8: 0xFF16FD,
+
+    LocationName.cannon_core_itembox_8: 0xFF16FE,
+    
+    LocationName.city_escape_itembox_9: 0xFF1700,
+    LocationName.green_forest_itembox_9: 0xFF1704,
+    LocationName.pumpkin_hill_itembox_9: 0xFF1705,
+    LocationName.pyramid_cave_itembox_9: 0xFF170A,
+    LocationName.death_chamber_itembox_9: 0xFF170B,
+    LocationName.eternal_engine_itembox_9: 0xFF170C,
+    LocationName.meteor_herd_itembox_9: 0xFF170D,
+    LocationName.crazy_gadget_itembox_9: 0xFF170E,
+    LocationName.final_rush_itembox_9: 0xFF170F,
+
+    LocationName.iron_gate_itembox_9: 0xFF1710,
+    LocationName.sand_ocean_itembox_9: 0xFF1712,
+    LocationName.egg_quarters_itembox_9: 0xFF1714,
+    LocationName.lost_colony_itembox_9: 0xFF1715,
+    LocationName.security_hall_itembox_9: 0xFF1717,
+    LocationName.sky_rail_itembox_9: 0xFF171A,
+    LocationName.mad_space_itembox_9: 0xFF171B,
+    LocationName.cosmic_wall_itembox_9: 0xFF171C,
+    LocationName.final_chase_itembox_9: 0xFF171D,
+
+    LocationName.cannon_core_itembox_9: 0xFF171E,
+
+    LocationName.green_forest_itembox_10: 0xFF1724,
+    LocationName.pumpkin_hill_itembox_10: 0xFF1725,
+    LocationName.pyramid_cave_itembox_10: 0xFF172A,
+    LocationName.death_chamber_itembox_10: 0xFF172B,
+    LocationName.eternal_engine_itembox_10: 0xFF172C,
+    LocationName.meteor_herd_itembox_10: 0xFF172D,
+    LocationName.crazy_gadget_itembox_10: 0xFF172E,
+    LocationName.final_rush_itembox_10: 0xFF172F,
+
+    LocationName.iron_gate_itembox_10: 0xFF1730,
+    LocationName.sand_ocean_itembox_10: 0xFF1732,
+    LocationName.egg_quarters_itembox_10: 0xFF1734,
+    LocationName.security_hall_itembox_10: 0xFF1737,
+    LocationName.sky_rail_itembox_10: 0xFF173A,
+    LocationName.mad_space_itembox_10: 0xFF173B,
+    LocationName.cosmic_wall_itembox_10: 0xFF173C,
+    LocationName.final_chase_itembox_10: 0xFF173D,
+
+    LocationName.cannon_core_itembox_10: 0xFF173E,
+
+    LocationName.green_forest_itembox_11: 0xFF1744,
+    LocationName.pyramid_cave_itembox_11: 0xFF174A,
+    LocationName.death_chamber_itembox_11: 0xFF174B,
+    LocationName.eternal_engine_itembox_11: 0xFF174C,
+    LocationName.meteor_herd_itembox_11: 0xFF174D,
+    LocationName.crazy_gadget_itembox_11: 0xFF174E,
+    LocationName.final_rush_itembox_11: 0xFF174F,
+
+    LocationName.iron_gate_itembox_11: 0xFF1750,
+    LocationName.egg_quarters_itembox_11: 0xFF1754,
+    LocationName.security_hall_itembox_11: 0xFF1757,
+    LocationName.sky_rail_itembox_11: 0xFF175A,
+    LocationName.mad_space_itembox_11: 0xFF175B,
+    LocationName.cosmic_wall_itembox_11: 0xFF175C,
+    LocationName.final_chase_itembox_11: 0xFF175D,
+
+    LocationName.cannon_core_itembox_11: 0xFF175E,
+
+    LocationName.green_forest_itembox_12: 0xFF1764,
+    LocationName.pyramid_cave_itembox_12: 0xFF176A,
+    LocationName.eternal_engine_itembox_12: 0xFF176C,
+    LocationName.meteor_herd_itembox_12: 0xFF176D,
+    LocationName.crazy_gadget_itembox_12: 0xFF176E,
+    LocationName.final_rush_itembox_12: 0xFF176F,
+
+    LocationName.iron_gate_itembox_12: 0xFF1770,
+    LocationName.security_hall_itembox_12: 0xFF1777,
+    LocationName.sky_rail_itembox_12: 0xFF177A,
+    LocationName.mad_space_itembox_12: 0xFF177B,
+    LocationName.cosmic_wall_itembox_12: 0xFF177C,
+    LocationName.final_chase_itembox_12: 0xFF177D,
+
+    LocationName.cannon_core_itembox_12: 0xFF177E,
+
+    LocationName.green_forest_itembox_13: 0xFF1784,
+    LocationName.pyramid_cave_itembox_13: 0xFF178A,
+    LocationName.eternal_engine_itembox_13: 0xFF178C,
+    LocationName.crazy_gadget_itembox_13: 0xFF178E,
+    LocationName.final_rush_itembox_13: 0xFF178F,
+
+    LocationName.iron_gate_itembox_13: 0xFF1790,
+    LocationName.security_hall_itembox_13: 0xFF1797,
+    LocationName.sky_rail_itembox_13: 0xFF179A,
+    LocationName.mad_space_itembox_13: 0xFF179B,
+    LocationName.cosmic_wall_itembox_13: 0xFF179C,
+    LocationName.final_chase_itembox_13: 0xFF179D,
+
+    LocationName.pyramid_cave_itembox_14: 0xFF17AA,
+    LocationName.eternal_engine_itembox_14: 0xFF17AC,
+    LocationName.crazy_gadget_itembox_14: 0xFF17AE,
+    LocationName.final_rush_itembox_14: 0xFF17AF,
+
+    LocationName.iron_gate_itembox_14: 0xFF17B0,
+    LocationName.security_hall_itembox_14: 0xFF17B7,
+    LocationName.sky_rail_itembox_14: 0xFF17BA,
+    LocationName.mad_space_itembox_14: 0xFF17BB,
+    LocationName.cosmic_wall_itembox_14: 0xFF17BC,
+    LocationName.final_chase_itembox_14: 0xFF17BD,
+
+    LocationName.pyramid_cave_itembox_15: 0xFF17CA,
+    LocationName.final_rush_itembox_15: 0xFF17CF,
+
+    LocationName.iron_gate_itembox_15: 0xFF17D0,
+    LocationName.security_hall_itembox_15: 0xFF17D7,
+    LocationName.sky_rail_itembox_15: 0xFF17DA,
+    LocationName.mad_space_itembox_15: 0xFF17DB,
+    LocationName.cosmic_wall_itembox_15: 0xFF17DC,
+    LocationName.final_chase_itembox_15: 0xFF17DD,
+
+    LocationName.final_rush_itembox_16: 0xFF17EF,
+
+    LocationName.iron_gate_itembox_16: 0xFF17F0,
+    LocationName.security_hall_itembox_16: 0xFF17F7,
+    LocationName.sky_rail_itembox_16: 0xFF17FA,
+    LocationName.mad_space_itembox_16: 0xFF17FB,
+    LocationName.cosmic_wall_itembox_16: 0xFF17FC,
+    LocationName.final_chase_itembox_16: 0xFF17FD,
+
+    LocationName.final_rush_itembox_17: 0xFF180F,
+
+    LocationName.security_hall_itembox_17: 0xFF1817,
+    LocationName.sky_rail_itembox_17: 0xFF181A,
+    LocationName.mad_space_itembox_17: 0xFF181B,
+    LocationName.cosmic_wall_itembox_17: 0xFF181C,
+    LocationName.final_chase_itembox_17: 0xFF181D,
+
+    LocationName.final_rush_itembox_18: 0xFF182F,
+
+    LocationName.security_hall_itembox_18: 0xFF1837,
+    LocationName.sky_rail_itembox_18: 0xFF183A,
+    LocationName.mad_space_itembox_18: 0xFF183B,
+    LocationName.cosmic_wall_itembox_18: 0xFF183C,
+    LocationName.final_chase_itembox_18: 0xFF183D,
+
+    LocationName.final_rush_itembox_19: 0xFF184F,
+
+    LocationName.security_hall_itembox_19: 0xFF1857,
+    LocationName.sky_rail_itembox_19: 0xFF185A,
+    LocationName.mad_space_itembox_19: 0xFF185B,
+    LocationName.cosmic_wall_itembox_19: 0xFF185C,
+    LocationName.final_chase_itembox_19: 0xFF185D,
+
+    LocationName.final_rush_itembox_20: 0xFF186F,
+
+    LocationName.security_hall_itembox_20: 0xFF1877,
+    LocationName.sky_rail_itembox_20: 0xFF187A,
+    LocationName.mad_space_itembox_20: 0xFF187B,
+    LocationName.cosmic_wall_itembox_20: 0xFF187C,
+    LocationName.final_chase_itembox_20: 0xFF187D,
+
+    LocationName.final_rush_itembox_21: 0xFF188F,
+
+    LocationName.security_hall_itembox_21: 0xFF1897,
+    LocationName.sky_rail_itembox_21: 0xFF189A,
+    LocationName.cosmic_wall_itembox_21: 0xFF189C,
+    LocationName.final_chase_itembox_21: 0xFF189D,
+
+    LocationName.final_rush_itembox_22: 0xFF18AF,
+
+    LocationName.security_hall_itembox_22: 0xFF18B7,
+    LocationName.sky_rail_itembox_22: 0xFF18BA,
+    LocationName.cosmic_wall_itembox_22: 0xFF18BC,
+    LocationName.final_chase_itembox_22: 0xFF18BD,
+
+    LocationName.final_rush_itembox_23: 0xFF18CF,
+
+    LocationName.security_hall_itembox_23: 0xFF18D7,
+    LocationName.sky_rail_itembox_23: 0xFF18DA,
+    LocationName.cosmic_wall_itembox_23: 0xFF18DC,
+    LocationName.final_chase_itembox_23: 0xFF18DD,
+
+    LocationName.final_rush_itembox_24: 0xFF18EF,
+
+    LocationName.security_hall_itembox_24: 0xFF18F7,
+    LocationName.cosmic_wall_itembox_24: 0xFF18FC,
+    LocationName.final_chase_itembox_24: 0xFF18FD,
+
+    LocationName.final_rush_itembox_25: 0xFF190F,
+
+    LocationName.cosmic_wall_itembox_25: 0xFF191C,
+    LocationName.final_chase_itembox_25: 0xFF191D,
+
+    LocationName.final_rush_itembox_26: 0xFF192F,
+
+    LocationName.cosmic_wall_itembox_26: 0xFF193C,
+    LocationName.final_chase_itembox_26: 0xFF193D,
+
+    LocationName.final_rush_itembox_27: 0xFF194F,
+
+    LocationName.cosmic_wall_itembox_27: 0xFF195C,
+    LocationName.final_chase_itembox_27: 0xFF195D,
+
+    LocationName.final_rush_itembox_28: 0xFF196F,
+
+    LocationName.final_chase_itembox_28: 0xFF197D,
+
+    LocationName.final_rush_itembox_29: 0xFF198F,
+
+    LocationName.final_chase_itembox_29: 0xFF199D,
+
+    LocationName.final_rush_itembox_30: 0xFF19AF,
+
+    LocationName.final_chase_itembox_30: 0xFF19BD,
+
+    LocationName.final_rush_itembox_31: 0xFF19CF,
+
+    LocationName.final_chase_itembox_31: 0xFF19DD,
+
+    LocationName.final_rush_itembox_32: 0xFF19EF,
+
+    LocationName.final_chase_itembox_32: 0xFF19FD,
+
+    LocationName.final_rush_itembox_33: 0xFF1A0F,
+
+    LocationName.final_chase_itembox_33: 0xFF1A1D,
+
+    LocationName.final_rush_itembox_34: 0xFF1A2F,
+
+    LocationName.final_chase_itembox_34: 0xFF1A3D,
+
+    LocationName.final_rush_itembox_35: 0xFF1A4F,
+
+    LocationName.final_chase_itembox_35: 0xFF1A5D,
+
+    LocationName.final_rush_itembox_36: 0xFF1A6F,
+
+    LocationName.final_rush_itembox_37: 0xFF1A8F,
+
+    LocationName.final_rush_itembox_38: 0xFF1AAF,
+
+    LocationName.final_rush_itembox_39: 0xFF1ACF,
+
+    LocationName.final_rush_itembox_40: 0xFF1AEF,
+}
+
+big_location_table = {
+    LocationName.city_escape_big: 0xFF1B00,
+    LocationName.prison_lane_big: 0xFF1B02,
+    LocationName.metal_harbor_big: 0xFF1B03,
+    LocationName.green_forest_big: 0xFF1B04,
+    LocationName.pumpkin_hill_big: 0xFF1B05,
+    LocationName.mission_street_big: 0xFF1B06,
+    LocationName.aquatic_mine_big: 0xFF1B07,
+    LocationName.hidden_base_big: 0xFF1B09,
+    LocationName.pyramid_cave_big: 0xFF1B0A,
+    LocationName.death_chamber_big: 0xFF1B0B,
+    LocationName.eternal_engine_big: 0xFF1B0C,
+    LocationName.meteor_herd_big: 0xFF1B0D,
+    LocationName.crazy_gadget_big: 0xFF1B0E,
+    LocationName.final_rush_big: 0xFF1B0F,
+
+    LocationName.iron_gate_big: 0xFF1B10,
+    LocationName.dry_lagoon_big: 0xFF1B11,
+    LocationName.sand_ocean_big: 0xFF1B12,
+    LocationName.radical_highway_big: 0xFF1B13,
+    LocationName.egg_quarters_big: 0xFF1B14,
+    LocationName.lost_colony_big: 0xFF1B15,
+    LocationName.weapons_bed_big: 0xFF1B16,
+    LocationName.security_hall_big: 0xFF1B17,
+    LocationName.white_jungle_big_1: 0xFF1B18,
+    LocationName.sky_rail_big: 0xFF1B1A,
+    LocationName.mad_space_big: 0xFF1B1B,
+    LocationName.final_chase_big: 0xFF1B1D,
+
+    LocationName.cannon_core_big_1: 0xFF1B1E,
+
+    LocationName.white_jungle_big_2: 0xFF1B38,
+
+    LocationName.cannon_core_big_2: 0xFF1B3E,
+
+    LocationName.cannon_core_big_3: 0xFF1B5E,
+
+    LocationName.cannon_core_big_4: 0xFF1B7E,
+
+    LocationName.cannon_core_big_5: 0xFF1B9E,
+}
+
 boss_gate_location_table = {
     LocationName.gate_1_boss: 0xFF0100,
     LocationName.gate_2_boss: 0xFF0101,
@@ -1556,17 +2203,31 @@ green_hill_animal_location_table = {
     #LocationName.green_hill_animal_1: 0xFF0B1F, # Disabled for technical reasons, may return
 }
 
+green_hill_itembox_location_table = {
+    LocationName.green_hill_itembox_1: 0xFF161F,
+    LocationName.green_hill_itembox_2: 0xFF163F,
+    LocationName.green_hill_itembox_3: 0xFF165F,
+    LocationName.green_hill_itembox_4: 0xFF167F,
+    LocationName.green_hill_itembox_5: 0xFF169F,
+    LocationName.green_hill_itembox_6: 0xFF16BF,
+    LocationName.green_hill_itembox_7: 0xFF16DF,
+    LocationName.green_hill_itembox_8: 0xFF16FF,
+    LocationName.green_hill_itembox_9: 0xFF171F,
+    LocationName.green_hill_itembox_10: 0xFF173F,
+    LocationName.green_hill_itembox_11: 0xFF175F,
+}
+
 final_boss_location_table = {
     # LocationName.biolizard: 0xFF003F,
-    LocationName.finalhazard: 0xFF005F,
+    LocationName.finalhazard: None,
 }
 
 grand_prix_location_table = {
-    LocationName.grand_prix: 0xFF007F,
+    LocationName.grand_prix: None,
 }
 
 chaos_chao_location_table = {
-    LocationName.chaos_chao: 0xFF009F,
+    LocationName.chaos_chao: None,
 }
 
 all_locations = {
@@ -1580,6 +2241,9 @@ all_locations = {
     **beetle_location_table,
     **omochao_location_table,
     **animal_location_table,
+    **lifebox_location_table,
+    **itembox_location_table,
+    **big_location_table,
     **chao_race_beginner_location_table,
     **chao_karate_beginner_location_table,
     **chao_race_intermediate_location_table,
@@ -1594,9 +2258,7 @@ all_locations = {
     **green_hill_location_table,
     **green_hill_chao_location_table,
     **green_hill_animal_location_table,
-    **final_boss_location_table,
-    **grand_prix_location_table,
-    **chaos_chao_location_table,
+    **green_hill_itembox_location_table,
     **chao_stat_swim_table,
     **chao_stat_fly_table,
     **chao_stat_run_table,
@@ -1648,6 +2310,1662 @@ chao_race_prize_set = [
 ]
 
 
+# Per-stage location lists
+city_escape_region_locations = [
+    LocationName.city_escape_1,
+    LocationName.city_escape_2,
+    LocationName.city_escape_3,
+    LocationName.city_escape_4,
+    LocationName.city_escape_5,
+    LocationName.city_escape_chao_1,
+    LocationName.city_escape_chao_2,
+    LocationName.city_escape_chao_3,
+    LocationName.city_escape_pipe_1,
+    LocationName.city_escape_pipe_2,
+    LocationName.city_escape_pipe_3,
+    LocationName.city_escape_pipe_4,
+    LocationName.city_escape_hidden_1,
+    LocationName.city_escape_hidden_2,
+    LocationName.city_escape_hidden_3,
+    LocationName.city_escape_hidden_4,
+    LocationName.city_escape_hidden_5,
+    LocationName.city_escape_omo_1,
+    LocationName.city_escape_omo_2,
+    LocationName.city_escape_omo_3,
+    LocationName.city_escape_omo_4,
+    LocationName.city_escape_omo_5,
+    LocationName.city_escape_omo_6,
+    LocationName.city_escape_omo_7,
+    LocationName.city_escape_omo_8,
+    LocationName.city_escape_omo_9,
+    LocationName.city_escape_omo_10,
+    LocationName.city_escape_omo_11,
+    LocationName.city_escape_omo_12,
+    LocationName.city_escape_omo_13,
+    LocationName.city_escape_omo_14,
+    LocationName.city_escape_beetle,
+    LocationName.city_escape_animal_1,
+    LocationName.city_escape_animal_2,
+    LocationName.city_escape_animal_3,
+    LocationName.city_escape_animal_4,
+    LocationName.city_escape_animal_5,
+    LocationName.city_escape_animal_6,
+    LocationName.city_escape_animal_7,
+    LocationName.city_escape_animal_8,
+    LocationName.city_escape_animal_9,
+    LocationName.city_escape_animal_10,
+    LocationName.city_escape_animal_11,
+    LocationName.city_escape_animal_12,
+    LocationName.city_escape_animal_13,
+    LocationName.city_escape_animal_14,
+    LocationName.city_escape_animal_15,
+    LocationName.city_escape_animal_16,
+    LocationName.city_escape_animal_17,
+    LocationName.city_escape_animal_18,
+    LocationName.city_escape_animal_19,
+    LocationName.city_escape_animal_20,
+    LocationName.city_escape_lifebox_1,
+    LocationName.city_escape_lifebox_2,
+    LocationName.city_escape_itembox_1,
+    LocationName.city_escape_itembox_2,
+    LocationName.city_escape_itembox_3,
+    LocationName.city_escape_itembox_4,
+    LocationName.city_escape_itembox_5,
+    LocationName.city_escape_itembox_6,
+    LocationName.city_escape_itembox_7,
+    LocationName.city_escape_itembox_8,
+    LocationName.city_escape_itembox_9,
+    LocationName.city_escape_big,
+    LocationName.city_escape_upgrade,
+]
+
+metal_harbor_region_locations = [
+    LocationName.metal_harbor_1,
+    LocationName.metal_harbor_2,
+    LocationName.metal_harbor_3,
+    LocationName.metal_harbor_4,
+    LocationName.metal_harbor_5,
+    LocationName.metal_harbor_chao_1,
+    LocationName.metal_harbor_chao_2,
+    LocationName.metal_harbor_chao_3,
+    LocationName.metal_harbor_pipe_1,
+    LocationName.metal_harbor_omo_1,
+    LocationName.metal_harbor_omo_2,
+    LocationName.metal_harbor_omo_3,
+    LocationName.metal_harbor_omo_4,
+    LocationName.metal_harbor_omo_5,
+    LocationName.metal_harbor_beetle,
+    LocationName.metal_harbor_animal_1,
+    LocationName.metal_harbor_animal_2,
+    LocationName.metal_harbor_animal_3,
+    LocationName.metal_harbor_animal_4,
+    LocationName.metal_harbor_animal_5,
+    LocationName.metal_harbor_animal_6,
+    LocationName.metal_harbor_animal_7,
+    LocationName.metal_harbor_animal_8,
+    LocationName.metal_harbor_animal_9,
+    LocationName.metal_harbor_animal_10,
+    LocationName.metal_harbor_animal_11,
+    LocationName.metal_harbor_animal_12,
+    LocationName.metal_harbor_animal_13,
+    LocationName.metal_harbor_animal_14,
+    LocationName.metal_harbor_lifebox_1,
+    LocationName.metal_harbor_lifebox_2,
+    LocationName.metal_harbor_lifebox_3,
+    LocationName.metal_harbor_itembox_1,
+    LocationName.metal_harbor_itembox_2,
+    LocationName.metal_harbor_itembox_3,
+    LocationName.metal_harbor_itembox_4,
+    LocationName.metal_harbor_itembox_5,
+    LocationName.metal_harbor_big,
+    LocationName.metal_harbor_upgrade,
+]
+
+green_forest_region_locations = [
+    LocationName.green_forest_1,
+    LocationName.green_forest_2,
+    LocationName.green_forest_3,
+    LocationName.green_forest_4,
+    LocationName.green_forest_5,
+    LocationName.green_forest_chao_1,
+    LocationName.green_forest_chao_2,
+    LocationName.green_forest_chao_3,
+    LocationName.green_forest_pipe_1,
+    LocationName.green_forest_pipe_2,
+    LocationName.green_forest_hidden_1,
+    LocationName.green_forest_hidden_2,
+    LocationName.green_forest_hidden_3,
+    LocationName.green_forest_hidden_4,
+    LocationName.green_forest_beetle,
+    LocationName.green_forest_animal_1,
+    LocationName.green_forest_animal_2,
+    LocationName.green_forest_animal_3,
+    LocationName.green_forest_animal_4,
+    LocationName.green_forest_animal_5,
+    LocationName.green_forest_animal_6,
+    LocationName.green_forest_animal_7,
+    LocationName.green_forest_animal_8,
+    LocationName.green_forest_animal_9,
+    LocationName.green_forest_animal_10,
+    LocationName.green_forest_animal_11,
+    LocationName.green_forest_animal_12,
+    LocationName.green_forest_animal_13,
+    LocationName.green_forest_animal_14,
+    LocationName.green_forest_animal_15,
+    LocationName.green_forest_animal_16,
+    LocationName.green_forest_animal_17,
+    LocationName.green_forest_animal_18,
+    LocationName.green_forest_lifebox_1,
+    LocationName.green_forest_lifebox_2,
+    LocationName.green_forest_lifebox_3,
+    LocationName.green_forest_lifebox_4,
+    LocationName.green_forest_itembox_1,
+    LocationName.green_forest_itembox_2,
+    LocationName.green_forest_itembox_3,
+    LocationName.green_forest_itembox_4,
+    LocationName.green_forest_itembox_5,
+    LocationName.green_forest_itembox_6,
+    LocationName.green_forest_itembox_7,
+    LocationName.green_forest_itembox_8,
+    LocationName.green_forest_itembox_9,
+    LocationName.green_forest_itembox_10,
+    LocationName.green_forest_itembox_11,
+    LocationName.green_forest_itembox_12,
+    LocationName.green_forest_itembox_13,
+    LocationName.green_forest_big,
+    LocationName.green_forest_upgrade,
+]
+
+pyramid_cave_region_locations = [
+    LocationName.pyramid_cave_1,
+    LocationName.pyramid_cave_2,
+    LocationName.pyramid_cave_3,
+    LocationName.pyramid_cave_4,
+    LocationName.pyramid_cave_5,
+    LocationName.pyramid_cave_chao_1,
+    LocationName.pyramid_cave_chao_2,
+    LocationName.pyramid_cave_chao_3,
+    LocationName.pyramid_cave_pipe_1,
+    LocationName.pyramid_cave_pipe_2,
+    LocationName.pyramid_cave_pipe_3,
+    LocationName.pyramid_cave_pipe_4,
+    LocationName.pyramid_cave_omo_1,
+    LocationName.pyramid_cave_omo_2,
+    LocationName.pyramid_cave_omo_3,
+    LocationName.pyramid_cave_omo_4,
+    LocationName.pyramid_cave_beetle,
+    LocationName.pyramid_cave_animal_1,
+    LocationName.pyramid_cave_animal_2,
+    LocationName.pyramid_cave_animal_3,
+    LocationName.pyramid_cave_animal_4,
+    LocationName.pyramid_cave_animal_5,
+    LocationName.pyramid_cave_animal_6,
+    LocationName.pyramid_cave_animal_7,
+    LocationName.pyramid_cave_animal_8,
+    LocationName.pyramid_cave_animal_9,
+    LocationName.pyramid_cave_animal_10,
+    LocationName.pyramid_cave_animal_11,
+    LocationName.pyramid_cave_animal_12,
+    LocationName.pyramid_cave_animal_13,
+    LocationName.pyramid_cave_animal_14,
+    LocationName.pyramid_cave_animal_15,
+    LocationName.pyramid_cave_animal_16,
+    LocationName.pyramid_cave_animal_17,
+    LocationName.pyramid_cave_animal_18,
+    LocationName.pyramid_cave_animal_19,
+    LocationName.pyramid_cave_lifebox_1,
+    LocationName.pyramid_cave_lifebox_2,
+    LocationName.pyramid_cave_lifebox_3,
+    LocationName.pyramid_cave_lifebox_4,
+    LocationName.pyramid_cave_lifebox_5,
+    LocationName.pyramid_cave_lifebox_6,
+    LocationName.pyramid_cave_lifebox_7,
+    LocationName.pyramid_cave_itembox_1,
+    LocationName.pyramid_cave_itembox_2,
+    LocationName.pyramid_cave_itembox_3,
+    LocationName.pyramid_cave_itembox_4,
+    LocationName.pyramid_cave_itembox_5,
+    LocationName.pyramid_cave_itembox_6,
+    LocationName.pyramid_cave_itembox_7,
+    LocationName.pyramid_cave_itembox_8,
+    LocationName.pyramid_cave_itembox_9,
+    LocationName.pyramid_cave_itembox_10,
+    LocationName.pyramid_cave_itembox_11,
+    LocationName.pyramid_cave_itembox_12,
+    LocationName.pyramid_cave_itembox_13,
+    LocationName.pyramid_cave_itembox_14,
+    LocationName.pyramid_cave_itembox_15,
+    LocationName.pyramid_cave_big,
+    LocationName.pyramid_cave_upgrade,
+]
+
+crazy_gadget_region_locations = [
+    LocationName.crazy_gadget_1,
+    LocationName.crazy_gadget_2,
+    LocationName.crazy_gadget_3,
+    LocationName.crazy_gadget_4,
+    LocationName.crazy_gadget_5,
+    LocationName.crazy_gadget_chao_1,
+    LocationName.crazy_gadget_chao_2,
+    LocationName.crazy_gadget_chao_3,
+    LocationName.crazy_gadget_pipe_1,
+    LocationName.crazy_gadget_pipe_2,
+    LocationName.crazy_gadget_pipe_3,
+    LocationName.crazy_gadget_pipe_4,
+    LocationName.crazy_gadget_hidden_1,
+    LocationName.crazy_gadget_omo_1,
+    LocationName.crazy_gadget_omo_2,
+    LocationName.crazy_gadget_omo_3,
+    LocationName.crazy_gadget_omo_4,
+    LocationName.crazy_gadget_omo_5,
+    LocationName.crazy_gadget_omo_6,
+    LocationName.crazy_gadget_omo_7,
+    LocationName.crazy_gadget_omo_8,
+    LocationName.crazy_gadget_omo_9,
+    LocationName.crazy_gadget_omo_10,
+    LocationName.crazy_gadget_omo_11,
+    LocationName.crazy_gadget_omo_12,
+    LocationName.crazy_gadget_omo_13,
+    LocationName.crazy_gadget_beetle,
+    LocationName.crazy_gadget_animal_1,
+    LocationName.crazy_gadget_animal_2,
+    LocationName.crazy_gadget_animal_3,
+    LocationName.crazy_gadget_animal_4,
+    LocationName.crazy_gadget_animal_5,
+    LocationName.crazy_gadget_animal_6,
+    LocationName.crazy_gadget_animal_7,
+    LocationName.crazy_gadget_animal_8,
+    LocationName.crazy_gadget_animal_9,
+    LocationName.crazy_gadget_animal_10,
+    LocationName.crazy_gadget_animal_11,
+    LocationName.crazy_gadget_animal_12,
+    LocationName.crazy_gadget_animal_13,
+    LocationName.crazy_gadget_animal_14,
+    LocationName.crazy_gadget_animal_15,
+    LocationName.crazy_gadget_animal_16,
+    LocationName.crazy_gadget_lifebox_1,
+    LocationName.crazy_gadget_lifebox_2,
+    LocationName.crazy_gadget_lifebox_3,
+    LocationName.crazy_gadget_lifebox_4,
+    LocationName.crazy_gadget_itembox_1,
+    LocationName.crazy_gadget_itembox_2,
+    LocationName.crazy_gadget_itembox_3,
+    LocationName.crazy_gadget_itembox_4,
+    LocationName.crazy_gadget_itembox_5,
+    LocationName.crazy_gadget_itembox_6,
+    LocationName.crazy_gadget_itembox_7,
+    LocationName.crazy_gadget_itembox_8,
+    LocationName.crazy_gadget_itembox_9,
+    LocationName.crazy_gadget_itembox_10,
+    LocationName.crazy_gadget_itembox_11,
+    LocationName.crazy_gadget_itembox_12,
+    LocationName.crazy_gadget_itembox_13,
+    LocationName.crazy_gadget_itembox_14,
+    LocationName.crazy_gadget_big,
+    LocationName.crazy_gadget_upgrade,
+]
+
+final_rush_region_locations = [
+    LocationName.final_rush_1,
+    LocationName.final_rush_2,
+    LocationName.final_rush_3,
+    LocationName.final_rush_4,
+    LocationName.final_rush_5,
+    LocationName.final_rush_chao_1,
+    LocationName.final_rush_chao_2,
+    LocationName.final_rush_chao_3,
+    LocationName.final_rush_pipe_1,
+    LocationName.final_rush_pipe_2,
+    LocationName.final_rush_omo_1,
+    LocationName.final_rush_omo_2,
+    LocationName.final_rush_omo_3,
+    LocationName.final_rush_beetle,
+    LocationName.final_rush_animal_1,
+    LocationName.final_rush_animal_2,
+    LocationName.final_rush_animal_3,
+    LocationName.final_rush_animal_4,
+    LocationName.final_rush_animal_5,
+    LocationName.final_rush_animal_6,
+    LocationName.final_rush_animal_7,
+    LocationName.final_rush_animal_8,
+    LocationName.final_rush_animal_9,
+    LocationName.final_rush_animal_10,
+    LocationName.final_rush_animal_11,
+    LocationName.final_rush_animal_12,
+    LocationName.final_rush_animal_13,
+    LocationName.final_rush_animal_14,
+    LocationName.final_rush_animal_15,
+    LocationName.final_rush_animal_16,
+    LocationName.final_rush_lifebox_1,
+    LocationName.final_rush_lifebox_2,
+    LocationName.final_rush_lifebox_3,
+    LocationName.final_rush_lifebox_4,
+    LocationName.final_rush_lifebox_5,
+    LocationName.final_rush_lifebox_6,
+    LocationName.final_rush_lifebox_7,
+    LocationName.final_rush_lifebox_8,
+    LocationName.final_rush_lifebox_9,
+    LocationName.final_rush_lifebox_10,
+    LocationName.final_rush_lifebox_11,
+    LocationName.final_rush_lifebox_12,
+    LocationName.final_rush_lifebox_13,
+    LocationName.final_rush_itembox_1,
+    LocationName.final_rush_itembox_2,
+    LocationName.final_rush_itembox_3,
+    LocationName.final_rush_itembox_4,
+    LocationName.final_rush_itembox_5,
+    LocationName.final_rush_itembox_6,
+    LocationName.final_rush_itembox_7,
+    LocationName.final_rush_itembox_8,
+    LocationName.final_rush_itembox_9,
+    LocationName.final_rush_itembox_10,
+    LocationName.final_rush_itembox_11,
+    LocationName.final_rush_itembox_12,
+    LocationName.final_rush_itembox_13,
+    LocationName.final_rush_itembox_14,
+    LocationName.final_rush_itembox_15,
+    LocationName.final_rush_itembox_16,
+    LocationName.final_rush_itembox_17,
+    LocationName.final_rush_itembox_18,
+    LocationName.final_rush_itembox_19,
+    LocationName.final_rush_itembox_20,
+    LocationName.final_rush_itembox_21,
+    LocationName.final_rush_itembox_22,
+    LocationName.final_rush_itembox_23,
+    LocationName.final_rush_itembox_24,
+    LocationName.final_rush_itembox_25,
+    LocationName.final_rush_itembox_26,
+    LocationName.final_rush_itembox_27,
+    LocationName.final_rush_itembox_28,
+    LocationName.final_rush_itembox_29,
+    LocationName.final_rush_itembox_30,
+    LocationName.final_rush_itembox_31,
+    LocationName.final_rush_itembox_32,
+    LocationName.final_rush_itembox_33,
+    LocationName.final_rush_itembox_34,
+    LocationName.final_rush_itembox_35,
+    LocationName.final_rush_itembox_36,
+    LocationName.final_rush_itembox_37,
+    LocationName.final_rush_itembox_38,
+    LocationName.final_rush_itembox_39,
+    LocationName.final_rush_itembox_40,
+    LocationName.final_rush_big,
+    LocationName.final_rush_upgrade,
+]
+
+prison_lane_region_locations = [
+    LocationName.prison_lane_1,
+    LocationName.prison_lane_2,
+    LocationName.prison_lane_3,
+    LocationName.prison_lane_4,
+    LocationName.prison_lane_5,
+    LocationName.prison_lane_chao_1,
+    LocationName.prison_lane_chao_2,
+    LocationName.prison_lane_chao_3,
+    LocationName.prison_lane_pipe_1,
+    LocationName.prison_lane_pipe_2,
+    LocationName.prison_lane_pipe_3,
+    LocationName.prison_lane_hidden_1,
+    LocationName.prison_lane_hidden_2,
+    LocationName.prison_lane_hidden_3,
+    LocationName.prison_lane_omo_1,
+    LocationName.prison_lane_omo_2,
+    LocationName.prison_lane_omo_3,
+    LocationName.prison_lane_omo_4,
+    LocationName.prison_lane_omo_5,
+    LocationName.prison_lane_omo_6,
+    LocationName.prison_lane_omo_7,
+    LocationName.prison_lane_omo_8,
+    LocationName.prison_lane_omo_9,
+    LocationName.prison_lane_omo_10,
+    LocationName.prison_lane_beetle,
+    LocationName.prison_lane_animal_1,
+    LocationName.prison_lane_animal_2,
+    LocationName.prison_lane_animal_3,
+    LocationName.prison_lane_animal_4,
+    LocationName.prison_lane_animal_5,
+    LocationName.prison_lane_animal_6,
+    LocationName.prison_lane_animal_7,
+    LocationName.prison_lane_animal_8,
+    LocationName.prison_lane_animal_9,
+    LocationName.prison_lane_animal_10,
+    LocationName.prison_lane_animal_11,
+    LocationName.prison_lane_animal_12,
+    LocationName.prison_lane_animal_13,
+    LocationName.prison_lane_animal_14,
+    LocationName.prison_lane_animal_15,
+    LocationName.prison_lane_lifebox_1,
+    LocationName.prison_lane_lifebox_2,
+    LocationName.prison_lane_itembox_1,
+    LocationName.prison_lane_itembox_2,
+    LocationName.prison_lane_itembox_3,
+    LocationName.prison_lane_itembox_4,
+    LocationName.prison_lane_itembox_5,
+    LocationName.prison_lane_itembox_6,
+    LocationName.prison_lane_big,
+    LocationName.prison_lane_upgrade,
+]
+
+mission_street_region_locations = [
+    LocationName.mission_street_1,
+    LocationName.mission_street_2,
+    LocationName.mission_street_3,
+    LocationName.mission_street_4,
+    LocationName.mission_street_5,
+    LocationName.mission_street_chao_1,
+    LocationName.mission_street_chao_2,
+    LocationName.mission_street_chao_3,
+    LocationName.mission_street_pipe_1,
+    LocationName.mission_street_pipe_2,
+    LocationName.mission_street_pipe_3,
+    LocationName.mission_street_hidden_1,
+    LocationName.mission_street_hidden_2,
+    LocationName.mission_street_hidden_3,
+    LocationName.mission_street_hidden_4,
+    LocationName.mission_street_omo_1,
+    LocationName.mission_street_omo_2,
+    LocationName.mission_street_omo_3,
+    LocationName.mission_street_omo_4,
+    LocationName.mission_street_omo_5,
+    LocationName.mission_street_omo_6,
+    LocationName.mission_street_omo_7,
+    LocationName.mission_street_omo_8,
+    LocationName.mission_street_beetle,
+    LocationName.mission_street_animal_1,
+    LocationName.mission_street_animal_2,
+    LocationName.mission_street_animal_3,
+    LocationName.mission_street_animal_4,
+    LocationName.mission_street_animal_5,
+    LocationName.mission_street_animal_6,
+    LocationName.mission_street_animal_7,
+    LocationName.mission_street_animal_8,
+    LocationName.mission_street_animal_9,
+    LocationName.mission_street_animal_10,
+    LocationName.mission_street_animal_11,
+    LocationName.mission_street_animal_12,
+    LocationName.mission_street_animal_13,
+    LocationName.mission_street_animal_14,
+    LocationName.mission_street_animal_15,
+    LocationName.mission_street_animal_16,
+    LocationName.mission_street_lifebox_1,
+    LocationName.mission_street_lifebox_2,
+    LocationName.mission_street_itembox_1,
+    LocationName.mission_street_itembox_2,
+    LocationName.mission_street_itembox_3,
+    LocationName.mission_street_itembox_4,
+    LocationName.mission_street_itembox_5,
+    LocationName.mission_street_itembox_6,
+    LocationName.mission_street_big,
+    LocationName.mission_street_upgrade,
+]
+
+route_101_region_locations = [
+    LocationName.route_101_1,
+    LocationName.route_101_2,
+    LocationName.route_101_3,
+    LocationName.route_101_4,
+    LocationName.route_101_5,
+    LocationName.route_101_itembox_1,
+    LocationName.route_101_itembox_2,
+    LocationName.route_101_itembox_3,
+    LocationName.route_101_itembox_4,
+    LocationName.route_101_itembox_5,
+]
+
+hidden_base_region_locations = [
+    LocationName.hidden_base_1,
+    LocationName.hidden_base_2,
+    LocationName.hidden_base_3,
+    LocationName.hidden_base_4,
+    LocationName.hidden_base_5,
+    LocationName.hidden_base_chao_1,
+    LocationName.hidden_base_chao_2,
+    LocationName.hidden_base_pipe_1,
+    LocationName.hidden_base_pipe_2,
+    LocationName.hidden_base_pipe_3,
+    LocationName.hidden_base_pipe_4,
+    LocationName.hidden_base_pipe_5,
+    LocationName.hidden_base_omo_1,
+    LocationName.hidden_base_omo_2,
+    LocationName.hidden_base_omo_3,
+    LocationName.hidden_base_omo_4,
+    LocationName.hidden_base_beetle,
+    LocationName.hidden_base_animal_1,
+    LocationName.hidden_base_animal_2,
+    LocationName.hidden_base_animal_3,
+    LocationName.hidden_base_animal_4,
+    LocationName.hidden_base_animal_5,
+    LocationName.hidden_base_animal_6,
+    LocationName.hidden_base_animal_7,
+    LocationName.hidden_base_animal_8,
+    LocationName.hidden_base_animal_9,
+    LocationName.hidden_base_animal_10,
+    LocationName.hidden_base_animal_11,
+    LocationName.hidden_base_animal_12,
+    LocationName.hidden_base_animal_13,
+    LocationName.hidden_base_animal_14,
+    LocationName.hidden_base_animal_15,
+    LocationName.hidden_base_lifebox_1,
+    LocationName.hidden_base_itembox_1,
+    LocationName.hidden_base_itembox_2,
+    LocationName.hidden_base_itembox_3,
+    LocationName.hidden_base_itembox_4,
+    LocationName.hidden_base_itembox_5,
+    LocationName.hidden_base_big,
+    LocationName.hidden_base_upgrade,
+]
+
+eternal_engine_region_locations = [
+    LocationName.eternal_engine_1,
+    LocationName.eternal_engine_2,
+    LocationName.eternal_engine_3,
+    LocationName.eternal_engine_4,
+    LocationName.eternal_engine_5,
+    LocationName.eternal_engine_chao_1,
+    LocationName.eternal_engine_chao_2,
+    LocationName.eternal_engine_chao_3,
+    LocationName.eternal_engine_pipe_1,
+    LocationName.eternal_engine_pipe_2,
+    LocationName.eternal_engine_pipe_3,
+    LocationName.eternal_engine_pipe_4,
+    LocationName.eternal_engine_pipe_5,
+    LocationName.eternal_engine_omo_1,
+    LocationName.eternal_engine_omo_2,
+    LocationName.eternal_engine_omo_3,
+    LocationName.eternal_engine_omo_4,
+    LocationName.eternal_engine_omo_5,
+    LocationName.eternal_engine_omo_6,
+    LocationName.eternal_engine_omo_7,
+    LocationName.eternal_engine_omo_8,
+    LocationName.eternal_engine_omo_9,
+    LocationName.eternal_engine_omo_10,
+    LocationName.eternal_engine_omo_11,
+    LocationName.eternal_engine_omo_12,
+    LocationName.eternal_engine_beetle,
+    LocationName.eternal_engine_animal_1,
+    LocationName.eternal_engine_animal_2,
+    LocationName.eternal_engine_animal_3,
+    LocationName.eternal_engine_animal_4,
+    LocationName.eternal_engine_animal_5,
+    LocationName.eternal_engine_animal_6,
+    LocationName.eternal_engine_animal_7,
+    LocationName.eternal_engine_animal_8,
+    LocationName.eternal_engine_animal_9,
+    LocationName.eternal_engine_animal_10,
+    LocationName.eternal_engine_animal_11,
+    LocationName.eternal_engine_animal_12,
+    LocationName.eternal_engine_animal_13,
+    LocationName.eternal_engine_animal_14,
+    LocationName.eternal_engine_animal_15,
+    LocationName.eternal_engine_lifebox_1,
+    LocationName.eternal_engine_lifebox_2,
+    LocationName.eternal_engine_itembox_1,
+    LocationName.eternal_engine_itembox_2,
+    LocationName.eternal_engine_itembox_3,
+    LocationName.eternal_engine_itembox_4,
+    LocationName.eternal_engine_itembox_5,
+    LocationName.eternal_engine_itembox_6,
+    LocationName.eternal_engine_itembox_7,
+    LocationName.eternal_engine_itembox_8,
+    LocationName.eternal_engine_itembox_9,
+    LocationName.eternal_engine_itembox_10,
+    LocationName.eternal_engine_itembox_11,
+    LocationName.eternal_engine_itembox_12,
+    LocationName.eternal_engine_itembox_13,
+    LocationName.eternal_engine_itembox_14,
+    LocationName.eternal_engine_big,
+    LocationName.eternal_engine_upgrade,
+]
+
+wild_canyon_region_locations = [
+    LocationName.wild_canyon_1,
+    LocationName.wild_canyon_2,
+    LocationName.wild_canyon_3,
+    LocationName.wild_canyon_4,
+    LocationName.wild_canyon_5,
+    LocationName.wild_canyon_chao_1,
+    LocationName.wild_canyon_chao_2,
+    LocationName.wild_canyon_chao_3,
+    LocationName.wild_canyon_pipe_1,
+    LocationName.wild_canyon_pipe_2,
+    LocationName.wild_canyon_pipe_3,
+    LocationName.wild_canyon_omo_1,
+    LocationName.wild_canyon_omo_2,
+    LocationName.wild_canyon_omo_3,
+    LocationName.wild_canyon_omo_4,
+    LocationName.wild_canyon_omo_5,
+    LocationName.wild_canyon_omo_6,
+    LocationName.wild_canyon_omo_7,
+    LocationName.wild_canyon_omo_8,
+    LocationName.wild_canyon_omo_9,
+    LocationName.wild_canyon_omo_10,
+    LocationName.wild_canyon_beetle,
+    LocationName.wild_canyon_animal_1,
+    LocationName.wild_canyon_animal_2,
+    LocationName.wild_canyon_animal_3,
+    LocationName.wild_canyon_animal_4,
+    LocationName.wild_canyon_animal_5,
+    LocationName.wild_canyon_animal_6,
+    LocationName.wild_canyon_animal_7,
+    LocationName.wild_canyon_animal_8,
+    LocationName.wild_canyon_animal_9,
+    LocationName.wild_canyon_animal_10,
+    LocationName.wild_canyon_lifebox_1,
+    LocationName.wild_canyon_lifebox_2,
+    LocationName.wild_canyon_itembox_1,
+    LocationName.wild_canyon_itembox_2,
+    LocationName.wild_canyon_itembox_3,
+    LocationName.wild_canyon_itembox_4,
+    LocationName.wild_canyon_itembox_5,
+    LocationName.wild_canyon_itembox_6,
+    LocationName.wild_canyon_itembox_7,
+    LocationName.wild_canyon_itembox_8,
+    LocationName.wild_canyon_upgrade,
+]
+
+pumpkin_hill_region_locations = [
+    LocationName.pumpkin_hill_1,
+    LocationName.pumpkin_hill_2,
+    LocationName.pumpkin_hill_3,
+    LocationName.pumpkin_hill_4,
+    LocationName.pumpkin_hill_5,
+    LocationName.pumpkin_hill_chao_1,
+    LocationName.pumpkin_hill_chao_2,
+    LocationName.pumpkin_hill_chao_3,
+    LocationName.pumpkin_hill_pipe_1,
+    LocationName.pumpkin_hill_hidden_1,
+    LocationName.pumpkin_hill_omo_1,
+    LocationName.pumpkin_hill_omo_2,
+    LocationName.pumpkin_hill_omo_3,
+    LocationName.pumpkin_hill_omo_4,
+    LocationName.pumpkin_hill_omo_5,
+    LocationName.pumpkin_hill_omo_6,
+    LocationName.pumpkin_hill_omo_7,
+    LocationName.pumpkin_hill_omo_8,
+    LocationName.pumpkin_hill_omo_9,
+    LocationName.pumpkin_hill_omo_10,
+    LocationName.pumpkin_hill_omo_11,
+    LocationName.pumpkin_hill_animal_1,
+    LocationName.pumpkin_hill_animal_2,
+    LocationName.pumpkin_hill_animal_3,
+    LocationName.pumpkin_hill_animal_4,
+    LocationName.pumpkin_hill_animal_5,
+    LocationName.pumpkin_hill_animal_6,
+    LocationName.pumpkin_hill_animal_7,
+    LocationName.pumpkin_hill_animal_8,
+    LocationName.pumpkin_hill_animal_9,
+    LocationName.pumpkin_hill_animal_10,
+    LocationName.pumpkin_hill_animal_11,
+    LocationName.pumpkin_hill_lifebox_1,
+    LocationName.pumpkin_hill_itembox_1,
+    LocationName.pumpkin_hill_itembox_2,
+    LocationName.pumpkin_hill_itembox_3,
+    LocationName.pumpkin_hill_itembox_4,
+    LocationName.pumpkin_hill_itembox_5,
+    LocationName.pumpkin_hill_itembox_6,
+    LocationName.pumpkin_hill_itembox_7,
+    LocationName.pumpkin_hill_itembox_8,
+    LocationName.pumpkin_hill_itembox_9,
+    LocationName.pumpkin_hill_itembox_10,
+    LocationName.pumpkin_hill_big,
+    LocationName.pumpkin_hill_upgrade,
+]
+
+aquatic_mine_region_locations = [
+    LocationName.aquatic_mine_1,
+    LocationName.aquatic_mine_2,
+    LocationName.aquatic_mine_3,
+    LocationName.aquatic_mine_4,
+    LocationName.aquatic_mine_5,
+    LocationName.aquatic_mine_chao_1,
+    LocationName.aquatic_mine_chao_2,
+    LocationName.aquatic_mine_chao_3,
+    LocationName.aquatic_mine_pipe_1,
+    LocationName.aquatic_mine_pipe_2,
+    LocationName.aquatic_mine_pipe_3,
+    LocationName.aquatic_mine_omo_1,
+    LocationName.aquatic_mine_omo_2,
+    LocationName.aquatic_mine_omo_3,
+    LocationName.aquatic_mine_omo_4,
+    LocationName.aquatic_mine_omo_5,
+    LocationName.aquatic_mine_omo_6,
+    LocationName.aquatic_mine_omo_7,
+    LocationName.aquatic_mine_beetle,
+    LocationName.aquatic_mine_animal_1,
+    LocationName.aquatic_mine_animal_2,
+    LocationName.aquatic_mine_animal_3,
+    LocationName.aquatic_mine_animal_4,
+    LocationName.aquatic_mine_animal_5,
+    LocationName.aquatic_mine_animal_6,
+    LocationName.aquatic_mine_animal_7,
+    LocationName.aquatic_mine_animal_8,
+    LocationName.aquatic_mine_animal_9,
+    LocationName.aquatic_mine_animal_10,
+    LocationName.aquatic_mine_lifebox_1,
+    LocationName.aquatic_mine_itembox_1,
+    LocationName.aquatic_mine_itembox_2,
+    LocationName.aquatic_mine_itembox_3,
+    LocationName.aquatic_mine_itembox_4,
+    LocationName.aquatic_mine_itembox_5,
+    LocationName.aquatic_mine_itembox_6,
+    LocationName.aquatic_mine_big,
+    LocationName.aquatic_mine_upgrade,
+]
+
+death_chamber_region_locations = [
+    LocationName.death_chamber_1,
+    LocationName.death_chamber_2,
+    LocationName.death_chamber_3,
+    LocationName.death_chamber_4,
+    LocationName.death_chamber_5,
+    LocationName.death_chamber_chao_1,
+    LocationName.death_chamber_chao_2,
+    LocationName.death_chamber_chao_3,
+    LocationName.death_chamber_pipe_1,
+    LocationName.death_chamber_pipe_2,
+    LocationName.death_chamber_pipe_3,
+    LocationName.death_chamber_hidden_1,
+    LocationName.death_chamber_hidden_2,
+    LocationName.death_chamber_omo_1,
+    LocationName.death_chamber_omo_2,
+    LocationName.death_chamber_omo_3,
+    LocationName.death_chamber_omo_4,
+    LocationName.death_chamber_omo_5,
+    LocationName.death_chamber_omo_6,
+    LocationName.death_chamber_omo_7,
+    LocationName.death_chamber_omo_8,
+    LocationName.death_chamber_omo_9,
+    LocationName.death_chamber_beetle,
+    LocationName.death_chamber_animal_1,
+    LocationName.death_chamber_animal_2,
+    LocationName.death_chamber_animal_3,
+    LocationName.death_chamber_animal_4,
+    LocationName.death_chamber_animal_5,
+    LocationName.death_chamber_animal_6,
+    LocationName.death_chamber_animal_7,
+    LocationName.death_chamber_animal_8,
+    LocationName.death_chamber_animal_9,
+    LocationName.death_chamber_animal_10,
+    LocationName.death_chamber_lifebox_1,
+    LocationName.death_chamber_itembox_1,
+    LocationName.death_chamber_itembox_2,
+    LocationName.death_chamber_itembox_3,
+    LocationName.death_chamber_itembox_4,
+    LocationName.death_chamber_itembox_5,
+    LocationName.death_chamber_itembox_6,
+    LocationName.death_chamber_itembox_7,
+    LocationName.death_chamber_itembox_8,
+    LocationName.death_chamber_itembox_9,
+    LocationName.death_chamber_itembox_10,
+    LocationName.death_chamber_itembox_11,
+    LocationName.death_chamber_big,
+    LocationName.death_chamber_upgrade,
+]
+
+meteor_herd_region_locations = [
+    LocationName.meteor_herd_1,
+    LocationName.meteor_herd_2,
+    LocationName.meteor_herd_3,
+    LocationName.meteor_herd_4,
+    LocationName.meteor_herd_5,
+    LocationName.meteor_herd_chao_1,
+    LocationName.meteor_herd_chao_2,
+    LocationName.meteor_herd_chao_3,
+    LocationName.meteor_herd_pipe_1,
+    LocationName.meteor_herd_pipe_2,
+    LocationName.meteor_herd_pipe_3,
+    LocationName.meteor_herd_omo_1,
+    LocationName.meteor_herd_omo_2,
+    LocationName.meteor_herd_omo_3,
+    LocationName.meteor_herd_beetle,
+    LocationName.meteor_herd_animal_1,
+    LocationName.meteor_herd_animal_2,
+    LocationName.meteor_herd_animal_3,
+    LocationName.meteor_herd_animal_4,
+    LocationName.meteor_herd_animal_5,
+    LocationName.meteor_herd_animal_6,
+    LocationName.meteor_herd_animal_7,
+    LocationName.meteor_herd_animal_8,
+    LocationName.meteor_herd_animal_9,
+    LocationName.meteor_herd_animal_10,
+    LocationName.meteor_herd_animal_11,
+    LocationName.meteor_herd_lifebox_1,
+    LocationName.meteor_herd_lifebox_2,
+    LocationName.meteor_herd_lifebox_3,
+    LocationName.meteor_herd_lifebox_4,
+    LocationName.meteor_herd_lifebox_5,
+    LocationName.meteor_herd_itembox_1,
+    LocationName.meteor_herd_itembox_2,
+    LocationName.meteor_herd_itembox_3,
+    LocationName.meteor_herd_itembox_4,
+    LocationName.meteor_herd_itembox_5,
+    LocationName.meteor_herd_itembox_6,
+    LocationName.meteor_herd_itembox_7,
+    LocationName.meteor_herd_itembox_8,
+    LocationName.meteor_herd_itembox_9,
+    LocationName.meteor_herd_itembox_10,
+    LocationName.meteor_herd_itembox_11,
+    LocationName.meteor_herd_itembox_12,
+    LocationName.meteor_herd_big,
+    LocationName.meteor_herd_upgrade,
+]
+
+radical_highway_region_locations = [
+    LocationName.radical_highway_1,
+    LocationName.radical_highway_2,
+    LocationName.radical_highway_3,
+    LocationName.radical_highway_4,
+    LocationName.radical_highway_5,
+    LocationName.radical_highway_chao_1,
+    LocationName.radical_highway_chao_2,
+    LocationName.radical_highway_chao_3,
+    LocationName.radical_highway_pipe_1,
+    LocationName.radical_highway_pipe_2,
+    LocationName.radical_highway_pipe_3,
+    LocationName.radical_highway_hidden_1,
+    LocationName.radical_highway_hidden_2,
+    LocationName.radical_highway_hidden_3,
+    LocationName.radical_highway_omo_1,
+    LocationName.radical_highway_omo_2,
+    LocationName.radical_highway_omo_3,
+    LocationName.radical_highway_omo_4,
+    LocationName.radical_highway_omo_5,
+    LocationName.radical_highway_omo_6,
+    LocationName.radical_highway_omo_7,
+    LocationName.radical_highway_omo_8,
+    LocationName.radical_highway_beetle,
+    LocationName.radical_highway_animal_1,
+    LocationName.radical_highway_animal_2,
+    LocationName.radical_highway_animal_3,
+    LocationName.radical_highway_animal_4,
+    LocationName.radical_highway_animal_5,
+    LocationName.radical_highway_animal_6,
+    LocationName.radical_highway_animal_7,
+    LocationName.radical_highway_animal_8,
+    LocationName.radical_highway_animal_9,
+    LocationName.radical_highway_animal_10,
+    LocationName.radical_highway_animal_11,
+    LocationName.radical_highway_animal_12,
+    LocationName.radical_highway_animal_13,
+    LocationName.radical_highway_animal_14,
+    LocationName.radical_highway_animal_15,
+    LocationName.radical_highway_animal_16,
+    LocationName.radical_highway_animal_17,
+    LocationName.radical_highway_animal_18,
+    LocationName.radical_highway_animal_19,
+    LocationName.radical_highway_animal_20,
+    LocationName.radical_highway_lifebox_1,
+    LocationName.radical_highway_lifebox_2,
+    LocationName.radical_highway_itembox_1,
+    LocationName.radical_highway_itembox_2,
+    LocationName.radical_highway_itembox_3,
+    LocationName.radical_highway_itembox_4,
+    LocationName.radical_highway_itembox_5,
+    LocationName.radical_highway_itembox_6,
+    LocationName.radical_highway_itembox_7,
+    LocationName.radical_highway_big,
+    LocationName.radical_highway_upgrade,
+]
+
+white_jungle_region_locations = [
+    LocationName.white_jungle_1,
+    LocationName.white_jungle_2,
+    LocationName.white_jungle_3,
+    LocationName.white_jungle_4,
+    LocationName.white_jungle_5,
+    LocationName.white_jungle_chao_1,
+    LocationName.white_jungle_chao_2,
+    LocationName.white_jungle_chao_3,
+    LocationName.white_jungle_pipe_1,
+    LocationName.white_jungle_pipe_2,
+    LocationName.white_jungle_pipe_3,
+    LocationName.white_jungle_pipe_4,
+    LocationName.white_jungle_hidden_1,
+    LocationName.white_jungle_hidden_2,
+    LocationName.white_jungle_hidden_3,
+    LocationName.white_jungle_omo_1,
+    LocationName.white_jungle_omo_2,
+    LocationName.white_jungle_omo_3,
+    LocationName.white_jungle_omo_4,
+    LocationName.white_jungle_omo_5,
+    LocationName.white_jungle_beetle,
+    LocationName.white_jungle_animal_1,
+    LocationName.white_jungle_animal_2,
+    LocationName.white_jungle_animal_3,
+    LocationName.white_jungle_animal_4,
+    LocationName.white_jungle_animal_5,
+    LocationName.white_jungle_animal_6,
+    LocationName.white_jungle_animal_7,
+    LocationName.white_jungle_animal_8,
+    LocationName.white_jungle_animal_9,
+    LocationName.white_jungle_animal_10,
+    LocationName.white_jungle_animal_11,
+    LocationName.white_jungle_animal_12,
+    LocationName.white_jungle_animal_13,
+    LocationName.white_jungle_animal_14,
+    LocationName.white_jungle_animal_15,
+    LocationName.white_jungle_animal_16,
+    LocationName.white_jungle_lifebox_1,
+    LocationName.white_jungle_lifebox_2,
+    LocationName.white_jungle_itembox_1,
+    LocationName.white_jungle_itembox_2,
+    LocationName.white_jungle_itembox_3,
+    LocationName.white_jungle_itembox_4,
+    LocationName.white_jungle_itembox_5,
+    LocationName.white_jungle_itembox_6,
+    LocationName.white_jungle_itembox_7,
+    LocationName.white_jungle_itembox_8,
+    LocationName.white_jungle_big_1,
+    LocationName.white_jungle_big_2,
+    LocationName.white_jungle_upgrade,
+]
+
+sky_rail_region_locations = [
+    LocationName.sky_rail_1,
+    LocationName.sky_rail_2,
+    LocationName.sky_rail_3,
+    LocationName.sky_rail_4,
+    LocationName.sky_rail_5,
+    LocationName.sky_rail_chao_1,
+    LocationName.sky_rail_chao_2,
+    LocationName.sky_rail_chao_3,
+    LocationName.sky_rail_pipe_1,
+    LocationName.sky_rail_pipe_2,
+    LocationName.sky_rail_pipe_3,
+    LocationName.sky_rail_pipe_4,
+    LocationName.sky_rail_pipe_5,
+    LocationName.sky_rail_pipe_6,
+    LocationName.sky_rail_beetle,
+    LocationName.sky_rail_animal_1,
+    LocationName.sky_rail_animal_2,
+    LocationName.sky_rail_animal_3,
+    LocationName.sky_rail_animal_4,
+    LocationName.sky_rail_animal_5,
+    LocationName.sky_rail_animal_6,
+    LocationName.sky_rail_animal_7,
+    LocationName.sky_rail_animal_8,
+    LocationName.sky_rail_animal_9,
+    LocationName.sky_rail_animal_10,
+    LocationName.sky_rail_animal_11,
+    LocationName.sky_rail_animal_12,
+    LocationName.sky_rail_animal_13,
+    LocationName.sky_rail_animal_14,
+    LocationName.sky_rail_animal_15,
+    LocationName.sky_rail_animal_16,
+    LocationName.sky_rail_animal_17,
+    LocationName.sky_rail_animal_18,
+    LocationName.sky_rail_animal_19,
+    LocationName.sky_rail_animal_20,
+    LocationName.sky_rail_lifebox_1,
+    LocationName.sky_rail_lifebox_2,
+    LocationName.sky_rail_lifebox_3,
+    LocationName.sky_rail_lifebox_4,
+    LocationName.sky_rail_lifebox_5,
+    LocationName.sky_rail_lifebox_6,
+    LocationName.sky_rail_lifebox_7,
+    LocationName.sky_rail_lifebox_8,
+    LocationName.sky_rail_lifebox_9,
+    LocationName.sky_rail_itembox_1,
+    LocationName.sky_rail_itembox_2,
+    LocationName.sky_rail_itembox_3,
+    LocationName.sky_rail_itembox_4,
+    LocationName.sky_rail_itembox_5,
+    LocationName.sky_rail_itembox_6,
+    LocationName.sky_rail_itembox_7,
+    LocationName.sky_rail_itembox_8,
+    LocationName.sky_rail_itembox_9,
+    LocationName.sky_rail_itembox_10,
+    LocationName.sky_rail_itembox_11,
+    LocationName.sky_rail_itembox_12,
+    LocationName.sky_rail_itembox_13,
+    LocationName.sky_rail_itembox_14,
+    LocationName.sky_rail_itembox_15,
+    LocationName.sky_rail_itembox_16,
+    LocationName.sky_rail_itembox_17,
+    LocationName.sky_rail_itembox_18,
+    LocationName.sky_rail_itembox_19,
+    LocationName.sky_rail_itembox_20,
+    LocationName.sky_rail_itembox_21,
+    LocationName.sky_rail_itembox_22,
+    LocationName.sky_rail_itembox_23,
+    LocationName.sky_rail_big,
+    LocationName.sky_rail_upgrade,
+]
+
+final_chase_region_locations = [
+    LocationName.final_chase_1,
+    LocationName.final_chase_2,
+    LocationName.final_chase_3,
+    LocationName.final_chase_4,
+    LocationName.final_chase_5,
+    LocationName.final_chase_chao_1,
+    LocationName.final_chase_chao_2,
+    LocationName.final_chase_chao_3,
+    LocationName.final_chase_pipe_1,
+    LocationName.final_chase_pipe_2,
+    LocationName.final_chase_pipe_3,
+    LocationName.final_chase_omo_1,
+    LocationName.final_chase_beetle,
+    LocationName.final_chase_animal_1,
+    LocationName.final_chase_animal_2,
+    LocationName.final_chase_animal_3,
+    LocationName.final_chase_animal_4,
+    LocationName.final_chase_animal_5,
+    LocationName.final_chase_animal_6,
+    LocationName.final_chase_animal_7,
+    LocationName.final_chase_animal_8,
+    LocationName.final_chase_animal_9,
+    LocationName.final_chase_animal_10,
+    LocationName.final_chase_animal_11,
+    LocationName.final_chase_animal_12,
+    LocationName.final_chase_animal_13,
+    LocationName.final_chase_animal_14,
+    LocationName.final_chase_animal_15,
+    LocationName.final_chase_animal_16,
+    LocationName.final_chase_animal_17,
+    LocationName.final_chase_lifebox_1,
+    LocationName.final_chase_lifebox_2,
+    LocationName.final_chase_lifebox_3,
+    LocationName.final_chase_lifebox_4,
+    LocationName.final_chase_lifebox_5,
+    LocationName.final_chase_lifebox_6,
+    LocationName.final_chase_lifebox_7,
+    LocationName.final_chase_lifebox_8,
+    LocationName.final_chase_lifebox_9,
+    LocationName.final_chase_itembox_1,
+    LocationName.final_chase_itembox_2,
+    LocationName.final_chase_itembox_3,
+    LocationName.final_chase_itembox_4,
+    LocationName.final_chase_itembox_5,
+    LocationName.final_chase_itembox_6,
+    LocationName.final_chase_itembox_7,
+    LocationName.final_chase_itembox_8,
+    LocationName.final_chase_itembox_9,
+    LocationName.final_chase_itembox_10,
+    LocationName.final_chase_itembox_11,
+    LocationName.final_chase_itembox_12,
+    LocationName.final_chase_itembox_13,
+    LocationName.final_chase_itembox_14,
+    LocationName.final_chase_itembox_15,
+    LocationName.final_chase_itembox_16,
+    LocationName.final_chase_itembox_17,
+    LocationName.final_chase_itembox_18,
+    LocationName.final_chase_itembox_19,
+    LocationName.final_chase_itembox_20,
+    LocationName.final_chase_itembox_21,
+    LocationName.final_chase_itembox_22,
+    LocationName.final_chase_itembox_23,
+    LocationName.final_chase_itembox_24,
+    LocationName.final_chase_itembox_25,
+    LocationName.final_chase_itembox_26,
+    LocationName.final_chase_itembox_27,
+    LocationName.final_chase_itembox_28,
+    LocationName.final_chase_itembox_29,
+    LocationName.final_chase_itembox_30,
+    LocationName.final_chase_itembox_31,
+    LocationName.final_chase_itembox_32,
+    LocationName.final_chase_itembox_33,
+    LocationName.final_chase_itembox_34,
+    LocationName.final_chase_itembox_35,
+    LocationName.final_chase_big,
+    LocationName.final_chase_upgrade,
+]
+
+iron_gate_region_locations = [
+    LocationName.iron_gate_1,
+    LocationName.iron_gate_2,
+    LocationName.iron_gate_3,
+    LocationName.iron_gate_4,
+    LocationName.iron_gate_5,
+    LocationName.iron_gate_chao_1,
+    LocationName.iron_gate_chao_2,
+    LocationName.iron_gate_chao_3,
+    LocationName.iron_gate_pipe_1,
+    LocationName.iron_gate_pipe_2,
+    LocationName.iron_gate_pipe_3,
+    LocationName.iron_gate_pipe_4,
+    LocationName.iron_gate_pipe_5,
+    LocationName.iron_gate_omo_1,
+    LocationName.iron_gate_omo_2,
+    LocationName.iron_gate_omo_3,
+    LocationName.iron_gate_omo_4,
+    LocationName.iron_gate_omo_5,
+    LocationName.iron_gate_omo_6,
+    LocationName.iron_gate_beetle,
+    LocationName.iron_gate_animal_1,
+    LocationName.iron_gate_animal_2,
+    LocationName.iron_gate_animal_3,
+    LocationName.iron_gate_animal_4,
+    LocationName.iron_gate_animal_5,
+    LocationName.iron_gate_animal_6,
+    LocationName.iron_gate_animal_7,
+    LocationName.iron_gate_animal_8,
+    LocationName.iron_gate_animal_9,
+    LocationName.iron_gate_animal_10,
+    LocationName.iron_gate_animal_11,
+    LocationName.iron_gate_animal_12,
+    LocationName.iron_gate_animal_13,
+    LocationName.iron_gate_animal_14,
+    LocationName.iron_gate_animal_15,
+    LocationName.iron_gate_lifebox_1,
+    LocationName.iron_gate_lifebox_2,
+    LocationName.iron_gate_lifebox_3,
+    LocationName.iron_gate_lifebox_4,
+    LocationName.iron_gate_itembox_1,
+    LocationName.iron_gate_itembox_2,
+    LocationName.iron_gate_itembox_3,
+    LocationName.iron_gate_itembox_4,
+    LocationName.iron_gate_itembox_5,
+    LocationName.iron_gate_itembox_6,
+    LocationName.iron_gate_itembox_7,
+    LocationName.iron_gate_itembox_8,
+    LocationName.iron_gate_itembox_9,
+    LocationName.iron_gate_itembox_10,
+    LocationName.iron_gate_itembox_11,
+    LocationName.iron_gate_itembox_12,
+    LocationName.iron_gate_itembox_13,
+    LocationName.iron_gate_itembox_14,
+    LocationName.iron_gate_itembox_15,
+    LocationName.iron_gate_itembox_16,
+    LocationName.iron_gate_big,
+    LocationName.iron_gate_upgrade,
+]
+
+sand_ocean_region_locations = [
+    LocationName.sand_ocean_1,
+    LocationName.sand_ocean_2,
+    LocationName.sand_ocean_3,
+    LocationName.sand_ocean_4,
+    LocationName.sand_ocean_5,
+    LocationName.sand_ocean_chao_1,
+    LocationName.sand_ocean_chao_2,
+    LocationName.sand_ocean_chao_3,
+    LocationName.sand_ocean_pipe_1,
+    LocationName.sand_ocean_pipe_2,
+    LocationName.sand_ocean_pipe_3,
+    LocationName.sand_ocean_pipe_4,
+    LocationName.sand_ocean_pipe_5,
+    LocationName.sand_ocean_omo_1,
+    LocationName.sand_ocean_omo_2,
+    LocationName.sand_ocean_beetle,
+    LocationName.sand_ocean_animal_1,
+    LocationName.sand_ocean_animal_2,
+    LocationName.sand_ocean_animal_3,
+    LocationName.sand_ocean_animal_4,
+    LocationName.sand_ocean_animal_5,
+    LocationName.sand_ocean_animal_6,
+    LocationName.sand_ocean_animal_7,
+    LocationName.sand_ocean_animal_8,
+    LocationName.sand_ocean_animal_9,
+    LocationName.sand_ocean_animal_10,
+    LocationName.sand_ocean_animal_11,
+    LocationName.sand_ocean_animal_12,
+    LocationName.sand_ocean_animal_13,
+    LocationName.sand_ocean_animal_14,
+    LocationName.sand_ocean_animal_15,
+    LocationName.sand_ocean_lifebox_1,
+    LocationName.sand_ocean_lifebox_2,
+    LocationName.sand_ocean_lifebox_3,
+    LocationName.sand_ocean_itembox_1,
+    LocationName.sand_ocean_itembox_2,
+    LocationName.sand_ocean_itembox_3,
+    LocationName.sand_ocean_itembox_4,
+    LocationName.sand_ocean_itembox_5,
+    LocationName.sand_ocean_itembox_6,
+    LocationName.sand_ocean_itembox_7,
+    LocationName.sand_ocean_itembox_8,
+    LocationName.sand_ocean_itembox_9,
+    LocationName.sand_ocean_itembox_10,
+    LocationName.sand_ocean_big,
+    LocationName.sand_ocean_upgrade,
+]
+
+lost_colony_region_locations = [
+    LocationName.lost_colony_1,
+    LocationName.lost_colony_2,
+    LocationName.lost_colony_3,
+    LocationName.lost_colony_4,
+    LocationName.lost_colony_5,
+    LocationName.lost_colony_chao_1,
+    LocationName.lost_colony_chao_2,
+    LocationName.lost_colony_chao_3,
+    LocationName.lost_colony_pipe_1,
+    LocationName.lost_colony_pipe_2,
+    LocationName.lost_colony_hidden_1,
+    LocationName.lost_colony_omo_1,
+    LocationName.lost_colony_omo_2,
+    LocationName.lost_colony_omo_3,
+    LocationName.lost_colony_omo_4,
+    LocationName.lost_colony_omo_5,
+    LocationName.lost_colony_omo_6,
+    LocationName.lost_colony_omo_7,
+    LocationName.lost_colony_omo_8,
+    LocationName.lost_colony_beetle,
+    LocationName.lost_colony_animal_1,
+    LocationName.lost_colony_animal_2,
+    LocationName.lost_colony_animal_3,
+    LocationName.lost_colony_animal_4,
+    LocationName.lost_colony_animal_5,
+    LocationName.lost_colony_animal_6,
+    LocationName.lost_colony_animal_7,
+    LocationName.lost_colony_animal_8,
+    LocationName.lost_colony_animal_9,
+    LocationName.lost_colony_animal_10,
+    LocationName.lost_colony_animal_11,
+    LocationName.lost_colony_animal_12,
+    LocationName.lost_colony_animal_13,
+    LocationName.lost_colony_animal_14,
+    LocationName.lost_colony_lifebox_1,
+    LocationName.lost_colony_itembox_1,
+    LocationName.lost_colony_itembox_2,
+    LocationName.lost_colony_itembox_3,
+    LocationName.lost_colony_itembox_4,
+    LocationName.lost_colony_itembox_5,
+    LocationName.lost_colony_itembox_6,
+    LocationName.lost_colony_itembox_7,
+    LocationName.lost_colony_itembox_8,
+    LocationName.lost_colony_itembox_9,
+    LocationName.lost_colony_big,
+    LocationName.lost_colony_upgrade,
+]
+
+weapons_bed_region_locations = [
+    LocationName.weapons_bed_1,
+    LocationName.weapons_bed_2,
+    LocationName.weapons_bed_3,
+    LocationName.weapons_bed_4,
+    LocationName.weapons_bed_5,
+    LocationName.weapons_bed_chao_1,
+    LocationName.weapons_bed_chao_2,
+    LocationName.weapons_bed_chao_3,
+    LocationName.weapons_bed_pipe_1,
+    LocationName.weapons_bed_pipe_2,
+    LocationName.weapons_bed_pipe_3,
+    LocationName.weapons_bed_pipe_4,
+    LocationName.weapons_bed_pipe_5,
+    LocationName.weapons_bed_omo_1,
+    LocationName.weapons_bed_omo_2,
+    LocationName.weapons_bed_omo_3,
+    LocationName.weapons_bed_animal_1,
+    LocationName.weapons_bed_animal_2,
+    LocationName.weapons_bed_animal_3,
+    LocationName.weapons_bed_animal_4,
+    LocationName.weapons_bed_animal_5,
+    LocationName.weapons_bed_animal_6,
+    LocationName.weapons_bed_animal_7,
+    LocationName.weapons_bed_animal_8,
+    LocationName.weapons_bed_animal_9,
+    LocationName.weapons_bed_animal_10,
+    LocationName.weapons_bed_animal_11,
+    LocationName.weapons_bed_animal_12,
+    LocationName.weapons_bed_animal_13,
+    LocationName.weapons_bed_animal_14,
+    LocationName.weapons_bed_animal_15,
+    LocationName.weapons_bed_lifebox_1,
+    LocationName.weapons_bed_itembox_1,
+    LocationName.weapons_bed_itembox_2,
+    LocationName.weapons_bed_itembox_3,
+    LocationName.weapons_bed_itembox_4,
+    LocationName.weapons_bed_itembox_5,
+    LocationName.weapons_bed_itembox_6,
+    LocationName.weapons_bed_itembox_7,
+    LocationName.weapons_bed_big,
+    LocationName.weapons_bed_upgrade,
+]
+
+cosmic_wall_region_locations = [
+    LocationName.cosmic_wall_1,
+    LocationName.cosmic_wall_2,
+    LocationName.cosmic_wall_3,
+    LocationName.cosmic_wall_4,
+    LocationName.cosmic_wall_5,
+    LocationName.cosmic_wall_chao_1,
+    LocationName.cosmic_wall_chao_2,
+    LocationName.cosmic_wall_chao_3,
+    LocationName.cosmic_wall_pipe_1,
+    LocationName.cosmic_wall_pipe_2,
+    LocationName.cosmic_wall_pipe_3,
+    LocationName.cosmic_wall_pipe_4,
+    LocationName.cosmic_wall_pipe_5,
+    LocationName.cosmic_wall_omo_1,
+    LocationName.cosmic_wall_beetle,
+    LocationName.cosmic_wall_animal_1,
+    LocationName.cosmic_wall_animal_2,
+    LocationName.cosmic_wall_animal_3,
+    LocationName.cosmic_wall_animal_4,
+    LocationName.cosmic_wall_animal_5,
+    LocationName.cosmic_wall_animal_6,
+    LocationName.cosmic_wall_animal_7,
+    LocationName.cosmic_wall_animal_8,
+    LocationName.cosmic_wall_animal_9,
+    LocationName.cosmic_wall_animal_10,
+    LocationName.cosmic_wall_animal_11,
+    LocationName.cosmic_wall_animal_12,
+    LocationName.cosmic_wall_animal_13,
+    LocationName.cosmic_wall_animal_14,
+    LocationName.cosmic_wall_animal_15,
+    LocationName.cosmic_wall_itembox_1,
+    LocationName.cosmic_wall_itembox_2,
+    LocationName.cosmic_wall_itembox_3,
+    LocationName.cosmic_wall_itembox_4,
+    LocationName.cosmic_wall_itembox_5,
+    LocationName.cosmic_wall_itembox_6,
+    LocationName.cosmic_wall_itembox_7,
+    LocationName.cosmic_wall_itembox_8,
+    LocationName.cosmic_wall_itembox_9,
+    LocationName.cosmic_wall_itembox_10,
+    LocationName.cosmic_wall_itembox_11,
+    LocationName.cosmic_wall_itembox_12,
+    LocationName.cosmic_wall_itembox_13,
+    LocationName.cosmic_wall_itembox_14,
+    LocationName.cosmic_wall_itembox_15,
+    LocationName.cosmic_wall_itembox_16,
+    LocationName.cosmic_wall_itembox_17,
+    LocationName.cosmic_wall_itembox_18,
+    LocationName.cosmic_wall_itembox_19,
+    LocationName.cosmic_wall_itembox_20,
+    LocationName.cosmic_wall_itembox_21,
+    LocationName.cosmic_wall_itembox_22,
+    LocationName.cosmic_wall_itembox_23,
+    LocationName.cosmic_wall_itembox_24,
+    LocationName.cosmic_wall_itembox_25,
+    LocationName.cosmic_wall_itembox_26,
+    LocationName.cosmic_wall_itembox_27,
+    LocationName.cosmic_wall_upgrade,
+]
+
+dry_lagoon_region_locations = [
+    LocationName.dry_lagoon_1,
+    LocationName.dry_lagoon_2,
+    LocationName.dry_lagoon_3,
+    LocationName.dry_lagoon_4,
+    LocationName.dry_lagoon_5,
+    LocationName.dry_lagoon_chao_1,
+    LocationName.dry_lagoon_chao_2,
+    LocationName.dry_lagoon_chao_3,
+    LocationName.dry_lagoon_pipe_1,
+    LocationName.dry_lagoon_hidden_1,
+    LocationName.dry_lagoon_omo_1,
+    LocationName.dry_lagoon_omo_2,
+    LocationName.dry_lagoon_omo_3,
+    LocationName.dry_lagoon_omo_4,
+    LocationName.dry_lagoon_omo_5,
+    LocationName.dry_lagoon_omo_6,
+    LocationName.dry_lagoon_omo_7,
+    LocationName.dry_lagoon_omo_8,
+    LocationName.dry_lagoon_omo_9,
+    LocationName.dry_lagoon_omo_10,
+    LocationName.dry_lagoon_omo_11,
+    LocationName.dry_lagoon_omo_12,
+    LocationName.dry_lagoon_beetle,
+    LocationName.dry_lagoon_animal_1,
+    LocationName.dry_lagoon_animal_2,
+    LocationName.dry_lagoon_animal_3,
+    LocationName.dry_lagoon_animal_4,
+    LocationName.dry_lagoon_animal_5,
+    LocationName.dry_lagoon_animal_6,
+    LocationName.dry_lagoon_animal_7,
+    LocationName.dry_lagoon_animal_8,
+    LocationName.dry_lagoon_animal_9,
+    LocationName.dry_lagoon_animal_10,
+    LocationName.dry_lagoon_animal_11,
+    LocationName.dry_lagoon_animal_12,
+    LocationName.dry_lagoon_lifebox_1,
+    LocationName.dry_lagoon_lifebox_2,
+    LocationName.dry_lagoon_lifebox_3,
+    LocationName.dry_lagoon_lifebox_4,
+    LocationName.dry_lagoon_itembox_1,
+    LocationName.dry_lagoon_itembox_2,
+    LocationName.dry_lagoon_itembox_3,
+    LocationName.dry_lagoon_itembox_4,
+    LocationName.dry_lagoon_itembox_5,
+    LocationName.dry_lagoon_itembox_6,
+    LocationName.dry_lagoon_big,
+    LocationName.dry_lagoon_upgrade,
+]
+
+egg_quarters_region_locations = [
+    LocationName.egg_quarters_1,
+    LocationName.egg_quarters_2,
+    LocationName.egg_quarters_3,
+    LocationName.egg_quarters_4,
+    LocationName.egg_quarters_5,
+    LocationName.egg_quarters_chao_1,
+    LocationName.egg_quarters_chao_2,
+    LocationName.egg_quarters_chao_3,
+    LocationName.egg_quarters_pipe_1,
+    LocationName.egg_quarters_pipe_2,
+    LocationName.egg_quarters_hidden_1,
+    LocationName.egg_quarters_hidden_2,
+    LocationName.egg_quarters_omo_1,
+    LocationName.egg_quarters_omo_2,
+    LocationName.egg_quarters_omo_3,
+    LocationName.egg_quarters_omo_4,
+    LocationName.egg_quarters_omo_5,
+    LocationName.egg_quarters_omo_6,
+    LocationName.egg_quarters_omo_7,
+    LocationName.egg_quarters_beetle,
+    LocationName.egg_quarters_animal_1,
+    LocationName.egg_quarters_animal_2,
+    LocationName.egg_quarters_animal_3,
+    LocationName.egg_quarters_animal_4,
+    LocationName.egg_quarters_animal_5,
+    LocationName.egg_quarters_animal_6,
+    LocationName.egg_quarters_animal_7,
+    LocationName.egg_quarters_animal_8,
+    LocationName.egg_quarters_animal_9,
+    LocationName.egg_quarters_animal_10,
+    LocationName.egg_quarters_lifebox_1,
+    LocationName.egg_quarters_lifebox_2,
+    LocationName.egg_quarters_itembox_1,
+    LocationName.egg_quarters_itembox_2,
+    LocationName.egg_quarters_itembox_3,
+    LocationName.egg_quarters_itembox_4,
+    LocationName.egg_quarters_itembox_5,
+    LocationName.egg_quarters_itembox_6,
+    LocationName.egg_quarters_itembox_7,
+    LocationName.egg_quarters_itembox_8,
+    LocationName.egg_quarters_itembox_9,
+    LocationName.egg_quarters_itembox_10,
+    LocationName.egg_quarters_itembox_11,
+    LocationName.egg_quarters_big,
+    LocationName.egg_quarters_upgrade,
+]
+
+security_hall_region_locations = [
+    LocationName.security_hall_1,
+    LocationName.security_hall_2,
+    LocationName.security_hall_3,
+    LocationName.security_hall_4,
+    LocationName.security_hall_5,
+    LocationName.security_hall_chao_1,
+    LocationName.security_hall_chao_2,
+    LocationName.security_hall_chao_3,
+    LocationName.security_hall_pipe_1,
+    LocationName.security_hall_hidden_1,
+    LocationName.security_hall_omo_1,
+    LocationName.security_hall_omo_2,
+    LocationName.security_hall_omo_3,
+    LocationName.security_hall_omo_4,
+    LocationName.security_hall_omo_5,
+    LocationName.security_hall_omo_6,
+    LocationName.security_hall_omo_7,
+    LocationName.security_hall_omo_8,
+    LocationName.security_hall_omo_9,
+    LocationName.security_hall_omo_10,
+    LocationName.security_hall_omo_11,
+    LocationName.security_hall_omo_12,
+    LocationName.security_hall_beetle,
+    LocationName.security_hall_animal_1,
+    LocationName.security_hall_animal_2,
+    LocationName.security_hall_animal_3,
+    LocationName.security_hall_animal_4,
+    LocationName.security_hall_animal_5,
+    LocationName.security_hall_animal_6,
+    LocationName.security_hall_animal_7,
+    LocationName.security_hall_animal_8,
+    LocationName.security_hall_lifebox_1,
+    LocationName.security_hall_itembox_1,
+    LocationName.security_hall_itembox_2,
+    LocationName.security_hall_itembox_3,
+    LocationName.security_hall_itembox_4,
+    LocationName.security_hall_itembox_5,
+    LocationName.security_hall_itembox_6,
+    LocationName.security_hall_itembox_7,
+    LocationName.security_hall_itembox_8,
+    LocationName.security_hall_itembox_9,
+    LocationName.security_hall_itembox_10,
+    LocationName.security_hall_itembox_11,
+    LocationName.security_hall_itembox_12,
+    LocationName.security_hall_itembox_13,
+    LocationName.security_hall_itembox_14,
+    LocationName.security_hall_itembox_15,
+    LocationName.security_hall_itembox_16,
+    LocationName.security_hall_itembox_17,
+    LocationName.security_hall_itembox_18,
+    LocationName.security_hall_itembox_19,
+    LocationName.security_hall_itembox_20,
+    LocationName.security_hall_itembox_21,
+    LocationName.security_hall_itembox_22,
+    LocationName.security_hall_itembox_23,
+    LocationName.security_hall_itembox_24,
+    LocationName.security_hall_big,
+    LocationName.security_hall_upgrade,
+]
+
+route_280_region_locations = [
+    LocationName.route_280_1,
+    LocationName.route_280_2,
+    LocationName.route_280_3,
+    LocationName.route_280_4,
+    LocationName.route_280_5,
+    LocationName.route_280_itembox_1,
+    LocationName.route_280_itembox_2,
+    LocationName.route_280_itembox_3,
+]
+
+mad_space_region_locations = [
+    LocationName.mad_space_1,
+    LocationName.mad_space_2,
+    LocationName.mad_space_3,
+    LocationName.mad_space_4,
+    LocationName.mad_space_5,
+    LocationName.mad_space_chao_1,
+    LocationName.mad_space_chao_2,
+    LocationName.mad_space_chao_3,
+    LocationName.mad_space_pipe_1,
+    LocationName.mad_space_pipe_2,
+    LocationName.mad_space_pipe_3,
+    LocationName.mad_space_pipe_4,
+    LocationName.mad_space_omo_1,
+    LocationName.mad_space_omo_2,
+    LocationName.mad_space_omo_3,
+    LocationName.mad_space_omo_4,
+    LocationName.mad_space_omo_5,
+    LocationName.mad_space_beetle,
+    LocationName.mad_space_animal_1,
+    LocationName.mad_space_animal_2,
+    LocationName.mad_space_animal_3,
+    LocationName.mad_space_animal_4,
+    LocationName.mad_space_animal_5,
+    LocationName.mad_space_animal_6,
+    LocationName.mad_space_animal_7,
+    LocationName.mad_space_animal_8,
+    LocationName.mad_space_animal_9,
+    LocationName.mad_space_animal_10,
+    LocationName.mad_space_lifebox_1,
+    LocationName.mad_space_lifebox_2,
+    LocationName.mad_space_lifebox_3,
+    LocationName.mad_space_lifebox_4,
+    LocationName.mad_space_itembox_1,
+    LocationName.mad_space_itembox_2,
+    LocationName.mad_space_itembox_3,
+    LocationName.mad_space_itembox_4,
+    LocationName.mad_space_itembox_5,
+    LocationName.mad_space_itembox_6,
+    LocationName.mad_space_itembox_7,
+    LocationName.mad_space_itembox_8,
+    LocationName.mad_space_itembox_9,
+    LocationName.mad_space_itembox_10,
+    LocationName.mad_space_itembox_11,
+    LocationName.mad_space_itembox_12,
+    LocationName.mad_space_itembox_13,
+    LocationName.mad_space_itembox_14,
+    LocationName.mad_space_itembox_15,
+    LocationName.mad_space_itembox_16,
+    LocationName.mad_space_itembox_17,
+    LocationName.mad_space_itembox_18,
+    LocationName.mad_space_itembox_19,
+    LocationName.mad_space_itembox_20,
+    LocationName.mad_space_big,
+    LocationName.mad_space_upgrade,
+]
+
+cannon_core_region_locations = [
+    LocationName.cannon_core_1,
+    LocationName.cannon_core_2,
+    LocationName.cannon_core_3,
+    LocationName.cannon_core_4,
+    LocationName.cannon_core_5,
+    LocationName.cannon_core_chao_1,
+    LocationName.cannon_core_chao_2,
+    LocationName.cannon_core_chao_3,
+    LocationName.cannon_core_pipe_1,
+    LocationName.cannon_core_pipe_2,
+    LocationName.cannon_core_pipe_3,
+    LocationName.cannon_core_pipe_4,
+    LocationName.cannon_core_pipe_5,
+    LocationName.cannon_core_hidden_1,
+    LocationName.cannon_core_omo_1,
+    LocationName.cannon_core_omo_2,
+    LocationName.cannon_core_omo_3,
+    LocationName.cannon_core_omo_4,
+    LocationName.cannon_core_omo_5,
+    LocationName.cannon_core_omo_6,
+    LocationName.cannon_core_omo_7,
+    LocationName.cannon_core_omo_8,
+    LocationName.cannon_core_omo_9,
+    LocationName.cannon_core_animal_1,
+    LocationName.cannon_core_animal_2,
+    LocationName.cannon_core_animal_3,
+    LocationName.cannon_core_animal_4,
+    LocationName.cannon_core_animal_5,
+    LocationName.cannon_core_animal_6,
+    LocationName.cannon_core_animal_7,
+    LocationName.cannon_core_animal_8,
+    LocationName.cannon_core_animal_9,
+    LocationName.cannon_core_animal_10,
+    LocationName.cannon_core_animal_11,
+    LocationName.cannon_core_animal_12,
+    LocationName.cannon_core_animal_13,
+    LocationName.cannon_core_animal_14,
+    LocationName.cannon_core_animal_15,
+    LocationName.cannon_core_animal_16,
+    LocationName.cannon_core_animal_17,
+    LocationName.cannon_core_animal_18,
+    LocationName.cannon_core_animal_19,
+    LocationName.cannon_core_lifebox_1,
+    LocationName.cannon_core_itembox_1,
+    LocationName.cannon_core_itembox_2,
+    LocationName.cannon_core_itembox_3,
+    LocationName.cannon_core_itembox_4,
+    LocationName.cannon_core_itembox_5,
+    LocationName.cannon_core_itembox_6,
+    LocationName.cannon_core_itembox_7,
+    LocationName.cannon_core_itembox_8,
+    LocationName.cannon_core_itembox_9,
+    LocationName.cannon_core_itembox_10,
+    LocationName.cannon_core_itembox_11,
+    LocationName.cannon_core_itembox_12,
+    LocationName.cannon_core_beetle,
+    LocationName.cannon_core_big_1,
+    LocationName.cannon_core_big_2,
+    LocationName.cannon_core_big_3,
+    LocationName.cannon_core_big_4,
+    LocationName.cannon_core_big_5,
+]
+
+
 def setup_locations(world: World, player: int, mission_map: typing.Dict[int, int], mission_count_map: typing.Dict[int, int]):
     location_table = {}
     chao_location_table = {}
@@ -1693,6 +4011,15 @@ def setup_locations(world: World, player: int, mission_map: typing.Dict[int, int
         if world.options.animalsanity:
             location_table.update({**animal_location_table})
 
+        if world.options.itemboxsanity.value == 1:
+            location_table.update({**lifebox_location_table})
+        elif world.options.itemboxsanity.value == 2:
+            location_table.update({**lifebox_location_table})
+            location_table.update({**itembox_location_table})
+
+        if world.options.bigsanity:
+            location_table.update({**big_location_table})
+
         if world.options.kart_race_checks == 2:
             location_table.update({**kart_race_beginner_location_table})
             location_table.update({**kart_race_standard_location_table})
@@ -1700,7 +4027,7 @@ def setup_locations(world: World, player: int, mission_map: typing.Dict[int, int
         elif world.options.kart_race_checks == 1:
             location_table.update({**kart_race_mini_location_table})
 
-        if world.options.goal.value in [0, 2, 4, 5, 6]:
+        if world.options.goal.value in [0, 2, 4, 5, 6, 8]:
             location_table.update({**final_boss_location_table})
         elif world.options.goal.value in [7]:
             location_table.update({**chaos_chao_location_table})
@@ -1708,12 +4035,18 @@ def setup_locations(world: World, player: int, mission_map: typing.Dict[int, int
         if world.options.goal.value in [1, 2]:
             location_table.update({**green_hill_location_table})
 
+            if world.options.goal.value in [1]:
+                location_table[LocationName.green_hill] = None
+
             if world.options.keysanity:
                 location_table.update({**green_hill_chao_location_table})
 
             if world.options.animalsanity:
                 location_table.update({**green_hill_animal_location_table})
 
+            if world.options.itemboxsanity.value == 2:
+                location_table.update({**green_hill_itembox_location_table})
+
         if world.options.goal.value in [4, 5, 6]:
             location_table.update({**boss_rush_location_table})
 
@@ -1773,3 +4106,82 @@ def setup_locations(world: World, player: int, mission_map: typing.Dict[int, int
 
 
 lookup_id_to_name: typing.Dict[int, str] = {id: name for name, _ in all_locations.items()}
+
+
+location_groups: typing.Dict[str, typing.Set[str]] = {
+    "Missions": set(mission_location_table),
+    "Upgrades": set(upgrade_location_table),
+    "Boss Gates": set(boss_gate_location_table),
+    "Boss Rush": set(boss_rush_location_table),
+    "Keys": set(chao_key_location_table),
+    "Pipes": set(pipe_location_table),
+    "Hiddens": set(hidden_whistle_location_table),
+    "Whistles": set(pipe_location_table | hidden_whistle_location_table),
+    "Gold Beetles": set(beetle_location_table),
+    "Omochao": set(omochao_location_table),
+    "Animals": set(animal_location_table),
+    "Item Boxes": set(lifebox_location_table | itembox_location_table),
+    "Big": set(big_location_table),
+
+    "Chao Garden": set(chao_race_beginner_location_table | \
+                       chao_karate_beginner_location_table | \
+                       chao_race_intermediate_location_table | \
+                       chao_karate_intermediate_location_table | \
+                       chao_race_expert_location_table | \
+                       chao_karate_expert_location_table | \
+                       chao_karate_super_location_table | \
+                       chao_stat_swim_table | \
+                       chao_stat_fly_table | \
+                       chao_stat_run_table | \
+                       chao_stat_power_table | \
+                       chao_stat_stamina_table | \
+                       chao_stat_luck_table | \
+                       chao_stat_intelligence_table | \
+                       chao_animal_part_location_table | \
+                       chao_kindergarten_location_table | \
+                       chao_kindergarten_basics_location_table | \
+                       black_market_location_table),
+
+    "City Escape": set(city_escape_region_locations),
+    "Metal Harbor": set(metal_harbor_region_locations),
+    "Green Forest": set(green_forest_region_locations),
+    "Pyramid Cave": set(pyramid_cave_region_locations),
+    "Crazy Gadget": set(crazy_gadget_region_locations),
+    "Final Rush": set(final_rush_region_locations),
+
+    "Prison Lane": set(prison_lane_region_locations),
+    "Mission Street": set(mission_street_region_locations),
+    "Route 101": set(route_101_region_locations),
+    "Hidden Base": set(hidden_base_region_locations),
+    "Eternal Engine": set(eternal_engine_region_locations),
+
+    "Wild Canyon": set(wild_canyon_region_locations),
+    "Pumpkin Hill": set(pumpkin_hill_region_locations),
+    "Aquatic Mine": set(aquatic_mine_region_locations),
+    "Death Chamber": set(death_chamber_region_locations),
+    "Meteor Herd": set(meteor_herd_region_locations),
+
+    "Radical Highway": set(radical_highway_region_locations),
+    "White Jungle": set(white_jungle_region_locations),
+    "Sky Rail": set(sky_rail_region_locations),
+    "Final Chase": set(final_chase_region_locations),
+
+    "Iron Gate": set(iron_gate_region_locations),
+    "Sand Ocean": set(sand_ocean_region_locations),
+    "Lost Colony": set(lost_colony_region_locations),
+    "Weapons Bed": set(weapons_bed_region_locations),
+    "Cosmic Wall": set(cosmic_wall_region_locations),
+
+    "Dry Lagoon": set(dry_lagoon_region_locations),
+    "Egg Quarters": set(egg_quarters_region_locations),
+    "Security Hall": set(security_hall_region_locations),
+    "Route 280": set(route_280_region_locations),
+    "Mad Space": set(mad_space_region_locations),
+
+    "Cannon's Core": set(cannon_core_region_locations),
+
+    "Green Hill": set(green_hill_location_table | \
+                      green_hill_chao_location_table | \
+                      green_hill_animal_location_table | \
+                      green_hill_itembox_location_table),
+}
diff --git a/worlds/sa2b/Missions.py b/worlds/sa2b/Missions.py
index 5ee48d5640..0c43834fb1 100644
--- a/worlds/sa2b/Missions.py
+++ b/worlds/sa2b/Missions.py
@@ -119,11 +119,14 @@ mission_orders: typing.List[typing.List[int]] = [
     [4, 5, 3, 2, 1],
 ]
 
-### 0: Speed
-### 1: Mech
-### 2: Hunt
-### 3: Kart
-### 4: Cannon's Core
+### 0: Sonic
+### 1: Tails
+### 2: Knuckles
+### 3: Shadow
+### 4: Eggman
+### 5: Rouge
+### 6: Kart
+### 7: Cannon's Core
 level_styles: typing.List[int] = [
     0,
     2,
@@ -133,7 +136,7 @@ level_styles: typing.List[int] = [
     2,
     1,
     2,
-    3,
+    6,
     1,
     0,
     2,
@@ -142,22 +145,22 @@ level_styles: typing.List[int] = [
     0,
     0,
 
-    1,
-    2,
-    1,
-    0,
-    2,
-    1,
-    1,
-    2,
-    0,
-    3,
-    0,
-    2,
-    1,
-    0,
-
     4,
+    5,
+    4,
+    3,
+    5,
+    4,
+    4,
+    5,
+    3,
+    6,
+    3,
+    5,
+    4,
+    3,
+
+    7,
 ]
 
 stage_name_prefixes: typing.List[str] = [
@@ -201,21 +204,33 @@ def get_mission_count_table(multiworld: MultiWorld, world: World, player: int):
         for level in range(31):
             mission_count_table[level] = 0
     else:
-        speed_active_missions = 1
-        mech_active_missions = 1
-        hunt_active_missions = 1
+        sonic_active_missions = 1
+        tails_active_missions = 1
+        knuckles_active_missions = 1
+        shadow_active_missions = 1
+        eggman_active_missions = 1
+        rouge_active_missions = 1
         kart_active_missions = 1
         cannons_core_active_missions = 1
 
         for i in range(2,6):
-            if getattr(world.options, "speed_mission_" + str(i), None):
-                speed_active_missions += 1
+            if getattr(world.options, "sonic_mission_" + str(i), None):
+                sonic_active_missions += 1
 
-            if getattr(world.options, "mech_mission_" + str(i), None):
-                mech_active_missions += 1
+            if getattr(world.options, "tails_mission_" + str(i), None):
+                tails_active_missions += 1
 
-            if getattr(world.options, "hunt_mission_" + str(i), None):
-                hunt_active_missions += 1
+            if getattr(world.options, "knuckles_mission_" + str(i), None):
+                knuckles_active_missions += 1
+
+            if getattr(world.options, "shadow_mission_" + str(i), None):
+                shadow_active_missions += 1
+
+            if getattr(world.options, "eggman_mission_" + str(i), None):
+                eggman_active_missions += 1
+
+            if getattr(world.options, "rouge_mission_" + str(i), None):
+                rouge_active_missions += 1
 
             if getattr(world.options, "kart_mission_" + str(i), None):
                 kart_active_missions += 1
@@ -223,16 +238,22 @@ def get_mission_count_table(multiworld: MultiWorld, world: World, player: int):
             if getattr(world.options, "cannons_core_mission_" + str(i), None):
                 cannons_core_active_missions += 1
 
-        speed_active_missions        = min(speed_active_missions, world.options.speed_mission_count.value)
-        mech_active_missions         = min(mech_active_missions, world.options.mech_mission_count.value)
-        hunt_active_missions         = min(hunt_active_missions, world.options.hunt_mission_count.value)
+        sonic_active_missions        = min(sonic_active_missions, world.options.sonic_mission_count.value)
+        tails_active_missions        = min(tails_active_missions, world.options.tails_mission_count.value)
+        knuckles_active_missions     = min(knuckles_active_missions, world.options.knuckles_mission_count.value)
+        shadow_active_missions       = min(shadow_active_missions, world.options.sonic_mission_count.value)
+        eggman_active_missions       = min(eggman_active_missions, world.options.eggman_mission_count.value)
+        rouge_active_missions        = min(rouge_active_missions, world.options.rouge_mission_count.value)
         kart_active_missions         = min(kart_active_missions, world.options.kart_mission_count.value)
         cannons_core_active_missions = min(cannons_core_active_missions, world.options.cannons_core_mission_count.value)
 
         active_missions: typing.List[typing.List[int]] = [
-            speed_active_missions,
-            mech_active_missions,
-            hunt_active_missions,
+            sonic_active_missions,
+            tails_active_missions,
+            knuckles_active_missions,
+            shadow_active_missions,
+            eggman_active_missions,
+            rouge_active_missions,
             kart_active_missions,
             cannons_core_active_missions
         ]
@@ -252,22 +273,34 @@ def get_mission_table(multiworld: MultiWorld, world: World, player: int):
         for level in range(31):
             mission_table[level] = 0
     else:
-        speed_active_missions: typing.List[int] = [1]
-        mech_active_missions: typing.List[int] = [1]
-        hunt_active_missions: typing.List[int] = [1]
+        sonic_active_missions: typing.List[int] = [1]
+        tails_active_missions: typing.List[int] = [1]
+        knuckles_active_missions: typing.List[int] = [1]
+        shadow_active_missions: typing.List[int] = [1]
+        eggman_active_missions: typing.List[int] = [1]
+        rouge_active_missions: typing.List[int] = [1]
         kart_active_missions: typing.List[int] = [1]
         cannons_core_active_missions: typing.List[int] = [1]
 
         # Add included missions
         for i in range(2,6):
-            if getattr(world.options, "speed_mission_" + str(i), None):
-                speed_active_missions.append(i)
+            if getattr(world.options, "sonic_mission_" + str(i), None):
+                sonic_active_missions.append(i)
 
-            if getattr(world.options, "mech_mission_" + str(i), None):
-                mech_active_missions.append(i)
+            if getattr(world.options, "tails_mission_" + str(i), None):
+                tails_active_missions.append(i)
 
-            if getattr(world.options, "hunt_mission_" + str(i), None):
-                hunt_active_missions.append(i)
+            if getattr(world.options, "knuckles_mission_" + str(i), None):
+                knuckles_active_missions.append(i)
+
+            if getattr(world.options, "shadow_mission_" + str(i), None):
+                shadow_active_missions.append(i)
+
+            if getattr(world.options, "eggman_mission_" + str(i), None):
+                eggman_active_missions.append(i)
+
+            if getattr(world.options, "rouge_mission_" + str(i), None):
+                rouge_active_missions.append(i)
 
             if getattr(world.options, "kart_mission_" + str(i), None):
                 kart_active_missions.append(i)
@@ -276,9 +309,12 @@ def get_mission_table(multiworld: MultiWorld, world: World, player: int):
                 cannons_core_active_missions.append(i)
 
         active_missions: typing.List[typing.List[int]] = [
-            speed_active_missions,
-            mech_active_missions,
-            hunt_active_missions,
+            sonic_active_missions,
+            tails_active_missions,
+            knuckles_active_missions,
+            shadow_active_missions,
+            eggman_active_missions,
+            rouge_active_missions,
             kart_active_missions,
             cannons_core_active_missions
         ]
@@ -328,13 +364,60 @@ def get_mission_table(multiworld: MultiWorld, world: World, player: int):
 
 
 def get_first_and_last_cannons_core_missions(mission_map: typing.Dict[int, int], mission_count_map: typing.Dict[int, int]):
-        mission_count = mission_count_map[30]
-        mission_order: typing.List[int] = mission_orders[mission_map[30]]
-        stage_prefix: str = stage_name_prefixes[30]
+    mission_count = mission_count_map[30]
+    mission_order: typing.List[int] = mission_orders[mission_map[30]]
+    stage_prefix: str = stage_name_prefixes[30]
 
-        first_mission_number = mission_order[0]
-        last_mission_number = mission_order[mission_count - 1]
-        first_location_name: str = stage_prefix + str(first_mission_number)
-        last_location_name: str = stage_prefix + str(last_mission_number)
+    first_mission_number = mission_order[0]
+    last_mission_number = mission_order[mission_count - 1]
+    first_location_name: str = stage_prefix + str(first_mission_number)
+    last_location_name: str = stage_prefix + str(last_mission_number)
 
-        return first_location_name, last_location_name
+    return first_location_name, last_location_name
+
+
+def print_mission_orders_to_spoiler(mission_map: typing.Dict[int, int],
+                                    mission_count_map: typing.Dict[int, int],
+                                    shuffled_region_list: typing.Dict[int, int],
+                                    levels_per_gate: typing.Dict[int, int],
+                                    player_name: str,
+                                    spoiler_handle: typing.TextIO):
+    spoiler_handle.write("\n")
+    header_text = "SA2 Mission Orders for {}:\n"
+    header_text = header_text.format(player_name)
+    spoiler_handle.write(header_text)
+
+    level_index = 0
+    for gate_idx in range(len(levels_per_gate)):
+        gate_len = levels_per_gate[gate_idx]
+        gate_levels = shuffled_region_list[int(level_index):int(level_index+gate_len)]
+        gate_levels.sort()
+
+        gate_text = "Gate {}:\n"
+        gate_text = gate_text.format(gate_idx)
+        spoiler_handle.write(gate_text)
+
+        for i in range(len(gate_levels)):
+            stage = gate_levels[i]
+            mission_count = mission_count_map[stage]
+            mission_order: typing.List[int] = mission_orders[mission_map[stage]]
+            stage_prefix: str = stage_name_prefixes[stage]
+
+            for mission in range(mission_count):
+                stage_prefix += str(mission_order[mission]) + " "
+
+            spoiler_handle.write(stage_prefix)
+            spoiler_handle.write("\n")
+
+        level_index += gate_len
+        spoiler_handle.write("\n")
+
+    mission_count = mission_count_map[30]
+    mission_order: typing.List[int] = mission_orders[mission_map[30]]
+    stage_prefix: str = stage_name_prefixes[30]
+
+    for mission in range(mission_count):
+        stage_prefix += str(mission_order[mission]) + " "
+
+    spoiler_handle.write(stage_prefix)
+    spoiler_handle.write("\n\n")
diff --git a/worlds/sa2b/Names/ItemName.py b/worlds/sa2b/Names/ItemName.py
index c6de98183b..1b9bdbd0d9 100644
--- a/worlds/sa2b/Names/ItemName.py
+++ b/worlds/sa2b/Names/ItemName.py
@@ -5,7 +5,7 @@ emblem = "Emblem"
 market_token = "Chao Coin"
 
 # Upgrade Definitions
-sonic_gloves          = "Sonic - Magic Glove"
+sonic_gloves          = "Sonic - Magic Gloves"
 sonic_light_shoes     = "Sonic - Light Shoes"
 sonic_ancient_light   = "Sonic - Ancient Light"
 sonic_bounce_bracelet = "Sonic - Bounce Bracelet"
@@ -51,19 +51,34 @@ invincibility   = "Invincibility"
 
 
 # Traps
-omochao_trap    = "OmoTrap"
-timestop_trap   = "Chaos Control Trap"
-confuse_trap    = "Confusion Trap"
-tiny_trap       = "Tiny Trap"
-gravity_trap    = "Gravity Trap"
-exposition_trap = "Exposition Trap"
-darkness_trap   = "Darkness Trap"
-ice_trap        = "Ice Trap"
-slow_trap       = "Slow Trap"
-cutscene_trap   = "Cutscene Trap"
-reverse_trap    = "Reverse Trap"
+omochao_trap          = "OmoTrap"
+timestop_trap         = "Chaos Control Trap"
+confuse_trap          = "Confusion Trap"
+tiny_trap             = "Tiny Trap"
+gravity_trap          = "Gravity Trap"
+exposition_trap       = "Exposition Trap"
+darkness_trap         = "Darkness Trap"
+ice_trap              = "Ice Trap"
+slow_trap             = "Slow Trap"
+cutscene_trap         = "Cutscene Trap"
+reverse_trap          = "Reverse Trap"
+literature_trap       = "Literature Trap"
+controller_drift_trap = "Controller Drift Trap"
+poison_trap           = "Poison Trap"
+bee_trap              = "Bee Trap"
 
-pong_trap       = "Pong Trap"
+pong_trap            = "Pong Trap"
+breakout_trap        = "Breakout Trap"
+fishing_trap         = "Fishing Trap"
+trivia_trap          = "Trivia Trap"
+pokemon_trivia_trap  = "Pokemon Trivia Trap"
+pokemon_count_trap   = "Pokemon Count Trap"
+number_sequence_trap = "Number Sequence Trap"
+light_up_path_trap   = "Light Up Path Trap"
+pinball_trap         = "Pinball Trap"
+math_quiz_trap       = "Math Quiz Trap"
+snake_trap           = "Snake Trap"
+input_sequence_trap  = "Input Sequence Trap"
 
 
 # Chaos Emeralds
diff --git a/worlds/sa2b/Names/LocationName.py b/worlds/sa2b/Names/LocationName.py
index bde25a8a75..1c0ffc6501 100644
--- a/worlds/sa2b/Names/LocationName.py
+++ b/worlds/sa2b/Names/LocationName.py
@@ -1,556 +1,799 @@
 # Sonic Mission Definitions
-city_escape_1          = "City Escape - 1"
-city_escape_2          = "City Escape - 2"
-city_escape_3          = "City Escape - 3"
-city_escape_4          = "City Escape - 4"
-city_escape_5          = "City Escape - 5"
-city_escape_chao_1     = "City Escape - Chao Key 1"
-city_escape_chao_2     = "City Escape - Chao Key 2"
-city_escape_chao_3     = "City Escape - Chao Key 3"
-city_escape_pipe_1     = "City Escape - Pipe 1"
-city_escape_pipe_2     = "City Escape - Pipe 2"
-city_escape_pipe_3     = "City Escape - Pipe 3"
-city_escape_pipe_4     = "City Escape - Pipe 4"
-city_escape_hidden_1   = "City Escape - Hidden 1"
-city_escape_hidden_2   = "City Escape - Hidden 2"
-city_escape_hidden_3   = "City Escape - Hidden 3"
-city_escape_hidden_4   = "City Escape - Hidden 4"
-city_escape_hidden_5   = "City Escape - Hidden 5"
-city_escape_omo_1      = "City Escape - Omochao 1"
-city_escape_omo_2      = "City Escape - Omochao 2"
-city_escape_omo_3      = "City Escape - Omochao 3"
-city_escape_omo_4      = "City Escape - Omochao 4"
-city_escape_omo_5      = "City Escape - Omochao 5"
-city_escape_omo_6      = "City Escape - Omochao 6"
-city_escape_omo_7      = "City Escape - Omochao 7"
-city_escape_omo_8      = "City Escape - Omochao 8"
-city_escape_omo_9      = "City Escape - Omochao 9"
-city_escape_omo_10     = "City Escape - Omochao 10"
-city_escape_omo_11     = "City Escape - Omochao 11"
-city_escape_omo_12     = "City Escape - Omochao 12"
-city_escape_omo_13     = "City Escape - Omochao 13"
-city_escape_omo_14     = "City Escape - Omochao 14"
-city_escape_beetle     = "City Escape - Gold Beetle"
-city_escape_animal_1   = "City Escape - 1 Animal"
-city_escape_animal_2   = "City Escape - 2 Animals"
-city_escape_animal_3   = "City Escape - 3 Animals"
-city_escape_animal_4   = "City Escape - 4 Animals"
-city_escape_animal_5   = "City Escape - 5 Animals"
-city_escape_animal_6   = "City Escape - 6 Animals"
-city_escape_animal_7   = "City Escape - 7 Animals"
-city_escape_animal_8   = "City Escape - 8 Animals"
-city_escape_animal_9   = "City Escape - 9 Animals"
-city_escape_animal_10  = "City Escape - 10 Animals"
-city_escape_animal_11  = "City Escape - 11 Animals"
-city_escape_animal_12  = "City Escape - 12 Animals"
-city_escape_animal_13  = "City Escape - 13 Animals"
-city_escape_animal_14  = "City Escape - 14 Animals"
-city_escape_animal_15  = "City Escape - 15 Animals"
-city_escape_animal_16  = "City Escape - 16 Animals"
-city_escape_animal_17  = "City Escape - 17 Animals"
-city_escape_animal_18  = "City Escape - 18 Animals"
-city_escape_animal_19  = "City Escape - 19 Animals"
-city_escape_animal_20  = "City Escape - 20 Animals"
-city_escape_upgrade    = "City Escape - Upgrade"
-metal_harbor_1         = "Metal Harbor - 1"
-metal_harbor_2         = "Metal Harbor - 2"
-metal_harbor_3         = "Metal Harbor - 3"
-metal_harbor_4         = "Metal Harbor - 4"
-metal_harbor_5         = "Metal Harbor - 5"
-metal_harbor_chao_1    = "Metal Harbor - Chao Key 1"
-metal_harbor_chao_2    = "Metal Harbor - Chao Key 2"
-metal_harbor_chao_3    = "Metal Harbor - Chao Key 3"
-metal_harbor_pipe_1    = "Metal Harbor - Pipe 1"
-metal_harbor_omo_1     = "Metal Harbor - Omochao 1"
-metal_harbor_omo_2     = "Metal Harbor - Omochao 2"
-metal_harbor_omo_3     = "Metal Harbor - Omochao 3"
-metal_harbor_omo_4     = "Metal Harbor - Omochao 4"
-metal_harbor_omo_5     = "Metal Harbor - Omochao 5"
-metal_harbor_beetle    = "Metal Harbor - Gold Beetle"
-metal_harbor_animal_1  = "Metal Harbor - 1 Animal"
-metal_harbor_animal_2  = "Metal Harbor - 2 Animals"
-metal_harbor_animal_3  = "Metal Harbor - 3 Animals"
-metal_harbor_animal_4  = "Metal Harbor - 4 Animals"
-metal_harbor_animal_5  = "Metal Harbor - 5 Animals"
-metal_harbor_animal_6  = "Metal Harbor - 6 Animals"
-metal_harbor_animal_7  = "Metal Harbor - 7 Animals"
-metal_harbor_animal_8  = "Metal Harbor - 8 Animals"
-metal_harbor_animal_9  = "Metal Harbor - 9 Animals"
-metal_harbor_animal_10 = "Metal Harbor - 10 Animals"
-metal_harbor_animal_11 = "Metal Harbor - 11 Animals"
-metal_harbor_animal_12 = "Metal Harbor - 12 Animals"
-metal_harbor_animal_13 = "Metal Harbor - 13 Animals"
-metal_harbor_animal_14 = "Metal Harbor - 14 Animals"
-metal_harbor_upgrade   = "Metal Harbor - Upgrade"
-green_forest_1         = "Green Forest - 1"
-green_forest_2         = "Green Forest - 2"
-green_forest_3         = "Green Forest - 3"
-green_forest_4         = "Green Forest - 4"
-green_forest_5         = "Green Forest - 5"
-green_forest_chao_1    = "Green Forest - Chao Key 1"
-green_forest_chao_2    = "Green Forest - Chao Key 2"
-green_forest_chao_3    = "Green Forest - Chao Key 3"
-green_forest_pipe_1    = "Green Forest - Pipe 1"
-green_forest_pipe_2    = "Green Forest - Pipe 2"
-green_forest_hidden_1  = "Green Forest - Hidden 1"
-green_forest_hidden_2  = "Green Forest - Hidden 2"
-green_forest_hidden_3  = "Green Forest - Hidden 3"
-green_forest_hidden_4  = "Green Forest - Hidden 4"
-green_forest_beetle    = "Green Forest - Gold Beetle"
-green_forest_animal_1  = "Green Forest - 1 Animal"
-green_forest_animal_2  = "Green Forest - 2 Animals"
-green_forest_animal_3  = "Green Forest - 3 Animals"
-green_forest_animal_4  = "Green Forest - 4 Animals"
-green_forest_animal_5  = "Green Forest - 5 Animals"
-green_forest_animal_6  = "Green Forest - 6 Animals"
-green_forest_animal_7  = "Green Forest - 7 Animals"
-green_forest_animal_8  = "Green Forest - 8 Animals"
-green_forest_animal_9  = "Green Forest - 9 Animals"
-green_forest_animal_10 = "Green Forest - 10 Animals"
-green_forest_animal_11 = "Green Forest - 11 Animals"
-green_forest_animal_12 = "Green Forest - 12 Animals"
-green_forest_animal_13 = "Green Forest - 13 Animals"
-green_forest_animal_14 = "Green Forest - 14 Animals"
-green_forest_animal_15 = "Green Forest - 15 Animals"
-green_forest_animal_16 = "Green Forest - 16 Animals"
-green_forest_animal_17 = "Green Forest - 17 Animals"
-green_forest_animal_18 = "Green Forest - 18 Animals"
-green_forest_upgrade   = "Green Forest - Upgrade"
-pyramid_cave_1         = "Pyramid Cave - 1"
-pyramid_cave_2         = "Pyramid Cave - 2"
-pyramid_cave_3         = "Pyramid Cave - 3"
-pyramid_cave_4         = "Pyramid Cave - 4"
-pyramid_cave_5         = "Pyramid Cave - 5"
-pyramid_cave_chao_1    = "Pyramid Cave - Chao Key 1"
-pyramid_cave_chao_2    = "Pyramid Cave - Chao Key 2"
-pyramid_cave_chao_3    = "Pyramid Cave - Chao Key 3"
-pyramid_cave_pipe_1    = "Pyramid Cave - Pipe 1"
-pyramid_cave_pipe_2    = "Pyramid Cave - Pipe 2"
-pyramid_cave_pipe_3    = "Pyramid Cave - Pipe 3"
-pyramid_cave_pipe_4    = "Pyramid Cave - Pipe 4"
-pyramid_cave_omo_1     = "Pyramid Cave - Omochao 1"
-pyramid_cave_omo_2     = "Pyramid Cave - Omochao 2"
-pyramid_cave_omo_3     = "Pyramid Cave - Omochao 3"
-pyramid_cave_omo_4     = "Pyramid Cave - Omochao 4"
-pyramid_cave_beetle    = "Pyramid Cave - Gold Beetle"
-pyramid_cave_animal_1  = "Pyramid Cave - 1 Animal"
-pyramid_cave_animal_2  = "Pyramid Cave - 2 Animals"
-pyramid_cave_animal_3  = "Pyramid Cave - 3 Animals"
-pyramid_cave_animal_4  = "Pyramid Cave - 4 Animals"
-pyramid_cave_animal_5  = "Pyramid Cave - 5 Animals"
-pyramid_cave_animal_6  = "Pyramid Cave - 6 Animals"
-pyramid_cave_animal_7  = "Pyramid Cave - 7 Animals"
-pyramid_cave_animal_8  = "Pyramid Cave - 8 Animals"
-pyramid_cave_animal_9  = "Pyramid Cave - 9 Animals"
-pyramid_cave_animal_10 = "Pyramid Cave - 10 Animals"
-pyramid_cave_animal_11 = "Pyramid Cave - 11 Animals"
-pyramid_cave_animal_12 = "Pyramid Cave - 12 Animals"
-pyramid_cave_animal_13 = "Pyramid Cave - 13 Animals"
-pyramid_cave_animal_14 = "Pyramid Cave - 14 Animals"
-pyramid_cave_animal_15 = "Pyramid Cave - 15 Animals"
-pyramid_cave_animal_16 = "Pyramid Cave - 16 Animals"
-pyramid_cave_animal_17 = "Pyramid Cave - 17 Animals"
-pyramid_cave_animal_18 = "Pyramid Cave - 18 Animals"
-pyramid_cave_animal_19 = "Pyramid Cave - 19 Animals"
-pyramid_cave_upgrade   = "Pyramid Cave - Upgrade"
-crazy_gadget_1         = "Crazy Gadget - 1"
-crazy_gadget_2         = "Crazy Gadget - 2"
-crazy_gadget_3         = "Crazy Gadget - 3"
-crazy_gadget_4         = "Crazy Gadget - 4"
-crazy_gadget_5         = "Crazy Gadget - 5"
-crazy_gadget_chao_1    = "Crazy Gadget - Chao Key 1"
-crazy_gadget_chao_2    = "Crazy Gadget - Chao Key 2"
-crazy_gadget_chao_3    = "Crazy Gadget - Chao Key 3"
-crazy_gadget_pipe_1    = "Crazy Gadget - Pipe 1"
-crazy_gadget_pipe_2    = "Crazy Gadget - Pipe 2"
-crazy_gadget_pipe_3    = "Crazy Gadget - Pipe 3"
-crazy_gadget_pipe_4    = "Crazy Gadget - Pipe 4"
-crazy_gadget_hidden_1  = "Crazy Gadget - Hidden 1"
-crazy_gadget_omo_1     = "Crazy Gadget - Omochao 1"
-crazy_gadget_omo_2     = "Crazy Gadget - Omochao 2"
-crazy_gadget_omo_3     = "Crazy Gadget - Omochao 3"
-crazy_gadget_omo_4     = "Crazy Gadget - Omochao 4"
-crazy_gadget_omo_5     = "Crazy Gadget - Omochao 5"
-crazy_gadget_omo_6     = "Crazy Gadget - Omochao 6"
-crazy_gadget_omo_7     = "Crazy Gadget - Omochao 7"
-crazy_gadget_omo_8     = "Crazy Gadget - Omochao 8"
-crazy_gadget_omo_9     = "Crazy Gadget - Omochao 9"
-crazy_gadget_omo_10    = "Crazy Gadget - Omochao 10"
-crazy_gadget_omo_11    = "Crazy Gadget - Omochao 11"
-crazy_gadget_omo_12    = "Crazy Gadget - Omochao 12"
-crazy_gadget_omo_13    = "Crazy Gadget - Omochao 13"
-crazy_gadget_beetle    = "Crazy Gadget - Gold Beetle"
-crazy_gadget_animal_1  = "Crazy Gadget - 1 Animal"
-crazy_gadget_animal_2  = "Crazy Gadget - 2 Animals"
-crazy_gadget_animal_3  = "Crazy Gadget - 3 Animals"
-crazy_gadget_animal_4  = "Crazy Gadget - 4 Animals"
-crazy_gadget_animal_5  = "Crazy Gadget - 5 Animals"
-crazy_gadget_animal_6  = "Crazy Gadget - 6 Animals"
-crazy_gadget_animal_7  = "Crazy Gadget - 7 Animals"
-crazy_gadget_animal_8  = "Crazy Gadget - 8 Animals"
-crazy_gadget_animal_9  = "Crazy Gadget - 9 Animals"
-crazy_gadget_animal_10 = "Crazy Gadget - 10 Animals"
-crazy_gadget_animal_11 = "Crazy Gadget - 11 Animals"
-crazy_gadget_animal_12 = "Crazy Gadget - 12 Animals"
-crazy_gadget_animal_13 = "Crazy Gadget - 13 Animals"
-crazy_gadget_animal_14 = "Crazy Gadget - 14 Animals"
-crazy_gadget_animal_15 = "Crazy Gadget - 15 Animals"
-crazy_gadget_animal_16 = "Crazy Gadget - 16 Animals"
-crazy_gadget_upgrade   = "Crazy Gadget - Upgrade"
-final_rush_1           = "Final Rush - 1"
-final_rush_2           = "Final Rush - 2"
-final_rush_3           = "Final Rush - 3"
-final_rush_4           = "Final Rush - 4"
-final_rush_5           = "Final Rush - 5"
-final_rush_chao_1      = "Final Rush - Chao Key 1"
-final_rush_chao_2      = "Final Rush - Chao Key 2"
-final_rush_chao_3      = "Final Rush - Chao Key 3"
-final_rush_pipe_1      = "Final Rush - Pipe 1"
-final_rush_pipe_2      = "Final Rush - Pipe 2"
-final_rush_omo_1       = "Final Rush - Omochao 1"
-final_rush_omo_2       = "Final Rush - Omochao 2"
-final_rush_omo_3       = "Final Rush - Omochao 3"
-final_rush_beetle      = "Final Rush - Gold Beetle"
-final_rush_animal_1    = "Final Rush - 1 Animal"
-final_rush_animal_2    = "Final Rush - 2 Animals"
-final_rush_animal_3    = "Final Rush - 3 Animals"
-final_rush_animal_4    = "Final Rush - 4 Animals"
-final_rush_animal_5    = "Final Rush - 5 Animals"
-final_rush_animal_6    = "Final Rush - 6 Animals"
-final_rush_animal_7    = "Final Rush - 7 Animals"
-final_rush_animal_8    = "Final Rush - 8 Animals"
-final_rush_animal_9    = "Final Rush - 9 Animals"
-final_rush_animal_10   = "Final Rush - 10 Animals"
-final_rush_animal_11   = "Final Rush - 11 Animals"
-final_rush_animal_12   = "Final Rush - 12 Animals"
-final_rush_animal_13   = "Final Rush - 13 Animals"
-final_rush_animal_14   = "Final Rush - 14 Animals"
-final_rush_animal_15   = "Final Rush - 15 Animals"
-final_rush_animal_16   = "Final Rush - 16 Animals"
-final_rush_upgrade     = "Final Rush - Upgrade"
+city_escape_1           = "City Escape - 1"
+city_escape_2           = "City Escape - 2"
+city_escape_3           = "City Escape - 3"
+city_escape_4           = "City Escape - 4"
+city_escape_5           = "City Escape - 5"
+city_escape_chao_1      = "City Escape - Chao Key 1"
+city_escape_chao_2      = "City Escape - Chao Key 2"
+city_escape_chao_3      = "City Escape - Chao Key 3"
+city_escape_pipe_1      = "City Escape - Pipe 1"
+city_escape_pipe_2      = "City Escape - Pipe 2"
+city_escape_pipe_3      = "City Escape - Pipe 3"
+city_escape_pipe_4      = "City Escape - Pipe 4"
+city_escape_hidden_1    = "City Escape - Hidden 1"
+city_escape_hidden_2    = "City Escape - Hidden 2"
+city_escape_hidden_3    = "City Escape - Hidden 3"
+city_escape_hidden_4    = "City Escape - Hidden 4"
+city_escape_hidden_5    = "City Escape - Hidden 5"
+city_escape_omo_1       = "City Escape - Omochao 1"
+city_escape_omo_2       = "City Escape - Omochao 2"
+city_escape_omo_3       = "City Escape - Omochao 3"
+city_escape_omo_4       = "City Escape - Omochao 4"
+city_escape_omo_5       = "City Escape - Omochao 5"
+city_escape_omo_6       = "City Escape - Omochao 6"
+city_escape_omo_7       = "City Escape - Omochao 7"
+city_escape_omo_8       = "City Escape - Omochao 8"
+city_escape_omo_9       = "City Escape - Omochao 9"
+city_escape_omo_10      = "City Escape - Omochao 10"
+city_escape_omo_11      = "City Escape - Omochao 11"
+city_escape_omo_12      = "City Escape - Omochao 12"
+city_escape_omo_13      = "City Escape - Omochao 13"
+city_escape_omo_14      = "City Escape - Omochao 14"
+city_escape_beetle      = "City Escape - Gold Beetle"
+city_escape_animal_1    = "City Escape - 1 Animal"
+city_escape_animal_2    = "City Escape - 2 Animals"
+city_escape_animal_3    = "City Escape - 3 Animals"
+city_escape_animal_4    = "City Escape - 4 Animals"
+city_escape_animal_5    = "City Escape - 5 Animals"
+city_escape_animal_6    = "City Escape - 6 Animals"
+city_escape_animal_7    = "City Escape - 7 Animals"
+city_escape_animal_8    = "City Escape - 8 Animals"
+city_escape_animal_9    = "City Escape - 9 Animals"
+city_escape_animal_10   = "City Escape - 10 Animals"
+city_escape_animal_11   = "City Escape - 11 Animals"
+city_escape_animal_12   = "City Escape - 12 Animals"
+city_escape_animal_13   = "City Escape - 13 Animals"
+city_escape_animal_14   = "City Escape - 14 Animals"
+city_escape_animal_15   = "City Escape - 15 Animals"
+city_escape_animal_16   = "City Escape - 16 Animals"
+city_escape_animal_17   = "City Escape - 17 Animals"
+city_escape_animal_18   = "City Escape - 18 Animals"
+city_escape_animal_19   = "City Escape - 19 Animals"
+city_escape_animal_20   = "City Escape - 20 Animals"
+city_escape_lifebox_1   = "City Escape - Extra Life Box 1"
+city_escape_lifebox_2   = "City Escape - Extra Life Box 2"
+city_escape_itembox_1   = "City Escape - Item Box 1"
+city_escape_itembox_2   = "City Escape - Item Box 2"
+city_escape_itembox_3   = "City Escape - Item Box 3"
+city_escape_itembox_4   = "City Escape - Item Box 4"
+city_escape_itembox_5   = "City Escape - Item Box 5"
+city_escape_itembox_6   = "City Escape - Item Box 6"
+city_escape_itembox_7   = "City Escape - Item Box 7"
+city_escape_itembox_8   = "City Escape - Item Box 8"
+city_escape_itembox_9   = "City Escape - Item Box 9"
+city_escape_big         = "City Escape - Big"
+city_escape_upgrade     = "City Escape - Upgrade"
+metal_harbor_1          = "Metal Harbor - 1"
+metal_harbor_2          = "Metal Harbor - 2"
+metal_harbor_3          = "Metal Harbor - 3"
+metal_harbor_4          = "Metal Harbor - 4"
+metal_harbor_5          = "Metal Harbor - 5"
+metal_harbor_chao_1     = "Metal Harbor - Chao Key 1"
+metal_harbor_chao_2     = "Metal Harbor - Chao Key 2"
+metal_harbor_chao_3     = "Metal Harbor - Chao Key 3"
+metal_harbor_pipe_1     = "Metal Harbor - Pipe 1"
+metal_harbor_omo_1      = "Metal Harbor - Omochao 1"
+metal_harbor_omo_2      = "Metal Harbor - Omochao 2"
+metal_harbor_omo_3      = "Metal Harbor - Omochao 3"
+metal_harbor_omo_4      = "Metal Harbor - Omochao 4"
+metal_harbor_omo_5      = "Metal Harbor - Omochao 5"
+metal_harbor_beetle     = "Metal Harbor - Gold Beetle"
+metal_harbor_animal_1   = "Metal Harbor - 1 Animal"
+metal_harbor_animal_2   = "Metal Harbor - 2 Animals"
+metal_harbor_animal_3   = "Metal Harbor - 3 Animals"
+metal_harbor_animal_4   = "Metal Harbor - 4 Animals"
+metal_harbor_animal_5   = "Metal Harbor - 5 Animals"
+metal_harbor_animal_6   = "Metal Harbor - 6 Animals"
+metal_harbor_animal_7   = "Metal Harbor - 7 Animals"
+metal_harbor_animal_8   = "Metal Harbor - 8 Animals"
+metal_harbor_animal_9   = "Metal Harbor - 9 Animals"
+metal_harbor_animal_10  = "Metal Harbor - 10 Animals"
+metal_harbor_animal_11  = "Metal Harbor - 11 Animals"
+metal_harbor_animal_12  = "Metal Harbor - 12 Animals"
+metal_harbor_animal_13  = "Metal Harbor - 13 Animals"
+metal_harbor_animal_14  = "Metal Harbor - 14 Animals"
+metal_harbor_lifebox_1  = "Metal Harbor - Extra Life Box 1"
+metal_harbor_lifebox_2  = "Metal Harbor - Extra Life Box 2"
+metal_harbor_lifebox_3  = "Metal Harbor - Extra Life Box 3"
+metal_harbor_itembox_1  = "Metal Harbor - Item Box 1"
+metal_harbor_itembox_2  = "Metal Harbor - Item Box 2"
+metal_harbor_itembox_3  = "Metal Harbor - Item Box 3"
+metal_harbor_itembox_4  = "Metal Harbor - Item Box 4"
+metal_harbor_itembox_5  = "Metal Harbor - Item Box 5"
+metal_harbor_big        = "Metal Harbor - Big"
+metal_harbor_upgrade    = "Metal Harbor - Upgrade"
+green_forest_1          = "Green Forest - 1"
+green_forest_2          = "Green Forest - 2"
+green_forest_3          = "Green Forest - 3"
+green_forest_4          = "Green Forest - 4"
+green_forest_5          = "Green Forest - 5"
+green_forest_chao_1     = "Green Forest - Chao Key 1"
+green_forest_chao_2     = "Green Forest - Chao Key 2"
+green_forest_chao_3     = "Green Forest - Chao Key 3"
+green_forest_pipe_1     = "Green Forest - Pipe 1"
+green_forest_pipe_2     = "Green Forest - Pipe 2"
+green_forest_hidden_1   = "Green Forest - Hidden 1"
+green_forest_hidden_2   = "Green Forest - Hidden 2"
+green_forest_hidden_3   = "Green Forest - Hidden 3"
+green_forest_hidden_4   = "Green Forest - Hidden 4"
+green_forest_beetle     = "Green Forest - Gold Beetle"
+green_forest_animal_1   = "Green Forest - 1 Animal"
+green_forest_animal_2   = "Green Forest - 2 Animals"
+green_forest_animal_3   = "Green Forest - 3 Animals"
+green_forest_animal_4   = "Green Forest - 4 Animals"
+green_forest_animal_5   = "Green Forest - 5 Animals"
+green_forest_animal_6   = "Green Forest - 6 Animals"
+green_forest_animal_7   = "Green Forest - 7 Animals"
+green_forest_animal_8   = "Green Forest - 8 Animals"
+green_forest_animal_9   = "Green Forest - 9 Animals"
+green_forest_animal_10  = "Green Forest - 10 Animals"
+green_forest_animal_11  = "Green Forest - 11 Animals"
+green_forest_animal_12  = "Green Forest - 12 Animals"
+green_forest_animal_13  = "Green Forest - 13 Animals"
+green_forest_animal_14  = "Green Forest - 14 Animals"
+green_forest_animal_15  = "Green Forest - 15 Animals"
+green_forest_animal_16  = "Green Forest - 16 Animals"
+green_forest_animal_17  = "Green Forest - 17 Animals"
+green_forest_animal_18  = "Green Forest - 18 Animals"
+green_forest_lifebox_1  = "Green Forest - Extra Life Box 1"
+green_forest_lifebox_2  = "Green Forest - Extra Life Box 2"
+green_forest_lifebox_3  = "Green Forest - Extra Life Box 3"
+green_forest_lifebox_4  = "Green Forest - Extra Life Box 4"
+green_forest_itembox_1  = "Green Forest - Item Box 1"
+green_forest_itembox_2  = "Green Forest - Item Box 2"
+green_forest_itembox_3  = "Green Forest - Item Box 3"
+green_forest_itembox_4  = "Green Forest - Item Box 4"
+green_forest_itembox_5  = "Green Forest - Item Box 5"
+green_forest_itembox_6  = "Green Forest - Item Box 6"
+green_forest_itembox_7  = "Green Forest - Item Box 7"
+green_forest_itembox_8  = "Green Forest - Item Box 8"
+green_forest_itembox_9  = "Green Forest - Item Box 9"
+green_forest_itembox_10 = "Green Forest - Item Box 10"
+green_forest_itembox_11 = "Green Forest - Item Box 11"
+green_forest_itembox_12 = "Green Forest - Item Box 12"
+green_forest_itembox_13 = "Green Forest - Item Box 13"
+green_forest_big        = "Green Forest - Big"
+green_forest_upgrade    = "Green Forest - Upgrade"
+pyramid_cave_1          = "Pyramid Cave - 1"
+pyramid_cave_2          = "Pyramid Cave - 2"
+pyramid_cave_3          = "Pyramid Cave - 3"
+pyramid_cave_4          = "Pyramid Cave - 4"
+pyramid_cave_5          = "Pyramid Cave - 5"
+pyramid_cave_chao_1     = "Pyramid Cave - Chao Key 1"
+pyramid_cave_chao_2     = "Pyramid Cave - Chao Key 2"
+pyramid_cave_chao_3     = "Pyramid Cave - Chao Key 3"
+pyramid_cave_pipe_1     = "Pyramid Cave - Pipe 1"
+pyramid_cave_pipe_2     = "Pyramid Cave - Pipe 2"
+pyramid_cave_pipe_3     = "Pyramid Cave - Pipe 3"
+pyramid_cave_pipe_4     = "Pyramid Cave - Pipe 4"
+pyramid_cave_omo_1      = "Pyramid Cave - Omochao 1"
+pyramid_cave_omo_2      = "Pyramid Cave - Omochao 2"
+pyramid_cave_omo_3      = "Pyramid Cave - Omochao 3"
+pyramid_cave_omo_4      = "Pyramid Cave - Omochao 4"
+pyramid_cave_beetle     = "Pyramid Cave - Gold Beetle"
+pyramid_cave_animal_1   = "Pyramid Cave - 1 Animal"
+pyramid_cave_animal_2   = "Pyramid Cave - 2 Animals"
+pyramid_cave_animal_3   = "Pyramid Cave - 3 Animals"
+pyramid_cave_animal_4   = "Pyramid Cave - 4 Animals"
+pyramid_cave_animal_5   = "Pyramid Cave - 5 Animals"
+pyramid_cave_animal_6   = "Pyramid Cave - 6 Animals"
+pyramid_cave_animal_7   = "Pyramid Cave - 7 Animals"
+pyramid_cave_animal_8   = "Pyramid Cave - 8 Animals"
+pyramid_cave_animal_9   = "Pyramid Cave - 9 Animals"
+pyramid_cave_animal_10  = "Pyramid Cave - 10 Animals"
+pyramid_cave_animal_11  = "Pyramid Cave - 11 Animals"
+pyramid_cave_animal_12  = "Pyramid Cave - 12 Animals"
+pyramid_cave_animal_13  = "Pyramid Cave - 13 Animals"
+pyramid_cave_animal_14  = "Pyramid Cave - 14 Animals"
+pyramid_cave_animal_15  = "Pyramid Cave - 15 Animals"
+pyramid_cave_animal_16  = "Pyramid Cave - 16 Animals"
+pyramid_cave_animal_17  = "Pyramid Cave - 17 Animals"
+pyramid_cave_animal_18  = "Pyramid Cave - 18 Animals"
+pyramid_cave_animal_19  = "Pyramid Cave - 19 Animals"
+pyramid_cave_lifebox_1  = "Pyramid Cave - Extra Life Box 1"
+pyramid_cave_lifebox_2  = "Pyramid Cave - Extra Life Box 2"
+pyramid_cave_lifebox_3  = "Pyramid Cave - Extra Life Box 3"
+pyramid_cave_lifebox_4  = "Pyramid Cave - Extra Life Box 4"
+pyramid_cave_lifebox_5  = "Pyramid Cave - Extra Life Box 5"
+pyramid_cave_lifebox_6  = "Pyramid Cave - Extra Life Box 6"
+pyramid_cave_lifebox_7  = "Pyramid Cave - Extra Life Box 7"
+pyramid_cave_itembox_1  = "Pyramid Cave - Item Box 1"
+pyramid_cave_itembox_2  = "Pyramid Cave - Item Box 2"
+pyramid_cave_itembox_3  = "Pyramid Cave - Item Box 3"
+pyramid_cave_itembox_4  = "Pyramid Cave - Item Box 4"
+pyramid_cave_itembox_5  = "Pyramid Cave - Item Box 5"
+pyramid_cave_itembox_6  = "Pyramid Cave - Item Box 6"
+pyramid_cave_itembox_7  = "Pyramid Cave - Item Box 7"
+pyramid_cave_itembox_8  = "Pyramid Cave - Item Box 8"
+pyramid_cave_itembox_9  = "Pyramid Cave - Item Box 9"
+pyramid_cave_itembox_10 = "Pyramid Cave - Item Box 10"
+pyramid_cave_itembox_11 = "Pyramid Cave - Item Box 11"
+pyramid_cave_itembox_12 = "Pyramid Cave - Item Box 12"
+pyramid_cave_itembox_13 = "Pyramid Cave - Item Box 13"
+pyramid_cave_itembox_14 = "Pyramid Cave - Item Box 14"
+pyramid_cave_itembox_15 = "Pyramid Cave - Item Box 15"
+pyramid_cave_big        = "Pyramid Cave - Big"
+pyramid_cave_upgrade    = "Pyramid Cave - Upgrade"
+crazy_gadget_1          = "Crazy Gadget - 1"
+crazy_gadget_2          = "Crazy Gadget - 2"
+crazy_gadget_3          = "Crazy Gadget - 3"
+crazy_gadget_4          = "Crazy Gadget - 4"
+crazy_gadget_5          = "Crazy Gadget - 5"
+crazy_gadget_chao_1     = "Crazy Gadget - Chao Key 1"
+crazy_gadget_chao_2     = "Crazy Gadget - Chao Key 2"
+crazy_gadget_chao_3     = "Crazy Gadget - Chao Key 3"
+crazy_gadget_pipe_1     = "Crazy Gadget - Pipe 1"
+crazy_gadget_pipe_2     = "Crazy Gadget - Pipe 2"
+crazy_gadget_pipe_3     = "Crazy Gadget - Pipe 3"
+crazy_gadget_pipe_4     = "Crazy Gadget - Pipe 4"
+crazy_gadget_hidden_1   = "Crazy Gadget - Hidden 1"
+crazy_gadget_omo_1      = "Crazy Gadget - Omochao 1"
+crazy_gadget_omo_2      = "Crazy Gadget - Omochao 2"
+crazy_gadget_omo_3      = "Crazy Gadget - Omochao 3"
+crazy_gadget_omo_4      = "Crazy Gadget - Omochao 4"
+crazy_gadget_omo_5      = "Crazy Gadget - Omochao 5"
+crazy_gadget_omo_6      = "Crazy Gadget - Omochao 6"
+crazy_gadget_omo_7      = "Crazy Gadget - Omochao 7"
+crazy_gadget_omo_8      = "Crazy Gadget - Omochao 8"
+crazy_gadget_omo_9      = "Crazy Gadget - Omochao 9"
+crazy_gadget_omo_10     = "Crazy Gadget - Omochao 10"
+crazy_gadget_omo_11     = "Crazy Gadget - Omochao 11"
+crazy_gadget_omo_12     = "Crazy Gadget - Omochao 12"
+crazy_gadget_omo_13     = "Crazy Gadget - Omochao 13"
+crazy_gadget_beetle     = "Crazy Gadget - Gold Beetle"
+crazy_gadget_animal_1   = "Crazy Gadget - 1 Animal"
+crazy_gadget_animal_2   = "Crazy Gadget - 2 Animals"
+crazy_gadget_animal_3   = "Crazy Gadget - 3 Animals"
+crazy_gadget_animal_4   = "Crazy Gadget - 4 Animals"
+crazy_gadget_animal_5   = "Crazy Gadget - 5 Animals"
+crazy_gadget_animal_6   = "Crazy Gadget - 6 Animals"
+crazy_gadget_animal_7   = "Crazy Gadget - 7 Animals"
+crazy_gadget_animal_8   = "Crazy Gadget - 8 Animals"
+crazy_gadget_animal_9   = "Crazy Gadget - 9 Animals"
+crazy_gadget_animal_10  = "Crazy Gadget - 10 Animals"
+crazy_gadget_animal_11  = "Crazy Gadget - 11 Animals"
+crazy_gadget_animal_12  = "Crazy Gadget - 12 Animals"
+crazy_gadget_animal_13  = "Crazy Gadget - 13 Animals"
+crazy_gadget_animal_14  = "Crazy Gadget - 14 Animals"
+crazy_gadget_animal_15  = "Crazy Gadget - 15 Animals"
+crazy_gadget_animal_16  = "Crazy Gadget - 16 Animals"
+crazy_gadget_lifebox_1  = "Crazy Gadget - Extra Life Box 1"
+crazy_gadget_lifebox_2  = "Crazy Gadget - Extra Life Box 2"
+crazy_gadget_lifebox_3  = "Crazy Gadget - Extra Life Box 3"
+crazy_gadget_lifebox_4  = "Crazy Gadget - Extra Life Box 4"
+crazy_gadget_itembox_1  = "Crazy Gadget - Item Box 1"
+crazy_gadget_itembox_2  = "Crazy Gadget - Item Box 2"
+crazy_gadget_itembox_3  = "Crazy Gadget - Item Box 3"
+crazy_gadget_itembox_4  = "Crazy Gadget - Item Box 4"
+crazy_gadget_itembox_5  = "Crazy Gadget - Item Box 5"
+crazy_gadget_itembox_6  = "Crazy Gadget - Item Box 6"
+crazy_gadget_itembox_7  = "Crazy Gadget - Item Box 7"
+crazy_gadget_itembox_8  = "Crazy Gadget - Item Box 8"
+crazy_gadget_itembox_9  = "Crazy Gadget - Item Box 9"
+crazy_gadget_itembox_10 = "Crazy Gadget - Item Box 10"
+crazy_gadget_itembox_11 = "Crazy Gadget - Item Box 11"
+crazy_gadget_itembox_12 = "Crazy Gadget - Item Box 12"
+crazy_gadget_itembox_13 = "Crazy Gadget - Item Box 13"
+crazy_gadget_itembox_14 = "Crazy Gadget - Item Box 14"
+crazy_gadget_big        = "Crazy Gadget - Big"
+crazy_gadget_upgrade    = "Crazy Gadget - Upgrade"
+final_rush_1            = "Final Rush - 1"
+final_rush_2            = "Final Rush - 2"
+final_rush_3            = "Final Rush - 3"
+final_rush_4            = "Final Rush - 4"
+final_rush_5            = "Final Rush - 5"
+final_rush_chao_1       = "Final Rush - Chao Key 1"
+final_rush_chao_2       = "Final Rush - Chao Key 2"
+final_rush_chao_3       = "Final Rush - Chao Key 3"
+final_rush_pipe_1       = "Final Rush - Pipe 1"
+final_rush_pipe_2       = "Final Rush - Pipe 2"
+final_rush_omo_1        = "Final Rush - Omochao 1"
+final_rush_omo_2        = "Final Rush - Omochao 2"
+final_rush_omo_3        = "Final Rush - Omochao 3"
+final_rush_beetle       = "Final Rush - Gold Beetle"
+final_rush_animal_1     = "Final Rush - 1 Animal"
+final_rush_animal_2     = "Final Rush - 2 Animals"
+final_rush_animal_3     = "Final Rush - 3 Animals"
+final_rush_animal_4     = "Final Rush - 4 Animals"
+final_rush_animal_5     = "Final Rush - 5 Animals"
+final_rush_animal_6     = "Final Rush - 6 Animals"
+final_rush_animal_7     = "Final Rush - 7 Animals"
+final_rush_animal_8     = "Final Rush - 8 Animals"
+final_rush_animal_9     = "Final Rush - 9 Animals"
+final_rush_animal_10    = "Final Rush - 10 Animals"
+final_rush_animal_11    = "Final Rush - 11 Animals"
+final_rush_animal_12    = "Final Rush - 12 Animals"
+final_rush_animal_13    = "Final Rush - 13 Animals"
+final_rush_animal_14    = "Final Rush - 14 Animals"
+final_rush_animal_15    = "Final Rush - 15 Animals"
+final_rush_animal_16    = "Final Rush - 16 Animals"
+final_rush_lifebox_1    = "Final Rush - Extra Life Box 1"
+final_rush_lifebox_2    = "Final Rush - Extra Life Box 2"
+final_rush_lifebox_3    = "Final Rush - Extra Life Box 3"
+final_rush_lifebox_4    = "Final Rush - Extra Life Box 4"
+final_rush_lifebox_5    = "Final Rush - Extra Life Box 5"
+final_rush_lifebox_6    = "Final Rush - Extra Life Box 6"
+final_rush_lifebox_7    = "Final Rush - Extra Life Box 7"
+final_rush_lifebox_8    = "Final Rush - Extra Life Box 8"
+final_rush_lifebox_9    = "Final Rush - Extra Life Box 9"
+final_rush_lifebox_10   = "Final Rush - Extra Life Box 10"
+final_rush_lifebox_11   = "Final Rush - Extra Life Box 11"
+final_rush_lifebox_12   = "Final Rush - Extra Life Box 12"
+final_rush_lifebox_13   = "Final Rush - Extra Life Box 13"
+final_rush_itembox_1    = "Final Rush - Item Box 1"
+final_rush_itembox_2    = "Final Rush - Item Box 2"
+final_rush_itembox_3    = "Final Rush - Item Box 3"
+final_rush_itembox_4    = "Final Rush - Item Box 4"
+final_rush_itembox_5    = "Final Rush - Item Box 5"
+final_rush_itembox_6    = "Final Rush - Item Box 6"
+final_rush_itembox_7    = "Final Rush - Item Box 7"
+final_rush_itembox_8    = "Final Rush - Item Box 8"
+final_rush_itembox_9    = "Final Rush - Item Box 9"
+final_rush_itembox_10   = "Final Rush - Item Box 10"
+final_rush_itembox_11   = "Final Rush - Item Box 11"
+final_rush_itembox_12   = "Final Rush - Item Box 12"
+final_rush_itembox_13   = "Final Rush - Item Box 13"
+final_rush_itembox_14   = "Final Rush - Item Box 14"
+final_rush_itembox_15   = "Final Rush - Item Box 15"
+final_rush_itembox_16   = "Final Rush - Item Box 16"
+final_rush_itembox_17   = "Final Rush - Item Box 17"
+final_rush_itembox_18   = "Final Rush - Item Box 18"
+final_rush_itembox_19   = "Final Rush - Item Box 19"
+final_rush_itembox_20   = "Final Rush - Item Box 20"
+final_rush_itembox_21   = "Final Rush - Item Box 21"
+final_rush_itembox_22   = "Final Rush - Item Box 22"
+final_rush_itembox_23   = "Final Rush - Item Box 23"
+final_rush_itembox_24   = "Final Rush - Item Box 24"
+final_rush_itembox_25   = "Final Rush - Item Box 25"
+final_rush_itembox_26   = "Final Rush - Item Box 26"
+final_rush_itembox_27   = "Final Rush - Item Box 27"
+final_rush_itembox_28   = "Final Rush - Item Box 28"
+final_rush_itembox_29   = "Final Rush - Item Box 29"
+final_rush_itembox_30   = "Final Rush - Item Box 30"
+final_rush_itembox_31   = "Final Rush - Item Box 31"
+final_rush_itembox_32   = "Final Rush - Item Box 32"
+final_rush_itembox_33   = "Final Rush - Item Box 33"
+final_rush_itembox_34   = "Final Rush - Item Box 34"
+final_rush_itembox_35   = "Final Rush - Item Box 35"
+final_rush_itembox_36   = "Final Rush - Item Box 36"
+final_rush_itembox_37   = "Final Rush - Item Box 37"
+final_rush_itembox_38   = "Final Rush - Item Box 38"
+final_rush_itembox_39   = "Final Rush - Item Box 39"
+final_rush_itembox_40   = "Final Rush - Item Box 40"
+final_rush_big          = "Final Rush - Big"
+final_rush_upgrade      = "Final Rush - Upgrade"
 
 # Tails Mission Definitions
-prison_lane_1            = "Prison Lane - 1"
-prison_lane_2            = "Prison Lane - 2"
-prison_lane_3            = "Prison Lane - 3"
-prison_lane_4            = "Prison Lane - 4"
-prison_lane_5            = "Prison Lane - 5"
-prison_lane_chao_1       = "Prison Lane - Chao Key 1"
-prison_lane_chao_2       = "Prison Lane - Chao Key 2"
-prison_lane_chao_3       = "Prison Lane - Chao Key 3"
-prison_lane_pipe_1       = "Prison Lane - Pipe 1"
-prison_lane_pipe_2       = "Prison Lane - Pipe 2"
-prison_lane_pipe_3       = "Prison Lane - Pipe 3"
-prison_lane_hidden_1     = "Prison Lane - Hidden 1"
-prison_lane_hidden_2     = "Prison Lane - Hidden 2"
-prison_lane_hidden_3     = "Prison Lane - Hidden 3"
-prison_lane_omo_1        = "Prison Lane - Omochao 1"
-prison_lane_omo_2        = "Prison Lane - Omochao 2"
-prison_lane_omo_3        = "Prison Lane - Omochao 3"
-prison_lane_omo_4        = "Prison Lane - Omochao 4"
-prison_lane_omo_5        = "Prison Lane - Omochao 5"
-prison_lane_omo_6        = "Prison Lane - Omochao 6"
-prison_lane_omo_7        = "Prison Lane - Omochao 7"
-prison_lane_omo_8        = "Prison Lane - Omochao 8"
-prison_lane_omo_9        = "Prison Lane - Omochao 9"
-prison_lane_omo_10       = "Prison Lane - Omochao 10"
-prison_lane_beetle       = "Prison Lane - Gold Beetle"
-prison_lane_animal_1     = "Prison Lane - 1 Animal"
-prison_lane_animal_2     = "Prison Lane - 2 Animals"
-prison_lane_animal_3     = "Prison Lane - 3 Animals"
-prison_lane_animal_4     = "Prison Lane - 4 Animals"
-prison_lane_animal_5     = "Prison Lane - 5 Animals"
-prison_lane_animal_6     = "Prison Lane - 6 Animals"
-prison_lane_animal_7     = "Prison Lane - 7 Animals"
-prison_lane_animal_8     = "Prison Lane - 8 Animals"
-prison_lane_animal_9     = "Prison Lane - 9 Animals"
-prison_lane_animal_10    = "Prison Lane - 10 Animals"
-prison_lane_animal_11    = "Prison Lane - 11 Animals"
-prison_lane_animal_12    = "Prison Lane - 12 Animals"
-prison_lane_animal_13    = "Prison Lane - 13 Animals"
-prison_lane_animal_14    = "Prison Lane - 14 Animals"
-prison_lane_animal_15    = "Prison Lane - 15 Animals"
-prison_lane_upgrade      = "Prison Lane - Upgrade"
-mission_street_1         = "Mission Street - 1"
-mission_street_2         = "Mission Street - 2"
-mission_street_3         = "Mission Street - 3"
-mission_street_4         = "Mission Street - 4"
-mission_street_5         = "Mission Street - 5"
-mission_street_chao_1    = "Mission Street - Chao Key 1"
-mission_street_chao_2    = "Mission Street - Chao Key 2"
-mission_street_chao_3    = "Mission Street - Chao Key 3"
-mission_street_pipe_1    = "Mission Street - Pipe 1"
-mission_street_pipe_2    = "Mission Street - Pipe 2"
-mission_street_pipe_3    = "Mission Street - Pipe 3"
-mission_street_hidden_1  = "Mission Street - Hidden 1"
-mission_street_hidden_2  = "Mission Street - Hidden 2"
-mission_street_hidden_3  = "Mission Street - Hidden 3"
-mission_street_hidden_4  = "Mission Street - Hidden 4"
-mission_street_omo_1     = "Mission Street - Omochao 1"
-mission_street_omo_2     = "Mission Street - Omochao 2"
-mission_street_omo_3     = "Mission Street - Omochao 3"
-mission_street_omo_4     = "Mission Street - Omochao 4"
-mission_street_omo_5     = "Mission Street - Omochao 5"
-mission_street_omo_6     = "Mission Street - Omochao 6"
-mission_street_omo_7     = "Mission Street - Omochao 7"
-mission_street_omo_8     = "Mission Street - Omochao 8"
-mission_street_beetle    = "Mission Street - Gold Beetle"
-mission_street_animal_1  = "Mission Street - 1 Animal"
-mission_street_animal_2  = "Mission Street - 2 Animals"
-mission_street_animal_3  = "Mission Street - 3 Animals"
-mission_street_animal_4  = "Mission Street - 4 Animals"
-mission_street_animal_5  = "Mission Street - 5 Animals"
-mission_street_animal_6  = "Mission Street - 6 Animals"
-mission_street_animal_7  = "Mission Street - 7 Animals"
-mission_street_animal_8  = "Mission Street - 8 Animals"
-mission_street_animal_9  = "Mission Street - 9 Animals"
-mission_street_animal_10 = "Mission Street - 10 Animals"
-mission_street_animal_11 = "Mission Street - 11 Animals"
-mission_street_animal_12 = "Mission Street - 12 Animals"
-mission_street_animal_13 = "Mission Street - 13 Animals"
-mission_street_animal_14 = "Mission Street - 14 Animals"
-mission_street_animal_15 = "Mission Street - 15 Animals"
-mission_street_animal_16 = "Mission Street - 16 Animals"
-mission_street_upgrade   = "Mission Street - Upgrade"
-route_101_1              = "Route 101 - 1"
-route_101_2              = "Route 101 - 2"
-route_101_3              = "Route 101 - 3"
-route_101_4              = "Route 101 - 4"
-route_101_5              = "Route 101 - 5"
-hidden_base_1            = "Hidden Base - 1"
-hidden_base_2            = "Hidden Base - 2"
-hidden_base_3            = "Hidden Base - 3"
-hidden_base_4            = "Hidden Base - 4"
-hidden_base_5            = "Hidden Base - 5"
-hidden_base_chao_1       = "Hidden Base - Chao Key 1"
-hidden_base_chao_2       = "Hidden Base - Chao Key 2"
-hidden_base_pipe_1       = "Hidden Base - Pipe 1"
-hidden_base_pipe_2       = "Hidden Base - Pipe 2"
-hidden_base_pipe_3       = "Hidden Base - Pipe 3"
-hidden_base_pipe_4       = "Hidden Base - Pipe 4"
-hidden_base_pipe_5       = "Hidden Base - Pipe 5"
-hidden_base_omo_1        = "Hidden Base - Omochao 1"
-hidden_base_omo_2        = "Hidden Base - Omochao 2"
-hidden_base_omo_3        = "Hidden Base - Omochao 3"
-hidden_base_omo_4        = "Hidden Base - Omochao 4"
-hidden_base_beetle       = "Hidden Base - Gold Beetle"
-hidden_base_animal_1     = "Hidden Base - 1 Animal"
-hidden_base_animal_2     = "Hidden Base - 2 Animals"
-hidden_base_animal_3     = "Hidden Base - 3 Animals"
-hidden_base_animal_4     = "Hidden Base - 4 Animals"
-hidden_base_animal_5     = "Hidden Base - 5 Animals"
-hidden_base_animal_6     = "Hidden Base - 6 Animals"
-hidden_base_animal_7     = "Hidden Base - 7 Animals"
-hidden_base_animal_8     = "Hidden Base - 8 Animals"
-hidden_base_animal_9     = "Hidden Base - 9 Animals"
-hidden_base_animal_10    = "Hidden Base - 10 Animals"
-hidden_base_animal_11    = "Hidden Base - 11 Animals"
-hidden_base_animal_12    = "Hidden Base - 12 Animals"
-hidden_base_animal_13    = "Hidden Base - 13 Animals"
-hidden_base_animal_14    = "Hidden Base - 14 Animals"
-hidden_base_animal_15    = "Hidden Base - 15 Animals"
-hidden_base_upgrade      = "Hidden Base - Upgrade"
-eternal_engine_1         = "Eternal Engine - 1"
-eternal_engine_2         = "Eternal Engine - 2"
-eternal_engine_3         = "Eternal Engine - 3"
-eternal_engine_4         = "Eternal Engine - 4"
-eternal_engine_5         = "Eternal Engine - 5"
-eternal_engine_chao_1    = "Eternal Engine - Chao Key 1"
-eternal_engine_chao_2    = "Eternal Engine - Chao Key 2"
-eternal_engine_chao_3    = "Eternal Engine - Chao Key 3"
-eternal_engine_pipe_1    = "Eternal Engine - Pipe 1"
-eternal_engine_pipe_2    = "Eternal Engine - Pipe 2"
-eternal_engine_pipe_3    = "Eternal Engine - Pipe 3"
-eternal_engine_pipe_4    = "Eternal Engine - Pipe 4"
-eternal_engine_pipe_5    = "Eternal Engine - Pipe 5"
-eternal_engine_omo_1     = "Eternal Engine - Omochao 1"
-eternal_engine_omo_2     = "Eternal Engine - Omochao 2"
-eternal_engine_omo_3     = "Eternal Engine - Omochao 3"
-eternal_engine_omo_4     = "Eternal Engine - Omochao 4"
-eternal_engine_omo_5     = "Eternal Engine - Omochao 5"
-eternal_engine_omo_6     = "Eternal Engine - Omochao 6"
-eternal_engine_omo_7     = "Eternal Engine - Omochao 7"
-eternal_engine_omo_8     = "Eternal Engine - Omochao 8"
-eternal_engine_omo_9     = "Eternal Engine - Omochao 9"
-eternal_engine_omo_10    = "Eternal Engine - Omochao 10"
-eternal_engine_omo_11    = "Eternal Engine - Omochao 11"
-eternal_engine_omo_12    = "Eternal Engine - Omochao 12"
-eternal_engine_beetle    = "Eternal Engine - Gold Beetle"
-eternal_engine_animal_1  = "Eternal Engine - 1 Animal"
-eternal_engine_animal_2  = "Eternal Engine - 2 Animals"
-eternal_engine_animal_3  = "Eternal Engine - 3 Animals"
-eternal_engine_animal_4  = "Eternal Engine - 4 Animals"
-eternal_engine_animal_5  = "Eternal Engine - 5 Animals"
-eternal_engine_animal_6  = "Eternal Engine - 6 Animals"
-eternal_engine_animal_7  = "Eternal Engine - 7 Animals"
-eternal_engine_animal_8  = "Eternal Engine - 8 Animals"
-eternal_engine_animal_9  = "Eternal Engine - 9 Animals"
-eternal_engine_animal_10 = "Eternal Engine - 10 Animals"
-eternal_engine_animal_11 = "Eternal Engine - 11 Animals"
-eternal_engine_animal_12 = "Eternal Engine - 12 Animals"
-eternal_engine_animal_13 = "Eternal Engine - 13 Animals"
-eternal_engine_animal_14 = "Eternal Engine - 14 Animals"
-eternal_engine_animal_15 = "Eternal Engine - 15 Animals"
-eternal_engine_upgrade   = "Eternal Engine - Upgrade"
+prison_lane_1             = "Prison Lane - 1"
+prison_lane_2             = "Prison Lane - 2"
+prison_lane_3             = "Prison Lane - 3"
+prison_lane_4             = "Prison Lane - 4"
+prison_lane_5             = "Prison Lane - 5"
+prison_lane_chao_1        = "Prison Lane - Chao Key 1"
+prison_lane_chao_2        = "Prison Lane - Chao Key 2"
+prison_lane_chao_3        = "Prison Lane - Chao Key 3"
+prison_lane_pipe_1        = "Prison Lane - Pipe 1"
+prison_lane_pipe_2        = "Prison Lane - Pipe 2"
+prison_lane_pipe_3        = "Prison Lane - Pipe 3"
+prison_lane_hidden_1      = "Prison Lane - Hidden 1"
+prison_lane_hidden_2      = "Prison Lane - Hidden 2"
+prison_lane_hidden_3      = "Prison Lane - Hidden 3"
+prison_lane_omo_1         = "Prison Lane - Omochao 1"
+prison_lane_omo_2         = "Prison Lane - Omochao 2"
+prison_lane_omo_3         = "Prison Lane - Omochao 3"
+prison_lane_omo_4         = "Prison Lane - Omochao 4"
+prison_lane_omo_5         = "Prison Lane - Omochao 5"
+prison_lane_omo_6         = "Prison Lane - Omochao 6"
+prison_lane_omo_7         = "Prison Lane - Omochao 7"
+prison_lane_omo_8         = "Prison Lane - Omochao 8"
+prison_lane_omo_9         = "Prison Lane - Omochao 9"
+prison_lane_omo_10        = "Prison Lane - Omochao 10"
+prison_lane_beetle        = "Prison Lane - Gold Beetle"
+prison_lane_animal_1      = "Prison Lane - 1 Animal"
+prison_lane_animal_2      = "Prison Lane - 2 Animals"
+prison_lane_animal_3      = "Prison Lane - 3 Animals"
+prison_lane_animal_4      = "Prison Lane - 4 Animals"
+prison_lane_animal_5      = "Prison Lane - 5 Animals"
+prison_lane_animal_6      = "Prison Lane - 6 Animals"
+prison_lane_animal_7      = "Prison Lane - 7 Animals"
+prison_lane_animal_8      = "Prison Lane - 8 Animals"
+prison_lane_animal_9      = "Prison Lane - 9 Animals"
+prison_lane_animal_10     = "Prison Lane - 10 Animals"
+prison_lane_animal_11     = "Prison Lane - 11 Animals"
+prison_lane_animal_12     = "Prison Lane - 12 Animals"
+prison_lane_animal_13     = "Prison Lane - 13 Animals"
+prison_lane_animal_14     = "Prison Lane - 14 Animals"
+prison_lane_animal_15     = "Prison Lane - 15 Animals"
+prison_lane_lifebox_1     = "Prison Lane - Extra Life Box 1"
+prison_lane_lifebox_2     = "Prison Lane - Extra Life Box 2"
+prison_lane_itembox_1     = "Prison Lane - Item Box 1"
+prison_lane_itembox_2     = "Prison Lane - Item Box 2"
+prison_lane_itembox_3     = "Prison Lane - Item Box 3"
+prison_lane_itembox_4     = "Prison Lane - Item Box 4"
+prison_lane_itembox_5     = "Prison Lane - Item Box 5"
+prison_lane_itembox_6     = "Prison Lane - Item Box 6"
+prison_lane_big           = "Prison Lane - Big"
+prison_lane_upgrade       = "Prison Lane - Upgrade"
+mission_street_1          = "Mission Street - 1"
+mission_street_2          = "Mission Street - 2"
+mission_street_3          = "Mission Street - 3"
+mission_street_4          = "Mission Street - 4"
+mission_street_5          = "Mission Street - 5"
+mission_street_chao_1     = "Mission Street - Chao Key 1"
+mission_street_chao_2     = "Mission Street - Chao Key 2"
+mission_street_chao_3     = "Mission Street - Chao Key 3"
+mission_street_pipe_1     = "Mission Street - Pipe 1"
+mission_street_pipe_2     = "Mission Street - Pipe 2"
+mission_street_pipe_3     = "Mission Street - Pipe 3"
+mission_street_hidden_1   = "Mission Street - Hidden 1"
+mission_street_hidden_2   = "Mission Street - Hidden 2"
+mission_street_hidden_3   = "Mission Street - Hidden 3"
+mission_street_hidden_4   = "Mission Street - Hidden 4"
+mission_street_omo_1      = "Mission Street - Omochao 1"
+mission_street_omo_2      = "Mission Street - Omochao 2"
+mission_street_omo_3      = "Mission Street - Omochao 3"
+mission_street_omo_4      = "Mission Street - Omochao 4"
+mission_street_omo_5      = "Mission Street - Omochao 5"
+mission_street_omo_6      = "Mission Street - Omochao 6"
+mission_street_omo_7      = "Mission Street - Omochao 7"
+mission_street_omo_8      = "Mission Street - Omochao 8"
+mission_street_beetle     = "Mission Street - Gold Beetle"
+mission_street_animal_1   = "Mission Street - 1 Animal"
+mission_street_animal_2   = "Mission Street - 2 Animals"
+mission_street_animal_3   = "Mission Street - 3 Animals"
+mission_street_animal_4   = "Mission Street - 4 Animals"
+mission_street_animal_5   = "Mission Street - 5 Animals"
+mission_street_animal_6   = "Mission Street - 6 Animals"
+mission_street_animal_7   = "Mission Street - 7 Animals"
+mission_street_animal_8   = "Mission Street - 8 Animals"
+mission_street_animal_9   = "Mission Street - 9 Animals"
+mission_street_animal_10  = "Mission Street - 10 Animals"
+mission_street_animal_11  = "Mission Street - 11 Animals"
+mission_street_animal_12  = "Mission Street - 12 Animals"
+mission_street_animal_13  = "Mission Street - 13 Animals"
+mission_street_animal_14  = "Mission Street - 14 Animals"
+mission_street_animal_15  = "Mission Street - 15 Animals"
+mission_street_animal_16  = "Mission Street - 16 Animals"
+mission_street_lifebox_1  = "Mission Street - Extra Life Box 1"
+mission_street_lifebox_2  = "Mission Street - Extra Life Box 2"
+mission_street_itembox_1  = "Mission Street - Item Box 1"
+mission_street_itembox_2  = "Mission Street - Item Box 2"
+mission_street_itembox_3  = "Mission Street - Item Box 3"
+mission_street_itembox_4  = "Mission Street - Item Box 4"
+mission_street_itembox_5  = "Mission Street - Item Box 5"
+mission_street_itembox_6  = "Mission Street - Item Box 6"
+mission_street_big        = "Mission Street - Big"
+mission_street_upgrade    = "Mission Street - Upgrade"
+route_101_1               = "Route 101 - 1"
+route_101_2               = "Route 101 - 2"
+route_101_3               = "Route 101 - 3"
+route_101_4               = "Route 101 - 4"
+route_101_5               = "Route 101 - 5"
+route_101_itembox_1       = "Route 101 - Balloon 1"
+route_101_itembox_2       = "Route 101 - Balloon 2"
+route_101_itembox_3       = "Route 101 - Balloon 3"
+route_101_itembox_4       = "Route 101 - Balloon 4"
+route_101_itembox_5       = "Route 101 - Balloon 5"
+hidden_base_1             = "Hidden Base - 1"
+hidden_base_2             = "Hidden Base - 2"
+hidden_base_3             = "Hidden Base - 3"
+hidden_base_4             = "Hidden Base - 4"
+hidden_base_5             = "Hidden Base - 5"
+hidden_base_chao_1        = "Hidden Base - Chao Key 1"
+hidden_base_chao_2        = "Hidden Base - Chao Key 2"
+hidden_base_pipe_1        = "Hidden Base - Pipe 1"
+hidden_base_pipe_2        = "Hidden Base - Pipe 2"
+hidden_base_pipe_3        = "Hidden Base - Pipe 3"
+hidden_base_pipe_4        = "Hidden Base - Pipe 4"
+hidden_base_pipe_5        = "Hidden Base - Pipe 5"
+hidden_base_omo_1         = "Hidden Base - Omochao 1"
+hidden_base_omo_2         = "Hidden Base - Omochao 2"
+hidden_base_omo_3         = "Hidden Base - Omochao 3"
+hidden_base_omo_4         = "Hidden Base - Omochao 4"
+hidden_base_beetle        = "Hidden Base - Gold Beetle"
+hidden_base_animal_1      = "Hidden Base - 1 Animal"
+hidden_base_animal_2      = "Hidden Base - 2 Animals"
+hidden_base_animal_3      = "Hidden Base - 3 Animals"
+hidden_base_animal_4      = "Hidden Base - 4 Animals"
+hidden_base_animal_5      = "Hidden Base - 5 Animals"
+hidden_base_animal_6      = "Hidden Base - 6 Animals"
+hidden_base_animal_7      = "Hidden Base - 7 Animals"
+hidden_base_animal_8      = "Hidden Base - 8 Animals"
+hidden_base_animal_9      = "Hidden Base - 9 Animals"
+hidden_base_animal_10     = "Hidden Base - 10 Animals"
+hidden_base_animal_11     = "Hidden Base - 11 Animals"
+hidden_base_animal_12     = "Hidden Base - 12 Animals"
+hidden_base_animal_13     = "Hidden Base - 13 Animals"
+hidden_base_animal_14     = "Hidden Base - 14 Animals"
+hidden_base_animal_15     = "Hidden Base - 15 Animals"
+hidden_base_lifebox_1     = "Hidden Base - Extra Life Box 1"
+hidden_base_itembox_1     = "Hidden Base - Item Box 1"
+hidden_base_itembox_2     = "Hidden Base - Item Box 2"
+hidden_base_itembox_3     = "Hidden Base - Item Box 3"
+hidden_base_itembox_4     = "Hidden Base - Item Box 4"
+hidden_base_itembox_5     = "Hidden Base - Item Box 5"
+hidden_base_big           = "Hidden Base - Big"
+hidden_base_upgrade       = "Hidden Base - Upgrade"
+eternal_engine_1          = "Eternal Engine - 1"
+eternal_engine_2          = "Eternal Engine - 2"
+eternal_engine_3          = "Eternal Engine - 3"
+eternal_engine_4          = "Eternal Engine - 4"
+eternal_engine_5          = "Eternal Engine - 5"
+eternal_engine_chao_1     = "Eternal Engine - Chao Key 1"
+eternal_engine_chao_2     = "Eternal Engine - Chao Key 2"
+eternal_engine_chao_3     = "Eternal Engine - Chao Key 3"
+eternal_engine_pipe_1     = "Eternal Engine - Pipe 1"
+eternal_engine_pipe_2     = "Eternal Engine - Pipe 2"
+eternal_engine_pipe_3     = "Eternal Engine - Pipe 3"
+eternal_engine_pipe_4     = "Eternal Engine - Pipe 4"
+eternal_engine_pipe_5     = "Eternal Engine - Pipe 5"
+eternal_engine_omo_1      = "Eternal Engine - Omochao 1"
+eternal_engine_omo_2      = "Eternal Engine - Omochao 2"
+eternal_engine_omo_3      = "Eternal Engine - Omochao 3"
+eternal_engine_omo_4      = "Eternal Engine - Omochao 4"
+eternal_engine_omo_5      = "Eternal Engine - Omochao 5"
+eternal_engine_omo_6      = "Eternal Engine - Omochao 6"
+eternal_engine_omo_7      = "Eternal Engine - Omochao 7"
+eternal_engine_omo_8      = "Eternal Engine - Omochao 8"
+eternal_engine_omo_9      = "Eternal Engine - Omochao 9"
+eternal_engine_omo_10     = "Eternal Engine - Omochao 10"
+eternal_engine_omo_11     = "Eternal Engine - Omochao 11"
+eternal_engine_omo_12     = "Eternal Engine - Omochao 12"
+eternal_engine_beetle     = "Eternal Engine - Gold Beetle"
+eternal_engine_animal_1   = "Eternal Engine - 1 Animal"
+eternal_engine_animal_2   = "Eternal Engine - 2 Animals"
+eternal_engine_animal_3   = "Eternal Engine - 3 Animals"
+eternal_engine_animal_4   = "Eternal Engine - 4 Animals"
+eternal_engine_animal_5   = "Eternal Engine - 5 Animals"
+eternal_engine_animal_6   = "Eternal Engine - 6 Animals"
+eternal_engine_animal_7   = "Eternal Engine - 7 Animals"
+eternal_engine_animal_8   = "Eternal Engine - 8 Animals"
+eternal_engine_animal_9   = "Eternal Engine - 9 Animals"
+eternal_engine_animal_10  = "Eternal Engine - 10 Animals"
+eternal_engine_animal_11  = "Eternal Engine - 11 Animals"
+eternal_engine_animal_12  = "Eternal Engine - 12 Animals"
+eternal_engine_animal_13  = "Eternal Engine - 13 Animals"
+eternal_engine_animal_14  = "Eternal Engine - 14 Animals"
+eternal_engine_animal_15  = "Eternal Engine - 15 Animals"
+eternal_engine_lifebox_1  = "Eternal Engine - Extra Life Box 1"
+eternal_engine_lifebox_2  = "Eternal Engine - Extra Life Box 2"
+eternal_engine_itembox_1  = "Eternal Engine - Item Box 1"
+eternal_engine_itembox_2  = "Eternal Engine - Item Box 2"
+eternal_engine_itembox_3  = "Eternal Engine - Item Box 3"
+eternal_engine_itembox_4  = "Eternal Engine - Item Box 4"
+eternal_engine_itembox_5  = "Eternal Engine - Item Box 5"
+eternal_engine_itembox_6  = "Eternal Engine - Item Box 6"
+eternal_engine_itembox_7  = "Eternal Engine - Item Box 7"
+eternal_engine_itembox_8  = "Eternal Engine - Item Box 8"
+eternal_engine_itembox_9  = "Eternal Engine - Item Box 9"
+eternal_engine_itembox_10 = "Eternal Engine - Item Box 10"
+eternal_engine_itembox_11 = "Eternal Engine - Item Box 11"
+eternal_engine_itembox_12 = "Eternal Engine - Item Box 12"
+eternal_engine_itembox_13 = "Eternal Engine - Item Box 13"
+eternal_engine_itembox_14 = "Eternal Engine - Item Box 14"
+eternal_engine_big        = "Eternal Engine - Big"
+eternal_engine_upgrade    = "Eternal Engine - Upgrade"
 
 # Knuckles Mission Definitions
-wild_canyon_1           = "Wild Canyon - 1"
-wild_canyon_2           = "Wild Canyon - 2"
-wild_canyon_3           = "Wild Canyon - 3"
-wild_canyon_4           = "Wild Canyon - 4"
-wild_canyon_5           = "Wild Canyon - 5"
-wild_canyon_chao_1      = "Wild Canyon - Chao Key 1"
-wild_canyon_chao_2      = "Wild Canyon - Chao Key 2"
-wild_canyon_chao_3      = "Wild Canyon - Chao Key 3"
-wild_canyon_pipe_1      = "Wild Canyon - Pipe 1"
-wild_canyon_pipe_2      = "Wild Canyon - Pipe 2"
-wild_canyon_pipe_3      = "Wild Canyon - Pipe 3"
-wild_canyon_omo_1       = "Wild Canyon - Omochao 1"
-wild_canyon_omo_2       = "Wild Canyon - Omochao 2"
-wild_canyon_omo_3       = "Wild Canyon - Omochao 3"
-wild_canyon_omo_4       = "Wild Canyon - Omochao 4"
-wild_canyon_omo_5       = "Wild Canyon - Omochao 5"
-wild_canyon_omo_6       = "Wild Canyon - Omochao 6"
-wild_canyon_omo_7       = "Wild Canyon - Omochao 7"
-wild_canyon_omo_8       = "Wild Canyon - Omochao 8"
-wild_canyon_omo_9       = "Wild Canyon - Omochao 9"
-wild_canyon_omo_10      = "Wild Canyon - Omochao 10"
-wild_canyon_beetle      = "Wild Canyon - Gold Beetle"
-wild_canyon_animal_1    = "Wild Canyon - 1 Animal"
-wild_canyon_animal_2    = "Wild Canyon - 2 Animals"
-wild_canyon_animal_3    = "Wild Canyon - 3 Animals"
-wild_canyon_animal_4    = "Wild Canyon - 4 Animals"
-wild_canyon_animal_5    = "Wild Canyon - 5 Animals"
-wild_canyon_animal_6    = "Wild Canyon - 6 Animals"
-wild_canyon_animal_7    = "Wild Canyon - 7 Animals"
-wild_canyon_animal_8    = "Wild Canyon - 8 Animals"
-wild_canyon_animal_9    = "Wild Canyon - 9 Animals"
-wild_canyon_animal_10   = "Wild Canyon - 10 Animals"
-wild_canyon_upgrade     = "Wild Canyon - Upgrade"
-pumpkin_hill_1          = "Pumpkin Hill - 1"
-pumpkin_hill_2          = "Pumpkin Hill - 2"
-pumpkin_hill_3          = "Pumpkin Hill - 3"
-pumpkin_hill_4          = "Pumpkin Hill - 4"
-pumpkin_hill_5          = "Pumpkin Hill - 5"
-pumpkin_hill_chao_1     = "Pumpkin Hill - Chao Key 1"
-pumpkin_hill_chao_2     = "Pumpkin Hill - Chao Key 2"
-pumpkin_hill_chao_3     = "Pumpkin Hill - Chao Key 3"
-pumpkin_hill_pipe_1     = "Pumpkin Hill - Pipe 1"
-pumpkin_hill_hidden_1   = "Pumpkin Hill - Hidden 1"
-pumpkin_hill_omo_1      = "Pumpkin Hill - Omochao 1"
-pumpkin_hill_omo_2      = "Pumpkin Hill - Omochao 2"
-pumpkin_hill_omo_3      = "Pumpkin Hill - Omochao 3"
-pumpkin_hill_omo_4      = "Pumpkin Hill - Omochao 4"
-pumpkin_hill_omo_5      = "Pumpkin Hill - Omochao 5"
-pumpkin_hill_omo_6      = "Pumpkin Hill - Omochao 6"
-pumpkin_hill_omo_7      = "Pumpkin Hill - Omochao 7"
-pumpkin_hill_omo_8      = "Pumpkin Hill - Omochao 8"
-pumpkin_hill_omo_9      = "Pumpkin Hill - Omochao 9"
-pumpkin_hill_omo_10     = "Pumpkin Hill - Omochao 10"
-pumpkin_hill_omo_11     = "Pumpkin Hill - Omochao 11"
-pumpkin_hill_animal_1   = "Pumpkin Hill - 1 Animal"
-pumpkin_hill_animal_2   = "Pumpkin Hill - 2 Animals"
-pumpkin_hill_animal_3   = "Pumpkin Hill - 3 Animals"
-pumpkin_hill_animal_4   = "Pumpkin Hill - 4 Animals"
-pumpkin_hill_animal_5   = "Pumpkin Hill - 5 Animals"
-pumpkin_hill_animal_6   = "Pumpkin Hill - 6 Animals"
-pumpkin_hill_animal_7   = "Pumpkin Hill - 7 Animals"
-pumpkin_hill_animal_8   = "Pumpkin Hill - 8 Animals"
-pumpkin_hill_animal_9   = "Pumpkin Hill - 9 Animals"
-pumpkin_hill_animal_10  = "Pumpkin Hill - 10 Animals"
-pumpkin_hill_animal_11  = "Pumpkin Hill - 11 Animals"
-pumpkin_hill_upgrade    = "Pumpkin Hill - Upgrade"
-aquatic_mine_1          = "Aquatic Mine - 1"
-aquatic_mine_2          = "Aquatic Mine - 2"
-aquatic_mine_3          = "Aquatic Mine - 3"
-aquatic_mine_4          = "Aquatic Mine - 4"
-aquatic_mine_5          = "Aquatic Mine - 5"
-aquatic_mine_chao_1     = "Aquatic Mine - Chao Key 1"
-aquatic_mine_chao_2     = "Aquatic Mine - Chao Key 2"
-aquatic_mine_chao_3     = "Aquatic Mine - Chao Key 3"
-aquatic_mine_pipe_1     = "Aquatic Mine - Pipe 1"
-aquatic_mine_pipe_2     = "Aquatic Mine - Pipe 2"
-aquatic_mine_pipe_3     = "Aquatic Mine - Pipe 3"
-aquatic_mine_omo_1      = "Aquatic Mine - Omochao 1"
-aquatic_mine_omo_2      = "Aquatic Mine - Omochao 2"
-aquatic_mine_omo_3      = "Aquatic Mine - Omochao 3"
-aquatic_mine_omo_4      = "Aquatic Mine - Omochao 4"
-aquatic_mine_omo_5      = "Aquatic Mine - Omochao 5"
-aquatic_mine_omo_6      = "Aquatic Mine - Omochao 6"
-aquatic_mine_omo_7      = "Aquatic Mine - Omochao 7"
-aquatic_mine_beetle     = "Aquatic Mine - Gold Beetle"
-aquatic_mine_animal_1   = "Aquatic Mine - 1 Animal"
-aquatic_mine_animal_2   = "Aquatic Mine - 2 Animals"
-aquatic_mine_animal_3   = "Aquatic Mine - 3 Animals"
-aquatic_mine_animal_4   = "Aquatic Mine - 4 Animals"
-aquatic_mine_animal_5   = "Aquatic Mine - 5 Animals"
-aquatic_mine_animal_6   = "Aquatic Mine - 6 Animals"
-aquatic_mine_animal_7   = "Aquatic Mine - 7 Animals"
-aquatic_mine_animal_8   = "Aquatic Mine - 8 Animals"
-aquatic_mine_animal_9   = "Aquatic Mine - 9 Animals"
-aquatic_mine_animal_10  = "Aquatic Mine - 10 Animals"
-aquatic_mine_upgrade    = "Aquatic Mine - Upgrade"
-death_chamber_1         = "Death Chamber - 1"
-death_chamber_2         = "Death Chamber - 2"
-death_chamber_3         = "Death Chamber - 3"
-death_chamber_4         = "Death Chamber - 4"
-death_chamber_5         = "Death Chamber - 5"
-death_chamber_chao_1    = "Death Chamber - Chao Key 1"
-death_chamber_chao_2    = "Death Chamber - Chao Key 2"
-death_chamber_chao_3    = "Death Chamber - Chao Key 3"
-death_chamber_pipe_1    = "Death Chamber - Pipe 1"
-death_chamber_pipe_2    = "Death Chamber - Pipe 2"
-death_chamber_pipe_3    = "Death Chamber - Pipe 3"
-death_chamber_hidden_1  = "Death Chamber - Hidden 1"
-death_chamber_hidden_2  = "Death Chamber - Hidden 2"
-death_chamber_omo_1     = "Death Chamber - Omochao 1"
-death_chamber_omo_2     = "Death Chamber - Omochao 2"
-death_chamber_omo_3     = "Death Chamber - Omochao 3"
-death_chamber_omo_4     = "Death Chamber - Omochao 4"
-death_chamber_omo_5     = "Death Chamber - Omochao 5"
-death_chamber_omo_6     = "Death Chamber - Omochao 6"
-death_chamber_omo_7     = "Death Chamber - Omochao 7"
-death_chamber_omo_8     = "Death Chamber - Omochao 8"
-death_chamber_omo_9     = "Death Chamber - Omochao 9"
-death_chamber_beetle    = "Death Chamber - Gold Beetle"
-death_chamber_animal_1  = "Death Chamber - 1 Animal"
-death_chamber_animal_2  = "Death Chamber - 2 Animals"
-death_chamber_animal_3  = "Death Chamber - 3 Animals"
-death_chamber_animal_4  = "Death Chamber - 4 Animals"
-death_chamber_animal_5  = "Death Chamber - 5 Animals"
-death_chamber_animal_6  = "Death Chamber - 6 Animals"
-death_chamber_animal_7  = "Death Chamber - 7 Animals"
-death_chamber_animal_8  = "Death Chamber - 8 Animals"
-death_chamber_animal_9  = "Death Chamber - 9 Animals"
-death_chamber_animal_10 = "Death Chamber - 10 Animals"
-death_chamber_upgrade   = "Death Chamber - Upgrade"
-meteor_herd_1           = "Meteor Herd - 1"
-meteor_herd_2           = "Meteor Herd - 2"
-meteor_herd_3           = "Meteor Herd - 3"
-meteor_herd_4           = "Meteor Herd - 4"
-meteor_herd_5           = "Meteor Herd - 5"
-meteor_herd_chao_1      = "Meteor Herd - Chao Key 1"
-meteor_herd_chao_2      = "Meteor Herd - Chao Key 2"
-meteor_herd_chao_3      = "Meteor Herd - Chao Key 3"
-meteor_herd_pipe_1      = "Meteor Herd - Pipe 1"
-meteor_herd_pipe_2      = "Meteor Herd - Pipe 2"
-meteor_herd_pipe_3      = "Meteor Herd - Pipe 3"
-meteor_herd_omo_1       = "Meteor Herd - Omochao 1"
-meteor_herd_omo_2       = "Meteor Herd - Omochao 2"
-meteor_herd_omo_3       = "Meteor Herd - Omochao 3"
-meteor_herd_beetle      = "Meteor Herd - Gold Beetle"
-meteor_herd_animal_1    = "Meteor Herd - 1 Animal"
-meteor_herd_animal_2    = "Meteor Herd - 2 Animals"
-meteor_herd_animal_3    = "Meteor Herd - 3 Animals"
-meteor_herd_animal_4    = "Meteor Herd - 4 Animals"
-meteor_herd_animal_5    = "Meteor Herd - 5 Animals"
-meteor_herd_animal_6    = "Meteor Herd - 6 Animals"
-meteor_herd_animal_7    = "Meteor Herd - 7 Animals"
-meteor_herd_animal_8    = "Meteor Herd - 8 Animals"
-meteor_herd_animal_9    = "Meteor Herd - 9 Animals"
-meteor_herd_animal_10   = "Meteor Herd - 10 Animals"
-meteor_herd_animal_11   = "Meteor Herd - 11 Animals"
-meteor_herd_upgrade     = "Meteor Herd - Upgrade"
+wild_canyon_1            = "Wild Canyon - 1"
+wild_canyon_2            = "Wild Canyon - 2"
+wild_canyon_3            = "Wild Canyon - 3"
+wild_canyon_4            = "Wild Canyon - 4"
+wild_canyon_5            = "Wild Canyon - 5"
+wild_canyon_chao_1       = "Wild Canyon - Chao Key 1"
+wild_canyon_chao_2       = "Wild Canyon - Chao Key 2"
+wild_canyon_chao_3       = "Wild Canyon - Chao Key 3"
+wild_canyon_pipe_1       = "Wild Canyon - Pipe 1"
+wild_canyon_pipe_2       = "Wild Canyon - Pipe 2"
+wild_canyon_pipe_3       = "Wild Canyon - Pipe 3"
+wild_canyon_omo_1        = "Wild Canyon - Omochao 1"
+wild_canyon_omo_2        = "Wild Canyon - Omochao 2"
+wild_canyon_omo_3        = "Wild Canyon - Omochao 3"
+wild_canyon_omo_4        = "Wild Canyon - Omochao 4"
+wild_canyon_omo_5        = "Wild Canyon - Omochao 5"
+wild_canyon_omo_6        = "Wild Canyon - Omochao 6"
+wild_canyon_omo_7        = "Wild Canyon - Omochao 7"
+wild_canyon_omo_8        = "Wild Canyon - Omochao 8"
+wild_canyon_omo_9        = "Wild Canyon - Omochao 9"
+wild_canyon_omo_10       = "Wild Canyon - Omochao 10"
+wild_canyon_beetle       = "Wild Canyon - Gold Beetle"
+wild_canyon_animal_1     = "Wild Canyon - 1 Animal"
+wild_canyon_animal_2     = "Wild Canyon - 2 Animals"
+wild_canyon_animal_3     = "Wild Canyon - 3 Animals"
+wild_canyon_animal_4     = "Wild Canyon - 4 Animals"
+wild_canyon_animal_5     = "Wild Canyon - 5 Animals"
+wild_canyon_animal_6     = "Wild Canyon - 6 Animals"
+wild_canyon_animal_7     = "Wild Canyon - 7 Animals"
+wild_canyon_animal_8     = "Wild Canyon - 8 Animals"
+wild_canyon_animal_9     = "Wild Canyon - 9 Animals"
+wild_canyon_animal_10    = "Wild Canyon - 10 Animals"
+wild_canyon_lifebox_1    = "Wild Canyon - Extra Life Box 1"
+wild_canyon_lifebox_2    = "Wild Canyon - Extra Life Box 2"
+wild_canyon_itembox_1    = "Wild Canyon - Item Box 1"
+wild_canyon_itembox_2    = "Wild Canyon - Item Box 2"
+wild_canyon_itembox_3    = "Wild Canyon - Item Box 3"
+wild_canyon_itembox_4    = "Wild Canyon - Item Box 4"
+wild_canyon_itembox_5    = "Wild Canyon - Item Box 5"
+wild_canyon_itembox_6    = "Wild Canyon - Item Box 6"
+wild_canyon_itembox_7    = "Wild Canyon - Item Box 7"
+wild_canyon_itembox_8    = "Wild Canyon - Item Box 8"
+wild_canyon_upgrade      = "Wild Canyon - Upgrade"
+pumpkin_hill_1           = "Pumpkin Hill - 1"
+pumpkin_hill_2           = "Pumpkin Hill - 2"
+pumpkin_hill_3           = "Pumpkin Hill - 3"
+pumpkin_hill_4           = "Pumpkin Hill - 4"
+pumpkin_hill_5           = "Pumpkin Hill - 5"
+pumpkin_hill_chao_1      = "Pumpkin Hill - Chao Key 1"
+pumpkin_hill_chao_2      = "Pumpkin Hill - Chao Key 2"
+pumpkin_hill_chao_3      = "Pumpkin Hill - Chao Key 3"
+pumpkin_hill_pipe_1      = "Pumpkin Hill - Pipe 1"
+pumpkin_hill_hidden_1    = "Pumpkin Hill - Hidden 1"
+pumpkin_hill_omo_1       = "Pumpkin Hill - Omochao 1"
+pumpkin_hill_omo_2       = "Pumpkin Hill - Omochao 2"
+pumpkin_hill_omo_3       = "Pumpkin Hill - Omochao 3"
+pumpkin_hill_omo_4       = "Pumpkin Hill - Omochao 4"
+pumpkin_hill_omo_5       = "Pumpkin Hill - Omochao 5"
+pumpkin_hill_omo_6       = "Pumpkin Hill - Omochao 6"
+pumpkin_hill_omo_7       = "Pumpkin Hill - Omochao 7"
+pumpkin_hill_omo_8       = "Pumpkin Hill - Omochao 8"
+pumpkin_hill_omo_9       = "Pumpkin Hill - Omochao 9"
+pumpkin_hill_omo_10      = "Pumpkin Hill - Omochao 10"
+pumpkin_hill_omo_11      = "Pumpkin Hill - Omochao 11"
+pumpkin_hill_animal_1    = "Pumpkin Hill - 1 Animal"
+pumpkin_hill_animal_2    = "Pumpkin Hill - 2 Animals"
+pumpkin_hill_animal_3    = "Pumpkin Hill - 3 Animals"
+pumpkin_hill_animal_4    = "Pumpkin Hill - 4 Animals"
+pumpkin_hill_animal_5    = "Pumpkin Hill - 5 Animals"
+pumpkin_hill_animal_6    = "Pumpkin Hill - 6 Animals"
+pumpkin_hill_animal_7    = "Pumpkin Hill - 7 Animals"
+pumpkin_hill_animal_8    = "Pumpkin Hill - 8 Animals"
+pumpkin_hill_animal_9    = "Pumpkin Hill - 9 Animals"
+pumpkin_hill_animal_10   = "Pumpkin Hill - 10 Animals"
+pumpkin_hill_animal_11   = "Pumpkin Hill - 11 Animals"
+pumpkin_hill_lifebox_1   = "Pumpkin Hill - Extra Life Box 1"
+pumpkin_hill_itembox_1   = "Pumpkin Hill - Item Box 1"
+pumpkin_hill_itembox_2   = "Pumpkin Hill - Item Box 2"
+pumpkin_hill_itembox_3   = "Pumpkin Hill - Item Box 3"
+pumpkin_hill_itembox_4   = "Pumpkin Hill - Item Box 4"
+pumpkin_hill_itembox_5   = "Pumpkin Hill - Item Box 5"
+pumpkin_hill_itembox_6   = "Pumpkin Hill - Item Box 6"
+pumpkin_hill_itembox_7   = "Pumpkin Hill - Item Box 7"
+pumpkin_hill_itembox_8   = "Pumpkin Hill - Item Box 8"
+pumpkin_hill_itembox_9   = "Pumpkin Hill - Item Box 9"
+pumpkin_hill_itembox_10  = "Pumpkin Hill - Item Box 10"
+pumpkin_hill_big         = "Pumpkin Hill - Big"
+pumpkin_hill_upgrade     = "Pumpkin Hill - Upgrade"
+aquatic_mine_1           = "Aquatic Mine - 1"
+aquatic_mine_2           = "Aquatic Mine - 2"
+aquatic_mine_3           = "Aquatic Mine - 3"
+aquatic_mine_4           = "Aquatic Mine - 4"
+aquatic_mine_5           = "Aquatic Mine - 5"
+aquatic_mine_chao_1      = "Aquatic Mine - Chao Key 1"
+aquatic_mine_chao_2      = "Aquatic Mine - Chao Key 2"
+aquatic_mine_chao_3      = "Aquatic Mine - Chao Key 3"
+aquatic_mine_pipe_1      = "Aquatic Mine - Pipe 1"
+aquatic_mine_pipe_2      = "Aquatic Mine - Pipe 2"
+aquatic_mine_pipe_3      = "Aquatic Mine - Pipe 3"
+aquatic_mine_omo_1       = "Aquatic Mine - Omochao 1"
+aquatic_mine_omo_2       = "Aquatic Mine - Omochao 2"
+aquatic_mine_omo_3       = "Aquatic Mine - Omochao 3"
+aquatic_mine_omo_4       = "Aquatic Mine - Omochao 4"
+aquatic_mine_omo_5       = "Aquatic Mine - Omochao 5"
+aquatic_mine_omo_6       = "Aquatic Mine - Omochao 6"
+aquatic_mine_omo_7       = "Aquatic Mine - Omochao 7"
+aquatic_mine_beetle      = "Aquatic Mine - Gold Beetle"
+aquatic_mine_animal_1    = "Aquatic Mine - 1 Animal"
+aquatic_mine_animal_2    = "Aquatic Mine - 2 Animals"
+aquatic_mine_animal_3    = "Aquatic Mine - 3 Animals"
+aquatic_mine_animal_4    = "Aquatic Mine - 4 Animals"
+aquatic_mine_animal_5    = "Aquatic Mine - 5 Animals"
+aquatic_mine_animal_6    = "Aquatic Mine - 6 Animals"
+aquatic_mine_animal_7    = "Aquatic Mine - 7 Animals"
+aquatic_mine_animal_8    = "Aquatic Mine - 8 Animals"
+aquatic_mine_animal_9    = "Aquatic Mine - 9 Animals"
+aquatic_mine_animal_10   = "Aquatic Mine - 10 Animals"
+aquatic_mine_lifebox_1   = "Aquatic Mine - Extra Life Box 1"
+aquatic_mine_itembox_1   = "Aquatic Mine - Item Box 1"
+aquatic_mine_itembox_2   = "Aquatic Mine - Item Box 2"
+aquatic_mine_itembox_3   = "Aquatic Mine - Item Box 3"
+aquatic_mine_itembox_4   = "Aquatic Mine - Item Box 4"
+aquatic_mine_itembox_5   = "Aquatic Mine - Item Box 5"
+aquatic_mine_itembox_6   = "Aquatic Mine - Item Box 6"
+aquatic_mine_big         = "Aquatic Mine - Big"
+aquatic_mine_upgrade     = "Aquatic Mine - Upgrade"
+death_chamber_1          = "Death Chamber - 1"
+death_chamber_2          = "Death Chamber - 2"
+death_chamber_3          = "Death Chamber - 3"
+death_chamber_4          = "Death Chamber - 4"
+death_chamber_5          = "Death Chamber - 5"
+death_chamber_chao_1     = "Death Chamber - Chao Key 1"
+death_chamber_chao_2     = "Death Chamber - Chao Key 2"
+death_chamber_chao_3     = "Death Chamber - Chao Key 3"
+death_chamber_pipe_1     = "Death Chamber - Pipe 1"
+death_chamber_pipe_2     = "Death Chamber - Pipe 2"
+death_chamber_pipe_3     = "Death Chamber - Pipe 3"
+death_chamber_hidden_1   = "Death Chamber - Hidden 1"
+death_chamber_hidden_2   = "Death Chamber - Hidden 2"
+death_chamber_omo_1      = "Death Chamber - Omochao 1"
+death_chamber_omo_2      = "Death Chamber - Omochao 2"
+death_chamber_omo_3      = "Death Chamber - Omochao 3"
+death_chamber_omo_4      = "Death Chamber - Omochao 4"
+death_chamber_omo_5      = "Death Chamber - Omochao 5"
+death_chamber_omo_6      = "Death Chamber - Omochao 6"
+death_chamber_omo_7      = "Death Chamber - Omochao 7"
+death_chamber_omo_8      = "Death Chamber - Omochao 8"
+death_chamber_omo_9      = "Death Chamber - Omochao 9"
+death_chamber_beetle     = "Death Chamber - Gold Beetle"
+death_chamber_animal_1   = "Death Chamber - 1 Animal"
+death_chamber_animal_2   = "Death Chamber - 2 Animals"
+death_chamber_animal_3   = "Death Chamber - 3 Animals"
+death_chamber_animal_4   = "Death Chamber - 4 Animals"
+death_chamber_animal_5   = "Death Chamber - 5 Animals"
+death_chamber_animal_6   = "Death Chamber - 6 Animals"
+death_chamber_animal_7   = "Death Chamber - 7 Animals"
+death_chamber_animal_8   = "Death Chamber - 8 Animals"
+death_chamber_animal_9   = "Death Chamber - 9 Animals"
+death_chamber_animal_10  = "Death Chamber - 10 Animals"
+death_chamber_lifebox_1  = "Death Chamber - Extra Life Box 1"
+death_chamber_itembox_1  = "Death Chamber - Item Box 1"
+death_chamber_itembox_2  = "Death Chamber - Item Box 2"
+death_chamber_itembox_3  = "Death Chamber - Item Box 3"
+death_chamber_itembox_4  = "Death Chamber - Item Box 4"
+death_chamber_itembox_5  = "Death Chamber - Item Box 5"
+death_chamber_itembox_6  = "Death Chamber - Item Box 6"
+death_chamber_itembox_7  = "Death Chamber - Item Box 7"
+death_chamber_itembox_8  = "Death Chamber - Item Box 8"
+death_chamber_itembox_9  = "Death Chamber - Item Box 9"
+death_chamber_itembox_10 = "Death Chamber - Item Box 10"
+death_chamber_itembox_11 = "Death Chamber - Item Box 11"
+death_chamber_big        = "Death Chamber - Big"
+death_chamber_upgrade    = "Death Chamber - Upgrade"
+meteor_herd_1            = "Meteor Herd - 1"
+meteor_herd_2            = "Meteor Herd - 2"
+meteor_herd_3            = "Meteor Herd - 3"
+meteor_herd_4            = "Meteor Herd - 4"
+meteor_herd_5            = "Meteor Herd - 5"
+meteor_herd_chao_1       = "Meteor Herd - Chao Key 1"
+meteor_herd_chao_2       = "Meteor Herd - Chao Key 2"
+meteor_herd_chao_3       = "Meteor Herd - Chao Key 3"
+meteor_herd_pipe_1       = "Meteor Herd - Pipe 1"
+meteor_herd_pipe_2       = "Meteor Herd - Pipe 2"
+meteor_herd_pipe_3       = "Meteor Herd - Pipe 3"
+meteor_herd_omo_1        = "Meteor Herd - Omochao 1"
+meteor_herd_omo_2        = "Meteor Herd - Omochao 2"
+meteor_herd_omo_3        = "Meteor Herd - Omochao 3"
+meteor_herd_beetle       = "Meteor Herd - Gold Beetle"
+meteor_herd_animal_1     = "Meteor Herd - 1 Animal"
+meteor_herd_animal_2     = "Meteor Herd - 2 Animals"
+meteor_herd_animal_3     = "Meteor Herd - 3 Animals"
+meteor_herd_animal_4     = "Meteor Herd - 4 Animals"
+meteor_herd_animal_5     = "Meteor Herd - 5 Animals"
+meteor_herd_animal_6     = "Meteor Herd - 6 Animals"
+meteor_herd_animal_7     = "Meteor Herd - 7 Animals"
+meteor_herd_animal_8     = "Meteor Herd - 8 Animals"
+meteor_herd_animal_9     = "Meteor Herd - 9 Animals"
+meteor_herd_animal_10    = "Meteor Herd - 10 Animals"
+meteor_herd_animal_11    = "Meteor Herd - 11 Animals"
+meteor_herd_lifebox_1    = "Meteor Herd - Extra Life Box 1"
+meteor_herd_lifebox_2    = "Meteor Herd - Extra Life Box 2"
+meteor_herd_lifebox_3    = "Meteor Herd - Extra Life Box 3"
+meteor_herd_lifebox_4    = "Meteor Herd - Extra Life Box 4"
+meteor_herd_lifebox_5    = "Meteor Herd - Extra Life Box 5"
+meteor_herd_itembox_1    = "Meteor Herd - Item Box 1"
+meteor_herd_itembox_2    = "Meteor Herd - Item Box 2"
+meteor_herd_itembox_3    = "Meteor Herd - Item Box 3"
+meteor_herd_itembox_4    = "Meteor Herd - Item Box 4"
+meteor_herd_itembox_5    = "Meteor Herd - Item Box 5"
+meteor_herd_itembox_6    = "Meteor Herd - Item Box 6"
+meteor_herd_itembox_7    = "Meteor Herd - Item Box 7"
+meteor_herd_itembox_8    = "Meteor Herd - Item Box 8"
+meteor_herd_itembox_9    = "Meteor Herd - Item Box 9"
+meteor_herd_itembox_10   = "Meteor Herd - Item Box 10"
+meteor_herd_itembox_11   = "Meteor Herd - Item Box 11"
+meteor_herd_itembox_12   = "Meteor Herd - Item Box 12"
+meteor_herd_big          = "Meteor Herd - Big"
+meteor_herd_upgrade      = "Meteor Herd - Upgrade"
 
 
 # Shadow Mission Definitions
@@ -597,6 +840,16 @@ radical_highway_animal_17 = "Radical Highway - 17 Animals"
 radical_highway_animal_18 = "Radical Highway - 18 Animals"
 radical_highway_animal_19 = "Radical Highway - 19 Animals"
 radical_highway_animal_20 = "Radical Highway - 20 Animals"
+radical_highway_lifebox_1 = "Radical Highway - Extra Life Box 1"
+radical_highway_lifebox_2 = "Radical Highway - Extra Life Box 2"
+radical_highway_itembox_1 = "Radical Highway - Item Box 1"
+radical_highway_itembox_2 = "Radical Highway - Item Box 2"
+radical_highway_itembox_3 = "Radical Highway - Item Box 3"
+radical_highway_itembox_4 = "Radical Highway - Item Box 4"
+radical_highway_itembox_5 = "Radical Highway - Item Box 5"
+radical_highway_itembox_6 = "Radical Highway - Item Box 6"
+radical_highway_itembox_7 = "Radical Highway - Item Box 7"
+radical_highway_big       = "Radical Highway - Big"
 radical_highway_upgrade   = "Radical Highway - Upgrade"
 white_jungle_1            = "White Jungle - 1"
 white_jungle_2            = "White Jungle - 2"
@@ -635,6 +888,18 @@ white_jungle_animal_13    = "White Jungle - 13 Animals"
 white_jungle_animal_14    = "White Jungle - 14 Animals"
 white_jungle_animal_15    = "White Jungle - 15 Animals"
 white_jungle_animal_16    = "White Jungle - 16 Animals"
+white_jungle_lifebox_1    = "White Jungle - Extra Life Box 1"
+white_jungle_lifebox_2    = "White Jungle - Extra Life Box 2"
+white_jungle_itembox_1    = "White Jungle - Item Box 1"
+white_jungle_itembox_2    = "White Jungle - Item Box 2"
+white_jungle_itembox_3    = "White Jungle - Item Box 3"
+white_jungle_itembox_4    = "White Jungle - Item Box 4"
+white_jungle_itembox_5    = "White Jungle - Item Box 5"
+white_jungle_itembox_6    = "White Jungle - Item Box 6"
+white_jungle_itembox_7    = "White Jungle - Item Box 7"
+white_jungle_itembox_8    = "White Jungle - Item Box 8"
+white_jungle_big_1        = "White Jungle - Big 1"
+white_jungle_big_2        = "White Jungle - Big 2"
 white_jungle_upgrade      = "White Jungle - Upgrade"
 sky_rail_1                = "Sky Rail - 1"
 sky_rail_2                = "Sky Rail - 2"
@@ -671,6 +936,39 @@ sky_rail_animal_17        = "Sky Rail - 17 Animals"
 sky_rail_animal_18        = "Sky Rail - 18 Animals"
 sky_rail_animal_19        = "Sky Rail - 19 Animals"
 sky_rail_animal_20        = "Sky Rail - 20 Animals"
+sky_rail_lifebox_1        = "Sky Rail - Extra Life Box 1"
+sky_rail_lifebox_2        = "Sky Rail - Extra Life Box 2"
+sky_rail_lifebox_3        = "Sky Rail - Extra Life Box 3"
+sky_rail_lifebox_4        = "Sky Rail - Extra Life Box 4"
+sky_rail_lifebox_5        = "Sky Rail - Extra Life Box 5"
+sky_rail_lifebox_6        = "Sky Rail - Extra Life Box 6"
+sky_rail_lifebox_7        = "Sky Rail - Extra Life Box 7"
+sky_rail_lifebox_8        = "Sky Rail - Extra Life Box 8"
+sky_rail_lifebox_9        = "Sky Rail - Extra Life Box 9"
+sky_rail_itembox_1        = "Sky Rail - Item Box 1"
+sky_rail_itembox_2        = "Sky Rail - Item Box 2"
+sky_rail_itembox_3        = "Sky Rail - Item Box 3"
+sky_rail_itembox_4        = "Sky Rail - Item Box 4"
+sky_rail_itembox_5        = "Sky Rail - Item Box 5"
+sky_rail_itembox_6        = "Sky Rail - Item Box 6"
+sky_rail_itembox_7        = "Sky Rail - Item Box 7"
+sky_rail_itembox_8        = "Sky Rail - Item Box 8"
+sky_rail_itembox_9        = "Sky Rail - Item Box 9"
+sky_rail_itembox_10       = "Sky Rail - Item Box 10"
+sky_rail_itembox_11       = "Sky Rail - Item Box 11"
+sky_rail_itembox_12       = "Sky Rail - Item Box 12"
+sky_rail_itembox_13       = "Sky Rail - Item Box 13"
+sky_rail_itembox_14       = "Sky Rail - Item Box 14"
+sky_rail_itembox_15       = "Sky Rail - Item Box 15"
+sky_rail_itembox_16       = "Sky Rail - Item Box 16"
+sky_rail_itembox_17       = "Sky Rail - Item Box 17"
+sky_rail_itembox_18       = "Sky Rail - Item Box 18"
+sky_rail_itembox_19       = "Sky Rail - Item Box 19"
+sky_rail_itembox_20       = "Sky Rail - Item Box 20"
+sky_rail_itembox_21       = "Sky Rail - Item Box 21"
+sky_rail_itembox_22       = "Sky Rail - Item Box 22"
+sky_rail_itembox_23       = "Sky Rail - Item Box 23"
+sky_rail_big              = "Sky Rail - Big"
 sky_rail_upgrade          = "Sky Rail - Upgrade"
 final_chase_1             = "Final Chase - 1"
 final_chase_2             = "Final Chase - 2"
@@ -705,359 +1003,595 @@ final_chase_animal_17     = "Final Chase - 17 Animals"
 final_chase_animal_18     = "Final Chase - 18 Animals"
 final_chase_animal_19     = "Final Chase - 19 Animals"
 final_chase_animal_20     = "Final Chase - 20 Animals"
+final_chase_lifebox_1     = "Final Chase - Extra Life Box 1"
+final_chase_lifebox_2     = "Final Chase - Extra Life Box 2"
+final_chase_lifebox_3     = "Final Chase - Extra Life Box 3"
+final_chase_lifebox_4     = "Final Chase - Extra Life Box 4"
+final_chase_lifebox_5     = "Final Chase - Extra Life Box 5"
+final_chase_lifebox_6     = "Final Chase - Extra Life Box 6"
+final_chase_lifebox_7     = "Final Chase - Extra Life Box 7"
+final_chase_lifebox_8     = "Final Chase - Extra Life Box 8"
+final_chase_lifebox_9     = "Final Chase - Extra Life Box 9"
+final_chase_itembox_1     = "Final Chase - Item Box 1"
+final_chase_itembox_2     = "Final Chase - Item Box 2"
+final_chase_itembox_3     = "Final Chase - Item Box 3"
+final_chase_itembox_4     = "Final Chase - Item Box 4"
+final_chase_itembox_5     = "Final Chase - Item Box 5"
+final_chase_itembox_6     = "Final Chase - Item Box 6"
+final_chase_itembox_7     = "Final Chase - Item Box 7"
+final_chase_itembox_8     = "Final Chase - Item Box 8"
+final_chase_itembox_9     = "Final Chase - Item Box 9"
+final_chase_itembox_10    = "Final Chase - Item Box 10"
+final_chase_itembox_11    = "Final Chase - Item Box 11"
+final_chase_itembox_12    = "Final Chase - Item Box 12"
+final_chase_itembox_13    = "Final Chase - Item Box 13"
+final_chase_itembox_14    = "Final Chase - Item Box 14"
+final_chase_itembox_15    = "Final Chase - Item Box 15"
+final_chase_itembox_16    = "Final Chase - Item Box 16"
+final_chase_itembox_17    = "Final Chase - Item Box 17"
+final_chase_itembox_18    = "Final Chase - Item Box 18"
+final_chase_itembox_19    = "Final Chase - Item Box 19"
+final_chase_itembox_20    = "Final Chase - Item Box 20"
+final_chase_itembox_21    = "Final Chase - Item Box 21"
+final_chase_itembox_22    = "Final Chase - Item Box 22"
+final_chase_itembox_23    = "Final Chase - Item Box 23"
+final_chase_itembox_24    = "Final Chase - Item Box 24"
+final_chase_itembox_25    = "Final Chase - Item Box 25"
+final_chase_itembox_26    = "Final Chase - Item Box 26"
+final_chase_itembox_27    = "Final Chase - Item Box 27"
+final_chase_itembox_28    = "Final Chase - Item Box 28"
+final_chase_itembox_29    = "Final Chase - Item Box 29"
+final_chase_itembox_30    = "Final Chase - Item Box 30"
+final_chase_itembox_31    = "Final Chase - Item Box 31"
+final_chase_itembox_32    = "Final Chase - Item Box 32"
+final_chase_itembox_33    = "Final Chase - Item Box 33"
+final_chase_itembox_34    = "Final Chase - Item Box 34"
+final_chase_itembox_35    = "Final Chase - Item Box 35"
+final_chase_big           = "Final Chase - Big"
 final_chase_upgrade       = "Final Chase - Upgrade"
 
 # Eggman Mission Definitions
-iron_gate_1           = "Iron Gate - 1"
-iron_gate_2           = "Iron Gate - 2"
-iron_gate_3           = "Iron Gate - 3"
-iron_gate_4           = "Iron Gate - 4"
-iron_gate_5           = "Iron Gate - 5"
-iron_gate_chao_1      = "Iron Gate - Chao Key 1"
-iron_gate_chao_2      = "Iron Gate - Chao Key 2"
-iron_gate_chao_3      = "Iron Gate - Chao Key 3"
-iron_gate_pipe_1      = "Iron Gate - Pipe 1"
-iron_gate_pipe_2      = "Iron Gate - Pipe 2"
-iron_gate_pipe_3      = "Iron Gate - Pipe 3"
-iron_gate_pipe_4      = "Iron Gate - Pipe 4"
-iron_gate_pipe_5      = "Iron Gate - Pipe 5"
-iron_gate_omo_1       = "Iron Gate - Omochao 1"
-iron_gate_omo_2       = "Iron Gate - Omochao 2"
-iron_gate_omo_3       = "Iron Gate - Omochao 3"
-iron_gate_omo_4       = "Iron Gate - Omochao 4"
-iron_gate_omo_5       = "Iron Gate - Omochao 5"
-iron_gate_omo_6       = "Iron Gate - Omochao 6"
-iron_gate_beetle      = "Iron Gate - Gold Beetle"
-iron_gate_animal_1    = "Iron Gate - 1 Animal"
-iron_gate_animal_2    = "Iron Gate - 2 Animals"
-iron_gate_animal_3    = "Iron Gate - 3 Animals"
-iron_gate_animal_4    = "Iron Gate - 4 Animals"
-iron_gate_animal_5    = "Iron Gate - 5 Animals"
-iron_gate_animal_6    = "Iron Gate - 6 Animals"
-iron_gate_animal_7    = "Iron Gate - 7 Animals"
-iron_gate_animal_8    = "Iron Gate - 8 Animals"
-iron_gate_animal_9    = "Iron Gate - 9 Animals"
-iron_gate_animal_10   = "Iron Gate - 10 Animals"
-iron_gate_animal_11   = "Iron Gate - 11 Animals"
-iron_gate_animal_12   = "Iron Gate - 12 Animals"
-iron_gate_animal_13   = "Iron Gate - 13 Animals"
-iron_gate_animal_14   = "Iron Gate - 14 Animals"
-iron_gate_animal_15   = "Iron Gate - 15 Animals"
-iron_gate_upgrade     = "Iron Gate - Upgrade"
-sand_ocean_1          = "Sand Ocean - 1"
-sand_ocean_2          = "Sand Ocean - 2"
-sand_ocean_3          = "Sand Ocean - 3"
-sand_ocean_4          = "Sand Ocean - 4"
-sand_ocean_5          = "Sand Ocean - 5"
-sand_ocean_chao_1     = "Sand Ocean - Chao Key 1"
-sand_ocean_chao_2     = "Sand Ocean - Chao Key 2"
-sand_ocean_chao_3     = "Sand Ocean - Chao Key 3"
-sand_ocean_pipe_1     = "Sand Ocean - Pipe 1"
-sand_ocean_pipe_2     = "Sand Ocean - Pipe 2"
-sand_ocean_pipe_3     = "Sand Ocean - Pipe 3"
-sand_ocean_pipe_4     = "Sand Ocean - Pipe 4"
-sand_ocean_pipe_5     = "Sand Ocean - Pipe 5"
-sand_ocean_omo_1      = "Sand Ocean - Omochao 1"
-sand_ocean_omo_2      = "Sand Ocean - Omochao 2"
-sand_ocean_beetle     = "Sand Ocean - Gold Beetle"
-sand_ocean_animal_1   = "Sand Ocean - 1 Animal"
-sand_ocean_animal_2   = "Sand Ocean - 2 Animals"
-sand_ocean_animal_3   = "Sand Ocean - 3 Animals"
-sand_ocean_animal_4   = "Sand Ocean - 4 Animals"
-sand_ocean_animal_5   = "Sand Ocean - 5 Animals"
-sand_ocean_animal_6   = "Sand Ocean - 6 Animals"
-sand_ocean_animal_7   = "Sand Ocean - 7 Animals"
-sand_ocean_animal_8   = "Sand Ocean - 8 Animals"
-sand_ocean_animal_9   = "Sand Ocean - 9 Animals"
-sand_ocean_animal_10  = "Sand Ocean - 10 Animals"
-sand_ocean_animal_11  = "Sand Ocean - 11 Animals"
-sand_ocean_animal_12  = "Sand Ocean - 12 Animals"
-sand_ocean_animal_13  = "Sand Ocean - 13 Animals"
-sand_ocean_animal_14  = "Sand Ocean - 14 Animals"
-sand_ocean_animal_15  = "Sand Ocean - 15 Animals"
-sand_ocean_upgrade    = "Sand Ocean - Upgrade"
-lost_colony_1         = "Lost Colony - 1"
-lost_colony_2         = "Lost Colony - 2"
-lost_colony_3         = "Lost Colony - 3"
-lost_colony_4         = "Lost Colony - 4"
-lost_colony_5         = "Lost Colony - 5"
-lost_colony_chao_1    = "Lost Colony - Chao Key 1"
-lost_colony_chao_2    = "Lost Colony - Chao Key 2"
-lost_colony_chao_3    = "Lost Colony - Chao Key 3"
-lost_colony_pipe_1    = "Lost Colony - Pipe 1"
-lost_colony_pipe_2    = "Lost Colony - Pipe 2"
-lost_colony_hidden_1  = "Lost Colony - Hidden 1"
-lost_colony_omo_1     = "Lost Colony - Omochao 1"
-lost_colony_omo_2     = "Lost Colony - Omochao 2"
-lost_colony_omo_3     = "Lost Colony - Omochao 3"
-lost_colony_omo_4     = "Lost Colony - Omochao 4"
-lost_colony_omo_5     = "Lost Colony - Omochao 5"
-lost_colony_omo_6     = "Lost Colony - Omochao 6"
-lost_colony_omo_7     = "Lost Colony - Omochao 7"
-lost_colony_omo_8     = "Lost Colony - Omochao 8"
-lost_colony_beetle    = "Lost Colony - Gold Beetle"
-lost_colony_animal_1  = "Lost Colony - 1 Animal"
-lost_colony_animal_2  = "Lost Colony - 2 Animals"
-lost_colony_animal_3  = "Lost Colony - 3 Animals"
-lost_colony_animal_4  = "Lost Colony - 4 Animals"
-lost_colony_animal_5  = "Lost Colony - 5 Animals"
-lost_colony_animal_6  = "Lost Colony - 6 Animals"
-lost_colony_animal_7  = "Lost Colony - 7 Animals"
-lost_colony_animal_8  = "Lost Colony - 8 Animals"
-lost_colony_animal_9  = "Lost Colony - 9 Animals"
-lost_colony_animal_10 = "Lost Colony - 10 Animals"
-lost_colony_animal_11 = "Lost Colony - 11 Animals"
-lost_colony_animal_12 = "Lost Colony - 12 Animals"
-lost_colony_animal_13 = "Lost Colony - 13 Animals"
-lost_colony_animal_14 = "Lost Colony - 14 Animals"
-lost_colony_upgrade   = "Lost Colony - Upgrade"
-weapons_bed_1         = "Weapons Bed - 1"
-weapons_bed_2         = "Weapons Bed - 2"
-weapons_bed_3         = "Weapons Bed - 3"
-weapons_bed_4         = "Weapons Bed - 4"
-weapons_bed_5         = "Weapons Bed - 5"
-weapons_bed_chao_1    = "Weapons Bed - Chao Key 1"
-weapons_bed_chao_2    = "Weapons Bed - Chao Key 2"
-weapons_bed_chao_3    = "Weapons Bed - Chao Key 3"
-weapons_bed_pipe_1    = "Weapons Bed - Pipe 1"
-weapons_bed_pipe_2    = "Weapons Bed - Pipe 2"
-weapons_bed_pipe_3    = "Weapons Bed - Pipe 3"
-weapons_bed_pipe_4    = "Weapons Bed - Pipe 4"
-weapons_bed_pipe_5    = "Weapons Bed - Pipe 5"
-weapons_bed_omo_1     = "Weapons Bed - Omochao 1"
-weapons_bed_omo_2     = "Weapons Bed - Omochao 2"
-weapons_bed_omo_3     = "Weapons Bed - Omochao 3"
-weapons_bed_animal_1  = "Weapons Bed - 1 Animal"
-weapons_bed_animal_2  = "Weapons Bed - 2 Animals"
-weapons_bed_animal_3  = "Weapons Bed - 3 Animals"
-weapons_bed_animal_4  = "Weapons Bed - 4 Animals"
-weapons_bed_animal_5  = "Weapons Bed - 5 Animals"
-weapons_bed_animal_6  = "Weapons Bed - 6 Animals"
-weapons_bed_animal_7  = "Weapons Bed - 7 Animals"
-weapons_bed_animal_8  = "Weapons Bed - 8 Animals"
-weapons_bed_animal_9  = "Weapons Bed - 9 Animals"
-weapons_bed_animal_10 = "Weapons Bed - 10 Animals"
-weapons_bed_animal_11 = "Weapons Bed - 11 Animals"
-weapons_bed_animal_12 = "Weapons Bed - 12 Animals"
-weapons_bed_animal_13 = "Weapons Bed - 13 Animals"
-weapons_bed_animal_14 = "Weapons Bed - 14 Animals"
-weapons_bed_animal_15 = "Weapons Bed - 15 Animals"
-weapons_bed_upgrade   = "Weapons Bed - Upgrade"
-cosmic_wall_1         = "Cosmic Wall - 1"
-cosmic_wall_2         = "Cosmic Wall - 2"
-cosmic_wall_3         = "Cosmic Wall - 3"
-cosmic_wall_4         = "Cosmic Wall - 4"
-cosmic_wall_5         = "Cosmic Wall - 5"
-cosmic_wall_chao_1    = "Cosmic Wall - Chao Key 1"
-cosmic_wall_chao_2    = "Cosmic Wall - Chao Key 2"
-cosmic_wall_chao_3    = "Cosmic Wall - Chao Key 3"
-cosmic_wall_pipe_1    = "Cosmic Wall - Pipe 1"
-cosmic_wall_pipe_2    = "Cosmic Wall - Pipe 2"
-cosmic_wall_pipe_3    = "Cosmic Wall - Pipe 3"
-cosmic_wall_pipe_4    = "Cosmic Wall - Pipe 4"
-cosmic_wall_pipe_5    = "Cosmic Wall - Pipe 5"
-cosmic_wall_omo_1     = "Cosmic Wall - Omochao 1"
-cosmic_wall_beetle    = "Cosmic Wall - Gold Beetle"
-cosmic_wall_animal_1  = "Cosmic Wall - 1 Animal"
-cosmic_wall_animal_2  = "Cosmic Wall - 2 Animals"
-cosmic_wall_animal_3  = "Cosmic Wall - 3 Animals"
-cosmic_wall_animal_4  = "Cosmic Wall - 4 Animals"
-cosmic_wall_animal_5  = "Cosmic Wall - 5 Animals"
-cosmic_wall_animal_6  = "Cosmic Wall - 6 Animals"
-cosmic_wall_animal_7  = "Cosmic Wall - 7 Animals"
-cosmic_wall_animal_8  = "Cosmic Wall - 8 Animals"
-cosmic_wall_animal_9  = "Cosmic Wall - 9 Animals"
-cosmic_wall_animal_10 = "Cosmic Wall - 10 Animals"
-cosmic_wall_animal_11 = "Cosmic Wall - 11 Animals"
-cosmic_wall_animal_12 = "Cosmic Wall - 12 Animals"
-cosmic_wall_animal_13 = "Cosmic Wall - 13 Animals"
-cosmic_wall_animal_14 = "Cosmic Wall - 14 Animals"
-cosmic_wall_animal_15 = "Cosmic Wall - 15 Animals"
-cosmic_wall_upgrade   = "Cosmic Wall - Upgrade"
+iron_gate_1            = "Iron Gate - 1"
+iron_gate_2            = "Iron Gate - 2"
+iron_gate_3            = "Iron Gate - 3"
+iron_gate_4            = "Iron Gate - 4"
+iron_gate_5            = "Iron Gate - 5"
+iron_gate_chao_1       = "Iron Gate - Chao Key 1"
+iron_gate_chao_2       = "Iron Gate - Chao Key 2"
+iron_gate_chao_3       = "Iron Gate - Chao Key 3"
+iron_gate_pipe_1       = "Iron Gate - Pipe 1"
+iron_gate_pipe_2       = "Iron Gate - Pipe 2"
+iron_gate_pipe_3       = "Iron Gate - Pipe 3"
+iron_gate_pipe_4       = "Iron Gate - Pipe 4"
+iron_gate_pipe_5       = "Iron Gate - Pipe 5"
+iron_gate_omo_1        = "Iron Gate - Omochao 1"
+iron_gate_omo_2        = "Iron Gate - Omochao 2"
+iron_gate_omo_3        = "Iron Gate - Omochao 3"
+iron_gate_omo_4        = "Iron Gate - Omochao 4"
+iron_gate_omo_5        = "Iron Gate - Omochao 5"
+iron_gate_omo_6        = "Iron Gate - Omochao 6"
+iron_gate_beetle       = "Iron Gate - Gold Beetle"
+iron_gate_animal_1     = "Iron Gate - 1 Animal"
+iron_gate_animal_2     = "Iron Gate - 2 Animals"
+iron_gate_animal_3     = "Iron Gate - 3 Animals"
+iron_gate_animal_4     = "Iron Gate - 4 Animals"
+iron_gate_animal_5     = "Iron Gate - 5 Animals"
+iron_gate_animal_6     = "Iron Gate - 6 Animals"
+iron_gate_animal_7     = "Iron Gate - 7 Animals"
+iron_gate_animal_8     = "Iron Gate - 8 Animals"
+iron_gate_animal_9     = "Iron Gate - 9 Animals"
+iron_gate_animal_10    = "Iron Gate - 10 Animals"
+iron_gate_animal_11    = "Iron Gate - 11 Animals"
+iron_gate_animal_12    = "Iron Gate - 12 Animals"
+iron_gate_animal_13    = "Iron Gate - 13 Animals"
+iron_gate_animal_14    = "Iron Gate - 14 Animals"
+iron_gate_animal_15    = "Iron Gate - 15 Animals"
+iron_gate_lifebox_1    = "Iron Gate - Extra Life Box 1"
+iron_gate_lifebox_2    = "Iron Gate - Extra Life Box 2"
+iron_gate_lifebox_3    = "Iron Gate - Extra Life Box 3"
+iron_gate_lifebox_4    = "Iron Gate - Extra Life Box 4"
+iron_gate_itembox_1    = "Iron Gate - Item Box 1"
+iron_gate_itembox_2    = "Iron Gate - Item Box 2"
+iron_gate_itembox_3    = "Iron Gate - Item Box 3"
+iron_gate_itembox_4    = "Iron Gate - Item Box 4"
+iron_gate_itembox_5    = "Iron Gate - Item Box 5"
+iron_gate_itembox_6    = "Iron Gate - Item Box 6"
+iron_gate_itembox_7    = "Iron Gate - Item Box 7"
+iron_gate_itembox_8    = "Iron Gate - Item Box 8"
+iron_gate_itembox_9    = "Iron Gate - Item Box 9"
+iron_gate_itembox_10   = "Iron Gate - Item Box 10"
+iron_gate_itembox_11   = "Iron Gate - Item Box 11"
+iron_gate_itembox_12   = "Iron Gate - Item Box 12"
+iron_gate_itembox_13   = "Iron Gate - Item Box 13"
+iron_gate_itembox_14   = "Iron Gate - Item Box 14"
+iron_gate_itembox_15   = "Iron Gate - Item Box 15"
+iron_gate_itembox_16   = "Iron Gate - Item Box 16"
+iron_gate_big          = "Iron Gate - Big"
+iron_gate_upgrade      = "Iron Gate - Upgrade"
+sand_ocean_1           = "Sand Ocean - 1"
+sand_ocean_2           = "Sand Ocean - 2"
+sand_ocean_3           = "Sand Ocean - 3"
+sand_ocean_4           = "Sand Ocean - 4"
+sand_ocean_5           = "Sand Ocean - 5"
+sand_ocean_chao_1      = "Sand Ocean - Chao Key 1"
+sand_ocean_chao_2      = "Sand Ocean - Chao Key 2"
+sand_ocean_chao_3      = "Sand Ocean - Chao Key 3"
+sand_ocean_pipe_1      = "Sand Ocean - Pipe 1"
+sand_ocean_pipe_2      = "Sand Ocean - Pipe 2"
+sand_ocean_pipe_3      = "Sand Ocean - Pipe 3"
+sand_ocean_pipe_4      = "Sand Ocean - Pipe 4"
+sand_ocean_pipe_5      = "Sand Ocean - Pipe 5"
+sand_ocean_omo_1       = "Sand Ocean - Omochao 1"
+sand_ocean_omo_2       = "Sand Ocean - Omochao 2"
+sand_ocean_beetle      = "Sand Ocean - Gold Beetle"
+sand_ocean_animal_1    = "Sand Ocean - 1 Animal"
+sand_ocean_animal_2    = "Sand Ocean - 2 Animals"
+sand_ocean_animal_3    = "Sand Ocean - 3 Animals"
+sand_ocean_animal_4    = "Sand Ocean - 4 Animals"
+sand_ocean_animal_5    = "Sand Ocean - 5 Animals"
+sand_ocean_animal_6    = "Sand Ocean - 6 Animals"
+sand_ocean_animal_7    = "Sand Ocean - 7 Animals"
+sand_ocean_animal_8    = "Sand Ocean - 8 Animals"
+sand_ocean_animal_9    = "Sand Ocean - 9 Animals"
+sand_ocean_animal_10   = "Sand Ocean - 10 Animals"
+sand_ocean_animal_11   = "Sand Ocean - 11 Animals"
+sand_ocean_animal_12   = "Sand Ocean - 12 Animals"
+sand_ocean_animal_13   = "Sand Ocean - 13 Animals"
+sand_ocean_animal_14   = "Sand Ocean - 14 Animals"
+sand_ocean_animal_15   = "Sand Ocean - 15 Animals"
+sand_ocean_lifebox_1   = "Sand Ocean - Extra Life Box 1"
+sand_ocean_lifebox_2   = "Sand Ocean - Extra Life Box 2"
+sand_ocean_lifebox_3   = "Sand Ocean - Extra Life Box 3"
+sand_ocean_itembox_1   = "Sand Ocean - Item Box 1"
+sand_ocean_itembox_2   = "Sand Ocean - Item Box 2"
+sand_ocean_itembox_3   = "Sand Ocean - Item Box 3"
+sand_ocean_itembox_4   = "Sand Ocean - Item Box 4"
+sand_ocean_itembox_5   = "Sand Ocean - Item Box 5"
+sand_ocean_itembox_6   = "Sand Ocean - Item Box 6"
+sand_ocean_itembox_7   = "Sand Ocean - Item Box 7"
+sand_ocean_itembox_8   = "Sand Ocean - Item Box 8"
+sand_ocean_itembox_9   = "Sand Ocean - Item Box 9"
+sand_ocean_itembox_10  = "Sand Ocean - Item Box 10"
+sand_ocean_big         = "Sand Ocean - Big"
+sand_ocean_upgrade     = "Sand Ocean - Upgrade"
+lost_colony_1          = "Lost Colony - 1"
+lost_colony_2          = "Lost Colony - 2"
+lost_colony_3          = "Lost Colony - 3"
+lost_colony_4          = "Lost Colony - 4"
+lost_colony_5          = "Lost Colony - 5"
+lost_colony_chao_1     = "Lost Colony - Chao Key 1"
+lost_colony_chao_2     = "Lost Colony - Chao Key 2"
+lost_colony_chao_3     = "Lost Colony - Chao Key 3"
+lost_colony_pipe_1     = "Lost Colony - Pipe 1"
+lost_colony_pipe_2     = "Lost Colony - Pipe 2"
+lost_colony_hidden_1   = "Lost Colony - Hidden 1"
+lost_colony_omo_1      = "Lost Colony - Omochao 1"
+lost_colony_omo_2      = "Lost Colony - Omochao 2"
+lost_colony_omo_3      = "Lost Colony - Omochao 3"
+lost_colony_omo_4      = "Lost Colony - Omochao 4"
+lost_colony_omo_5      = "Lost Colony - Omochao 5"
+lost_colony_omo_6      = "Lost Colony - Omochao 6"
+lost_colony_omo_7      = "Lost Colony - Omochao 7"
+lost_colony_omo_8      = "Lost Colony - Omochao 8"
+lost_colony_beetle     = "Lost Colony - Gold Beetle"
+lost_colony_animal_1   = "Lost Colony - 1 Animal"
+lost_colony_animal_2   = "Lost Colony - 2 Animals"
+lost_colony_animal_3   = "Lost Colony - 3 Animals"
+lost_colony_animal_4   = "Lost Colony - 4 Animals"
+lost_colony_animal_5   = "Lost Colony - 5 Animals"
+lost_colony_animal_6   = "Lost Colony - 6 Animals"
+lost_colony_animal_7   = "Lost Colony - 7 Animals"
+lost_colony_animal_8   = "Lost Colony - 8 Animals"
+lost_colony_animal_9   = "Lost Colony - 9 Animals"
+lost_colony_animal_10  = "Lost Colony - 10 Animals"
+lost_colony_animal_11  = "Lost Colony - 11 Animals"
+lost_colony_animal_12  = "Lost Colony - 12 Animals"
+lost_colony_animal_13  = "Lost Colony - 13 Animals"
+lost_colony_animal_14  = "Lost Colony - 14 Animals"
+lost_colony_lifebox_1  = "Lost Colony - Extra Life Box 1"
+lost_colony_itembox_1  = "Lost Colony - Item Box 1"
+lost_colony_itembox_2  = "Lost Colony - Item Box 2"
+lost_colony_itembox_3  = "Lost Colony - Item Box 3"
+lost_colony_itembox_4  = "Lost Colony - Item Box 4"
+lost_colony_itembox_5  = "Lost Colony - Item Box 5"
+lost_colony_itembox_6  = "Lost Colony - Item Box 6"
+lost_colony_itembox_7  = "Lost Colony - Item Box 7"
+lost_colony_itembox_8  = "Lost Colony - Item Box 8"
+lost_colony_itembox_9  = "Lost Colony - Item Box 9"
+lost_colony_big        = "Lost Colony - Big"
+lost_colony_upgrade    = "Lost Colony - Upgrade"
+weapons_bed_1          = "Weapons Bed - 1"
+weapons_bed_2          = "Weapons Bed - 2"
+weapons_bed_3          = "Weapons Bed - 3"
+weapons_bed_4          = "Weapons Bed - 4"
+weapons_bed_5          = "Weapons Bed - 5"
+weapons_bed_chao_1     = "Weapons Bed - Chao Key 1"
+weapons_bed_chao_2     = "Weapons Bed - Chao Key 2"
+weapons_bed_chao_3     = "Weapons Bed - Chao Key 3"
+weapons_bed_pipe_1     = "Weapons Bed - Pipe 1"
+weapons_bed_pipe_2     = "Weapons Bed - Pipe 2"
+weapons_bed_pipe_3     = "Weapons Bed - Pipe 3"
+weapons_bed_pipe_4     = "Weapons Bed - Pipe 4"
+weapons_bed_pipe_5     = "Weapons Bed - Pipe 5"
+weapons_bed_omo_1      = "Weapons Bed - Omochao 1"
+weapons_bed_omo_2      = "Weapons Bed - Omochao 2"
+weapons_bed_omo_3      = "Weapons Bed - Omochao 3"
+weapons_bed_animal_1   = "Weapons Bed - 1 Animal"
+weapons_bed_animal_2   = "Weapons Bed - 2 Animals"
+weapons_bed_animal_3   = "Weapons Bed - 3 Animals"
+weapons_bed_animal_4   = "Weapons Bed - 4 Animals"
+weapons_bed_animal_5   = "Weapons Bed - 5 Animals"
+weapons_bed_animal_6   = "Weapons Bed - 6 Animals"
+weapons_bed_animal_7   = "Weapons Bed - 7 Animals"
+weapons_bed_animal_8   = "Weapons Bed - 8 Animals"
+weapons_bed_animal_9   = "Weapons Bed - 9 Animals"
+weapons_bed_animal_10  = "Weapons Bed - 10 Animals"
+weapons_bed_animal_11  = "Weapons Bed - 11 Animals"
+weapons_bed_animal_12  = "Weapons Bed - 12 Animals"
+weapons_bed_animal_13  = "Weapons Bed - 13 Animals"
+weapons_bed_animal_14  = "Weapons Bed - 14 Animals"
+weapons_bed_animal_15  = "Weapons Bed - 15 Animals"
+weapons_bed_lifebox_1  = "Weapons Bed - Extra Life Box 1"
+weapons_bed_itembox_1  = "Weapons Bed - Item Box 1"
+weapons_bed_itembox_2  = "Weapons Bed - Item Box 2"
+weapons_bed_itembox_3  = "Weapons Bed - Item Box 3"
+weapons_bed_itembox_4  = "Weapons Bed - Item Box 4"
+weapons_bed_itembox_5  = "Weapons Bed - Item Box 5"
+weapons_bed_itembox_6  = "Weapons Bed - Item Box 6"
+weapons_bed_itembox_7  = "Weapons Bed - Item Box 7"
+weapons_bed_big        = "Weapons Bed - Big"
+weapons_bed_upgrade    = "Weapons Bed - Upgrade"
+cosmic_wall_1          = "Cosmic Wall - 1"
+cosmic_wall_2          = "Cosmic Wall - 2"
+cosmic_wall_3          = "Cosmic Wall - 3"
+cosmic_wall_4          = "Cosmic Wall - 4"
+cosmic_wall_5          = "Cosmic Wall - 5"
+cosmic_wall_chao_1     = "Cosmic Wall - Chao Key 1"
+cosmic_wall_chao_2     = "Cosmic Wall - Chao Key 2"
+cosmic_wall_chao_3     = "Cosmic Wall - Chao Key 3"
+cosmic_wall_pipe_1     = "Cosmic Wall - Pipe 1"
+cosmic_wall_pipe_2     = "Cosmic Wall - Pipe 2"
+cosmic_wall_pipe_3     = "Cosmic Wall - Pipe 3"
+cosmic_wall_pipe_4     = "Cosmic Wall - Pipe 4"
+cosmic_wall_pipe_5     = "Cosmic Wall - Pipe 5"
+cosmic_wall_omo_1      = "Cosmic Wall - Omochao 1"
+cosmic_wall_beetle     = "Cosmic Wall - Gold Beetle"
+cosmic_wall_animal_1   = "Cosmic Wall - 1 Animal"
+cosmic_wall_animal_2   = "Cosmic Wall - 2 Animals"
+cosmic_wall_animal_3   = "Cosmic Wall - 3 Animals"
+cosmic_wall_animal_4   = "Cosmic Wall - 4 Animals"
+cosmic_wall_animal_5   = "Cosmic Wall - 5 Animals"
+cosmic_wall_animal_6   = "Cosmic Wall - 6 Animals"
+cosmic_wall_animal_7   = "Cosmic Wall - 7 Animals"
+cosmic_wall_animal_8   = "Cosmic Wall - 8 Animals"
+cosmic_wall_animal_9   = "Cosmic Wall - 9 Animals"
+cosmic_wall_animal_10  = "Cosmic Wall - 10 Animals"
+cosmic_wall_animal_11  = "Cosmic Wall - 11 Animals"
+cosmic_wall_animal_12  = "Cosmic Wall - 12 Animals"
+cosmic_wall_animal_13  = "Cosmic Wall - 13 Animals"
+cosmic_wall_animal_14  = "Cosmic Wall - 14 Animals"
+cosmic_wall_animal_15  = "Cosmic Wall - 15 Animals"
+cosmic_wall_itembox_1  = "Cosmic Wall - Item Box 1"
+cosmic_wall_itembox_2  = "Cosmic Wall - Item Box 2"
+cosmic_wall_itembox_3  = "Cosmic Wall - Item Box 3"
+cosmic_wall_itembox_4  = "Cosmic Wall - Item Box 4"
+cosmic_wall_itembox_5  = "Cosmic Wall - Item Box 5"
+cosmic_wall_itembox_6  = "Cosmic Wall - Item Box 6"
+cosmic_wall_itembox_7  = "Cosmic Wall - Item Box 7"
+cosmic_wall_itembox_8  = "Cosmic Wall - Item Box 8"
+cosmic_wall_itembox_9  = "Cosmic Wall - Item Box 9"
+cosmic_wall_itembox_10 = "Cosmic Wall - Item Box 10"
+cosmic_wall_itembox_11 = "Cosmic Wall - Item Box 11"
+cosmic_wall_itembox_12 = "Cosmic Wall - Item Box 12"
+cosmic_wall_itembox_13 = "Cosmic Wall - Item Box 13"
+cosmic_wall_itembox_14 = "Cosmic Wall - Item Box 14"
+cosmic_wall_itembox_15 = "Cosmic Wall - Item Box 15"
+cosmic_wall_itembox_16 = "Cosmic Wall - Item Box 16"
+cosmic_wall_itembox_17 = "Cosmic Wall - Item Box 17"
+cosmic_wall_itembox_18 = "Cosmic Wall - Item Box 18"
+cosmic_wall_itembox_19 = "Cosmic Wall - Item Box 19"
+cosmic_wall_itembox_20 = "Cosmic Wall - Item Box 20"
+cosmic_wall_itembox_21 = "Cosmic Wall - Item Box 21"
+cosmic_wall_itembox_22 = "Cosmic Wall - Item Box 22"
+cosmic_wall_itembox_23 = "Cosmic Wall - Item Box 23"
+cosmic_wall_itembox_24 = "Cosmic Wall - Item Box 24"
+cosmic_wall_itembox_25 = "Cosmic Wall - Item Box 25"
+cosmic_wall_itembox_26 = "Cosmic Wall - Item Box 26"
+cosmic_wall_itembox_27 = "Cosmic Wall - Item Box 27"
+cosmic_wall_upgrade    = "Cosmic Wall - Upgrade"
 
 # Rouge Mission Definitions
-dry_lagoon_1           = "Dry Lagoon - 1"
-dry_lagoon_2           = "Dry Lagoon - 2"
-dry_lagoon_3           = "Dry Lagoon - 3"
-dry_lagoon_4           = "Dry Lagoon - 4"
-dry_lagoon_5           = "Dry Lagoon - 5"
-dry_lagoon_chao_1      = "Dry Lagoon - Chao Key 1"
-dry_lagoon_chao_2      = "Dry Lagoon - Chao Key 2"
-dry_lagoon_chao_3      = "Dry Lagoon - Chao Key 3"
-dry_lagoon_pipe_1      = "Dry Lagoon - Pipe 1"
-dry_lagoon_hidden_1    = "Dry Lagoon - Hidden 1"
-dry_lagoon_omo_1       = "Dry Lagoon - Omochao 1"
-dry_lagoon_omo_2       = "Dry Lagoon - Omochao 2"
-dry_lagoon_omo_3       = "Dry Lagoon - Omochao 3"
-dry_lagoon_omo_4       = "Dry Lagoon - Omochao 4"
-dry_lagoon_omo_5       = "Dry Lagoon - Omochao 5"
-dry_lagoon_omo_6       = "Dry Lagoon - Omochao 6"
-dry_lagoon_omo_7       = "Dry Lagoon - Omochao 7"
-dry_lagoon_omo_8       = "Dry Lagoon - Omochao 8"
-dry_lagoon_omo_9       = "Dry Lagoon - Omochao 9"
-dry_lagoon_omo_10      = "Dry Lagoon - Omochao 10"
-dry_lagoon_omo_11      = "Dry Lagoon - Omochao 11"
-dry_lagoon_omo_12      = "Dry Lagoon - Omochao 12"
-dry_lagoon_beetle      = "Dry Lagoon - Gold Beetle"
-dry_lagoon_animal_1    = "Dry Lagoon - 1 Animal"
-dry_lagoon_animal_2    = "Dry Lagoon - 2 Animals"
-dry_lagoon_animal_3    = "Dry Lagoon - 3 Animals"
-dry_lagoon_animal_4    = "Dry Lagoon - 4 Animals"
-dry_lagoon_animal_5    = "Dry Lagoon - 5 Animals"
-dry_lagoon_animal_6    = "Dry Lagoon - 6 Animals"
-dry_lagoon_animal_7    = "Dry Lagoon - 7 Animals"
-dry_lagoon_animal_8    = "Dry Lagoon - 8 Animals"
-dry_lagoon_animal_9    = "Dry Lagoon - 9 Animals"
-dry_lagoon_animal_10   = "Dry Lagoon - 10 Animals"
-dry_lagoon_animal_11   = "Dry Lagoon - 11 Animals"
-dry_lagoon_upgrade     = "Dry Lagoon - Upgrade"
-egg_quarters_1         = "Egg Quarters - 1"
-egg_quarters_2         = "Egg Quarters - 2"
-egg_quarters_3         = "Egg Quarters - 3"
-egg_quarters_4         = "Egg Quarters - 4"
-egg_quarters_5         = "Egg Quarters - 5"
-egg_quarters_chao_1    = "Egg Quarters - Chao Key 1"
-egg_quarters_chao_2    = "Egg Quarters - Chao Key 2"
-egg_quarters_chao_3    = "Egg Quarters - Chao Key 3"
-egg_quarters_pipe_1    = "Egg Quarters - Pipe 1"
-egg_quarters_pipe_2    = "Egg Quarters - Pipe 2"
-egg_quarters_hidden_1  = "Egg Quarters - Hidden 1"
-egg_quarters_hidden_2  = "Egg Quarters - Hidden 2"
-egg_quarters_omo_1     = "Egg Quarters - Omochao 1"
-egg_quarters_omo_2     = "Egg Quarters - Omochao 2"
-egg_quarters_omo_3     = "Egg Quarters - Omochao 3"
-egg_quarters_omo_4     = "Egg Quarters - Omochao 4"
-egg_quarters_omo_5     = "Egg Quarters - Omochao 5"
-egg_quarters_omo_6     = "Egg Quarters - Omochao 6"
-egg_quarters_omo_7     = "Egg Quarters - Omochao 7"
-egg_quarters_beetle    = "Egg Quarters - Gold Beetle"
-egg_quarters_animal_1  = "Egg Quarters - 1 Animal"
-egg_quarters_animal_2  = "Egg Quarters - 2 Animals"
-egg_quarters_animal_3  = "Egg Quarters - 3 Animals"
-egg_quarters_animal_4  = "Egg Quarters - 4 Animals"
-egg_quarters_animal_5  = "Egg Quarters - 5 Animals"
-egg_quarters_animal_6  = "Egg Quarters - 6 Animals"
-egg_quarters_animal_7  = "Egg Quarters - 7 Animals"
-egg_quarters_animal_8  = "Egg Quarters - 8 Animals"
-egg_quarters_animal_9  = "Egg Quarters - 9 Animals"
-egg_quarters_animal_10 = "Egg Quarters - 10 Animals"
-egg_quarters_upgrade   = "Egg Quarters - Upgrade"
-security_hall_1        = "Security Hall - 1"
-security_hall_2        = "Security Hall - 2"
-security_hall_3        = "Security Hall - 3"
-security_hall_4        = "Security Hall - 4"
-security_hall_5        = "Security Hall - 5"
-security_hall_chao_1   = "Security Hall - Chao Key 1"
-security_hall_chao_2   = "Security Hall - Chao Key 2"
-security_hall_chao_3   = "Security Hall - Chao Key 3"
-security_hall_pipe_1   = "Security Hall - Pipe 1"
-security_hall_hidden_1 = "Security Hall - Hidden 1"
-security_hall_omo_1    = "Security Hall - Omochao 1"
-security_hall_omo_2    = "Security Hall - Omochao 2"
-security_hall_omo_3    = "Security Hall - Omochao 3"
-security_hall_omo_4    = "Security Hall - Omochao 4"
-security_hall_omo_5    = "Security Hall - Omochao 5"
-security_hall_omo_6    = "Security Hall - Omochao 6"
-security_hall_omo_7    = "Security Hall - Omochao 7"
-security_hall_omo_8    = "Security Hall - Omochao 8"
-security_hall_omo_9    = "Security Hall - Omochao 9"
-security_hall_omo_10   = "Security Hall - Omochao 10"
-security_hall_omo_11   = "Security Hall - Omochao 11"
-security_hall_omo_12   = "Security Hall - Omochao 12"
-security_hall_beetle   = "Security Hall - Gold Beetle"
-security_hall_animal_1 = "Security Hall - 1 Animal"
-security_hall_animal_2 = "Security Hall - 2 Animals"
-security_hall_animal_3 = "Security Hall - 3 Animals"
-security_hall_animal_4 = "Security Hall - 4 Animals"
-security_hall_animal_5 = "Security Hall - 5 Animals"
-security_hall_animal_6 = "Security Hall - 6 Animals"
-security_hall_animal_7 = "Security Hall - 7 Animals"
-security_hall_animal_8 = "Security Hall - 8 Animals"
-security_hall_upgrade  = "Security Hall - Upgrade"
-route_280_1            = "Route 280 - 1"
-route_280_2            = "Route 280 - 2"
-route_280_3            = "Route 280 - 3"
-route_280_4            = "Route 280 - 4"
-route_280_5            = "Route 280 - 5"
-mad_space_1            = "Mad Space - 1"
-mad_space_2            = "Mad Space - 2"
-mad_space_3            = "Mad Space - 3"
-mad_space_4            = "Mad Space - 4"
-mad_space_5            = "Mad Space - 5"
-mad_space_chao_1       = "Mad Space - Chao Key 1"
-mad_space_chao_2       = "Mad Space - Chao Key 2"
-mad_space_chao_3       = "Mad Space - Chao Key 3"
-mad_space_pipe_1       = "Mad Space - Pipe 1"
-mad_space_pipe_2       = "Mad Space - Pipe 2"
-mad_space_pipe_3       = "Mad Space - Pipe 3"
-mad_space_pipe_4       = "Mad Space - Pipe 4"
-mad_space_omo_1        = "Mad Space - Omochao 1"
-mad_space_omo_2        = "Mad Space - Omochao 2"
-mad_space_omo_3        = "Mad Space - Omochao 3"
-mad_space_omo_4        = "Mad Space - Omochao 4"
-mad_space_omo_5        = "Mad Space - Omochao 5"
-mad_space_beetle       = "Mad Space - Gold Beetle"
-mad_space_animal_1     = "Mad Space - 1 Animal"
-mad_space_animal_2     = "Mad Space - 2 Animals"
-mad_space_animal_3     = "Mad Space - 3 Animals"
-mad_space_animal_4     = "Mad Space - 4 Animals"
-mad_space_animal_5     = "Mad Space - 5 Animals"
-mad_space_animal_6     = "Mad Space - 6 Animals"
-mad_space_animal_7     = "Mad Space - 7 Animals"
-mad_space_animal_8     = "Mad Space - 8 Animals"
-mad_space_animal_9     = "Mad Space - 9 Animals"
-mad_space_animal_10    = "Mad Space - 10 Animals"
-mad_space_upgrade      = "Mad Space - Upgrade"
+dry_lagoon_1             = "Dry Lagoon - 1"
+dry_lagoon_2             = "Dry Lagoon - 2"
+dry_lagoon_3             = "Dry Lagoon - 3"
+dry_lagoon_4             = "Dry Lagoon - 4"
+dry_lagoon_5             = "Dry Lagoon - 5"
+dry_lagoon_chao_1        = "Dry Lagoon - Chao Key 1"
+dry_lagoon_chao_2        = "Dry Lagoon - Chao Key 2"
+dry_lagoon_chao_3        = "Dry Lagoon - Chao Key 3"
+dry_lagoon_pipe_1        = "Dry Lagoon - Pipe 1"
+dry_lagoon_hidden_1      = "Dry Lagoon - Hidden 1"
+dry_lagoon_omo_1         = "Dry Lagoon - Omochao 1"
+dry_lagoon_omo_2         = "Dry Lagoon - Omochao 2"
+dry_lagoon_omo_3         = "Dry Lagoon - Omochao 3"
+dry_lagoon_omo_4         = "Dry Lagoon - Omochao 4"
+dry_lagoon_omo_5         = "Dry Lagoon - Omochao 5"
+dry_lagoon_omo_6         = "Dry Lagoon - Omochao 6"
+dry_lagoon_omo_7         = "Dry Lagoon - Omochao 7"
+dry_lagoon_omo_8         = "Dry Lagoon - Omochao 8"
+dry_lagoon_omo_9         = "Dry Lagoon - Omochao 9"
+dry_lagoon_omo_10        = "Dry Lagoon - Omochao 10"
+dry_lagoon_omo_11        = "Dry Lagoon - Omochao 11"
+dry_lagoon_omo_12        = "Dry Lagoon - Omochao 12"
+dry_lagoon_beetle        = "Dry Lagoon - Gold Beetle"
+dry_lagoon_animal_1      = "Dry Lagoon - 1 Animal"
+dry_lagoon_animal_2      = "Dry Lagoon - 2 Animals"
+dry_lagoon_animal_3      = "Dry Lagoon - 3 Animals"
+dry_lagoon_animal_4      = "Dry Lagoon - 4 Animals"
+dry_lagoon_animal_5      = "Dry Lagoon - 5 Animals"
+dry_lagoon_animal_6      = "Dry Lagoon - 6 Animals"
+dry_lagoon_animal_7      = "Dry Lagoon - 7 Animals"
+dry_lagoon_animal_8      = "Dry Lagoon - 8 Animals"
+dry_lagoon_animal_9      = "Dry Lagoon - 9 Animals"
+dry_lagoon_animal_10     = "Dry Lagoon - 10 Animals"
+dry_lagoon_animal_11     = "Dry Lagoon - 11 Animals"
+dry_lagoon_animal_12     = "Dry Lagoon - 12 Animals"
+dry_lagoon_lifebox_1     = "Dry Lagoon - Extra Life Box 1"
+dry_lagoon_lifebox_2     = "Dry Lagoon - Extra Life Box 2"
+dry_lagoon_lifebox_3     = "Dry Lagoon - Extra Life Box 3"
+dry_lagoon_lifebox_4     = "Dry Lagoon - Extra Life Box 4"
+dry_lagoon_itembox_1     = "Dry Lagoon - Item Box 1"
+dry_lagoon_itembox_2     = "Dry Lagoon - Item Box 2"
+dry_lagoon_itembox_3     = "Dry Lagoon - Item Box 3"
+dry_lagoon_itembox_4     = "Dry Lagoon - Item Box 4"
+dry_lagoon_itembox_5     = "Dry Lagoon - Item Box 5"
+dry_lagoon_itembox_6     = "Dry Lagoon - Item Box 6"
+dry_lagoon_big           = "Dry Lagoon - Big"
+dry_lagoon_upgrade       = "Dry Lagoon - Upgrade"
+egg_quarters_1           = "Egg Quarters - 1"
+egg_quarters_2           = "Egg Quarters - 2"
+egg_quarters_3           = "Egg Quarters - 3"
+egg_quarters_4           = "Egg Quarters - 4"
+egg_quarters_5           = "Egg Quarters - 5"
+egg_quarters_chao_1      = "Egg Quarters - Chao Key 1"
+egg_quarters_chao_2      = "Egg Quarters - Chao Key 2"
+egg_quarters_chao_3      = "Egg Quarters - Chao Key 3"
+egg_quarters_pipe_1      = "Egg Quarters - Pipe 1"
+egg_quarters_pipe_2      = "Egg Quarters - Pipe 2"
+egg_quarters_hidden_1    = "Egg Quarters - Hidden 1"
+egg_quarters_hidden_2    = "Egg Quarters - Hidden 2"
+egg_quarters_omo_1       = "Egg Quarters - Omochao 1"
+egg_quarters_omo_2       = "Egg Quarters - Omochao 2"
+egg_quarters_omo_3       = "Egg Quarters - Omochao 3"
+egg_quarters_omo_4       = "Egg Quarters - Omochao 4"
+egg_quarters_omo_5       = "Egg Quarters - Omochao 5"
+egg_quarters_omo_6       = "Egg Quarters - Omochao 6"
+egg_quarters_omo_7       = "Egg Quarters - Omochao 7"
+egg_quarters_beetle      = "Egg Quarters - Gold Beetle"
+egg_quarters_animal_1    = "Egg Quarters - 1 Animal"
+egg_quarters_animal_2    = "Egg Quarters - 2 Animals"
+egg_quarters_animal_3    = "Egg Quarters - 3 Animals"
+egg_quarters_animal_4    = "Egg Quarters - 4 Animals"
+egg_quarters_animal_5    = "Egg Quarters - 5 Animals"
+egg_quarters_animal_6    = "Egg Quarters - 6 Animals"
+egg_quarters_animal_7    = "Egg Quarters - 7 Animals"
+egg_quarters_animal_8    = "Egg Quarters - 8 Animals"
+egg_quarters_animal_9    = "Egg Quarters - 9 Animals"
+egg_quarters_animal_10   = "Egg Quarters - 10 Animals"
+egg_quarters_lifebox_1   = "Egg Quarters - Extra Life Box 1"
+egg_quarters_lifebox_2   = "Egg Quarters - Extra Life Box 2"
+egg_quarters_itembox_1   = "Egg Quarters - Item Box 1"
+egg_quarters_itembox_2   = "Egg Quarters - Item Box 2"
+egg_quarters_itembox_3   = "Egg Quarters - Item Box 3"
+egg_quarters_itembox_4   = "Egg Quarters - Item Box 4"
+egg_quarters_itembox_5   = "Egg Quarters - Item Box 5"
+egg_quarters_itembox_6   = "Egg Quarters - Item Box 6"
+egg_quarters_itembox_7   = "Egg Quarters - Item Box 7"
+egg_quarters_itembox_8   = "Egg Quarters - Item Box 8"
+egg_quarters_itembox_9   = "Egg Quarters - Item Box 9"
+egg_quarters_itembox_10  = "Egg Quarters - Item Box 10"
+egg_quarters_itembox_11  = "Egg Quarters - Item Box 11"
+egg_quarters_big         = "Egg Quarters - Big"
+egg_quarters_upgrade     = "Egg Quarters - Upgrade"
+security_hall_1          = "Security Hall - 1"
+security_hall_2          = "Security Hall - 2"
+security_hall_3          = "Security Hall - 3"
+security_hall_4          = "Security Hall - 4"
+security_hall_5          = "Security Hall - 5"
+security_hall_chao_1     = "Security Hall - Chao Key 1"
+security_hall_chao_2     = "Security Hall - Chao Key 2"
+security_hall_chao_3     = "Security Hall - Chao Key 3"
+security_hall_pipe_1     = "Security Hall - Pipe 1"
+security_hall_hidden_1   = "Security Hall - Hidden 1"
+security_hall_omo_1      = "Security Hall - Omochao 1"
+security_hall_omo_2      = "Security Hall - Omochao 2"
+security_hall_omo_3      = "Security Hall - Omochao 3"
+security_hall_omo_4      = "Security Hall - Omochao 4"
+security_hall_omo_5      = "Security Hall - Omochao 5"
+security_hall_omo_6      = "Security Hall - Omochao 6"
+security_hall_omo_7      = "Security Hall - Omochao 7"
+security_hall_omo_8      = "Security Hall - Omochao 8"
+security_hall_omo_9      = "Security Hall - Omochao 9"
+security_hall_omo_10     = "Security Hall - Omochao 10"
+security_hall_omo_11     = "Security Hall - Omochao 11"
+security_hall_omo_12     = "Security Hall - Omochao 12"
+security_hall_beetle     = "Security Hall - Gold Beetle"
+security_hall_animal_1   = "Security Hall - 1 Animal"
+security_hall_animal_2   = "Security Hall - 2 Animals"
+security_hall_animal_3   = "Security Hall - 3 Animals"
+security_hall_animal_4   = "Security Hall - 4 Animals"
+security_hall_animal_5   = "Security Hall - 5 Animals"
+security_hall_animal_6   = "Security Hall - 6 Animals"
+security_hall_animal_7   = "Security Hall - 7 Animals"
+security_hall_animal_8   = "Security Hall - 8 Animals"
+security_hall_lifebox_1  = "Security Hall - Extra Life Box 1"
+security_hall_itembox_1  = "Security Hall - Item Box 1"
+security_hall_itembox_2  = "Security Hall - Item Box 2"
+security_hall_itembox_3  = "Security Hall - Item Box 3"
+security_hall_itembox_4  = "Security Hall - Item Box 4"
+security_hall_itembox_5  = "Security Hall - Item Box 5"
+security_hall_itembox_6  = "Security Hall - Item Box 6"
+security_hall_itembox_7  = "Security Hall - Item Box 7"
+security_hall_itembox_8  = "Security Hall - Item Box 8"
+security_hall_itembox_9  = "Security Hall - Item Box 9"
+security_hall_itembox_10 = "Security Hall - Item Box 10"
+security_hall_itembox_11 = "Security Hall - Item Box 11"
+security_hall_itembox_12 = "Security Hall - Item Box 12"
+security_hall_itembox_13 = "Security Hall - Item Box 13"
+security_hall_itembox_14 = "Security Hall - Item Box 14"
+security_hall_itembox_15 = "Security Hall - Item Box 15"
+security_hall_itembox_16 = "Security Hall - Item Box 16"
+security_hall_itembox_17 = "Security Hall - Item Box 17"
+security_hall_itembox_18 = "Security Hall - Item Box 18"
+security_hall_itembox_19 = "Security Hall - Item Box 19"
+security_hall_itembox_20 = "Security Hall - Item Box 20"
+security_hall_itembox_21 = "Security Hall - Item Box 21"
+security_hall_itembox_22 = "Security Hall - Item Box 22"
+security_hall_itembox_23 = "Security Hall - Item Box 23"
+security_hall_itembox_24 = "Security Hall - Item Box 24"
+security_hall_big        = "Security Hall - Big"
+security_hall_upgrade    = "Security Hall - Upgrade"
+route_280_1              = "Route 280 - 1"
+route_280_2              = "Route 280 - 2"
+route_280_3              = "Route 280 - 3"
+route_280_4              = "Route 280 - 4"
+route_280_5              = "Route 280 - 5"
+route_280_itembox_1      = "Route 280 - Balloon 1"
+route_280_itembox_2      = "Route 280 - Balloon 2"
+route_280_itembox_3      = "Route 280 - Balloon 3"
+mad_space_1              = "Mad Space - 1"
+mad_space_2              = "Mad Space - 2"
+mad_space_3              = "Mad Space - 3"
+mad_space_4              = "Mad Space - 4"
+mad_space_5              = "Mad Space - 5"
+mad_space_chao_1         = "Mad Space - Chao Key 1"
+mad_space_chao_2         = "Mad Space - Chao Key 2"
+mad_space_chao_3         = "Mad Space - Chao Key 3"
+mad_space_pipe_1         = "Mad Space - Pipe 1"
+mad_space_pipe_2         = "Mad Space - Pipe 2"
+mad_space_pipe_3         = "Mad Space - Pipe 3"
+mad_space_pipe_4         = "Mad Space - Pipe 4"
+mad_space_omo_1          = "Mad Space - Omochao 1"
+mad_space_omo_2          = "Mad Space - Omochao 2"
+mad_space_omo_3          = "Mad Space - Omochao 3"
+mad_space_omo_4          = "Mad Space - Omochao 4"
+mad_space_omo_5          = "Mad Space - Omochao 5"
+mad_space_beetle         = "Mad Space - Gold Beetle"
+mad_space_animal_1       = "Mad Space - 1 Animal"
+mad_space_animal_2       = "Mad Space - 2 Animals"
+mad_space_animal_3       = "Mad Space - 3 Animals"
+mad_space_animal_4       = "Mad Space - 4 Animals"
+mad_space_animal_5       = "Mad Space - 5 Animals"
+mad_space_animal_6       = "Mad Space - 6 Animals"
+mad_space_animal_7       = "Mad Space - 7 Animals"
+mad_space_animal_8       = "Mad Space - 8 Animals"
+mad_space_animal_9       = "Mad Space - 9 Animals"
+mad_space_animal_10      = "Mad Space - 10 Animals"
+mad_space_lifebox_1      = "Mad Space - Extra Life Box 1"
+mad_space_lifebox_2      = "Mad Space - Extra Life Box 2"
+mad_space_lifebox_3      = "Mad Space - Extra Life Box 3"
+mad_space_lifebox_4      = "Mad Space - Extra Life Box 4"
+mad_space_itembox_1      = "Mad Space - Item Box 1"
+mad_space_itembox_2      = "Mad Space - Item Box 2"
+mad_space_itembox_3      = "Mad Space - Item Box 3"
+mad_space_itembox_4      = "Mad Space - Item Box 4"
+mad_space_itembox_5      = "Mad Space - Item Box 5"
+mad_space_itembox_6      = "Mad Space - Item Box 6"
+mad_space_itembox_7      = "Mad Space - Item Box 7"
+mad_space_itembox_8      = "Mad Space - Item Box 8"
+mad_space_itembox_9      = "Mad Space - Item Box 9"
+mad_space_itembox_10     = "Mad Space - Item Box 10"
+mad_space_itembox_11     = "Mad Space - Item Box 11"
+mad_space_itembox_12     = "Mad Space - Item Box 12"
+mad_space_itembox_13     = "Mad Space - Item Box 13"
+mad_space_itembox_14     = "Mad Space - Item Box 14"
+mad_space_itembox_15     = "Mad Space - Item Box 15"
+mad_space_itembox_16     = "Mad Space - Item Box 16"
+mad_space_itembox_17     = "Mad Space - Item Box 17"
+mad_space_itembox_18     = "Mad Space - Item Box 18"
+mad_space_itembox_19     = "Mad Space - Item Box 19"
+mad_space_itembox_20     = "Mad Space - Item Box 20"
+mad_space_big            = "Mad Space - Big"
+mad_space_upgrade        = "Mad Space - Upgrade"
 
 # Final Mission Definitions
-cannon_core_1         = "Cannon's Core - 1"
-cannon_core_2         = "Cannon's Core - 2"
-cannon_core_3         = "Cannon's Core - 3"
-cannon_core_4         = "Cannon's Core - 4"
-cannon_core_5         = "Cannon's Core - 5"
-cannon_core_chao_1    = "Cannon's Core - Chao Key 1"
-cannon_core_chao_2    = "Cannon's Core - Chao Key 2"
-cannon_core_chao_3    = "Cannon's Core - Chao Key 3"
-cannon_core_pipe_1    = "Cannon's Core - Pipe 1"
-cannon_core_pipe_2    = "Cannon's Core - Pipe 2"
-cannon_core_pipe_3    = "Cannon's Core - Pipe 3"
-cannon_core_pipe_4    = "Cannon's Core - Pipe 4"
-cannon_core_pipe_5    = "Cannon's Core - Pipe 5"
-cannon_core_omo_1     = "Cannon's Core - Omochao 1"
-cannon_core_omo_2     = "Cannon's Core - Omochao 2"
-cannon_core_omo_3     = "Cannon's Core - Omochao 3"
-cannon_core_omo_4     = "Cannon's Core - Omochao 4"
-cannon_core_omo_5     = "Cannon's Core - Omochao 5"
-cannon_core_omo_6     = "Cannon's Core - Omochao 6"
-cannon_core_omo_7     = "Cannon's Core - Omochao 7"
-cannon_core_omo_8     = "Cannon's Core - Omochao 8"
-cannon_core_omo_9     = "Cannon's Core - Omochao 9"
-cannon_core_hidden_1  = "Cannon's Core - Hidden 1"
-cannon_core_beetle    = "Cannon's Core - Gold Beetle"
-cannon_core_animal_1  = "Cannon's Core - 1 Animal"
-cannon_core_animal_2  = "Cannon's Core - 2 Animals"
-cannon_core_animal_3  = "Cannon's Core - 3 Animals"
-cannon_core_animal_4  = "Cannon's Core - 4 Animals"
-cannon_core_animal_5  = "Cannon's Core - 5 Animals"
-cannon_core_animal_6  = "Cannon's Core - 6 Animals"
-cannon_core_animal_7  = "Cannon's Core - 7 Animals"
-cannon_core_animal_8  = "Cannon's Core - 8 Animals"
-cannon_core_animal_9  = "Cannon's Core - 9 Animals"
-cannon_core_animal_10 = "Cannon's Core - 10 Animals"
-cannon_core_animal_11 = "Cannon's Core - 11 Animals"
-cannon_core_animal_12 = "Cannon's Core - 12 Animals"
-cannon_core_animal_13 = "Cannon's Core - 13 Animals"
-cannon_core_animal_14 = "Cannon's Core - 14 Animals"
-cannon_core_animal_15 = "Cannon's Core - 15 Animals"
-cannon_core_animal_16 = "Cannon's Core - 16 Animals"
-cannon_core_animal_17 = "Cannon's Core - 17 Animals"
-cannon_core_animal_18 = "Cannon's Core - 18 Animals"
-cannon_core_animal_19 = "Cannon's Core - 19 Animals"
+cannon_core_1          = "Cannon's Core - 1"
+cannon_core_2          = "Cannon's Core - 2"
+cannon_core_3          = "Cannon's Core - 3"
+cannon_core_4          = "Cannon's Core - 4"
+cannon_core_5          = "Cannon's Core - 5"
+cannon_core_chao_1     = "Cannon's Core - Chao Key 1"
+cannon_core_chao_2     = "Cannon's Core - Chao Key 2"
+cannon_core_chao_3     = "Cannon's Core - Chao Key 3"
+cannon_core_pipe_1     = "Cannon's Core - Pipe 1"
+cannon_core_pipe_2     = "Cannon's Core - Pipe 2"
+cannon_core_pipe_3     = "Cannon's Core - Pipe 3"
+cannon_core_pipe_4     = "Cannon's Core - Pipe 4"
+cannon_core_pipe_5     = "Cannon's Core - Pipe 5"
+cannon_core_omo_1      = "Cannon's Core - Omochao 1"
+cannon_core_omo_2      = "Cannon's Core - Omochao 2"
+cannon_core_omo_3      = "Cannon's Core - Omochao 3"
+cannon_core_omo_4      = "Cannon's Core - Omochao 4"
+cannon_core_omo_5      = "Cannon's Core - Omochao 5"
+cannon_core_omo_6      = "Cannon's Core - Omochao 6"
+cannon_core_omo_7      = "Cannon's Core - Omochao 7"
+cannon_core_omo_8      = "Cannon's Core - Omochao 8"
+cannon_core_omo_9      = "Cannon's Core - Omochao 9"
+cannon_core_hidden_1   = "Cannon's Core - Hidden 1"
+cannon_core_beetle     = "Cannon's Core - Gold Beetle"
+cannon_core_animal_1   = "Cannon's Core - 1 Animal"
+cannon_core_animal_2   = "Cannon's Core - 2 Animals"
+cannon_core_animal_3   = "Cannon's Core - 3 Animals"
+cannon_core_animal_4   = "Cannon's Core - 4 Animals"
+cannon_core_animal_5   = "Cannon's Core - 5 Animals"
+cannon_core_animal_6   = "Cannon's Core - 6 Animals"
+cannon_core_animal_7   = "Cannon's Core - 7 Animals"
+cannon_core_animal_8   = "Cannon's Core - 8 Animals"
+cannon_core_animal_9   = "Cannon's Core - 9 Animals"
+cannon_core_animal_10  = "Cannon's Core - 10 Animals"
+cannon_core_animal_11  = "Cannon's Core - 11 Animals"
+cannon_core_animal_12  = "Cannon's Core - 12 Animals"
+cannon_core_animal_13  = "Cannon's Core - 13 Animals"
+cannon_core_animal_14  = "Cannon's Core - 14 Animals"
+cannon_core_animal_15  = "Cannon's Core - 15 Animals"
+cannon_core_animal_16  = "Cannon's Core - 16 Animals"
+cannon_core_animal_17  = "Cannon's Core - 17 Animals"
+cannon_core_animal_18  = "Cannon's Core - 18 Animals"
+cannon_core_animal_19  = "Cannon's Core - 19 Animals"
+cannon_core_lifebox_1  = "Cannon's Core - Extra Life Box 1"
+cannon_core_itembox_1  = "Cannon's Core - Item Box 1"
+cannon_core_itembox_2  = "Cannon's Core - Item Box 2"
+cannon_core_itembox_3  = "Cannon's Core - Item Box 3"
+cannon_core_itembox_4  = "Cannon's Core - Item Box 4"
+cannon_core_itembox_5  = "Cannon's Core - Item Box 5"
+cannon_core_itembox_6  = "Cannon's Core - Item Box 6"
+cannon_core_itembox_7  = "Cannon's Core - Item Box 7"
+cannon_core_itembox_8  = "Cannon's Core - Item Box 8"
+cannon_core_itembox_9  = "Cannon's Core - Item Box 9"
+cannon_core_itembox_10 = "Cannon's Core - Item Box 10"
+cannon_core_itembox_11 = "Cannon's Core - Item Box 11"
+cannon_core_itembox_12 = "Cannon's Core - Item Box 12"
+cannon_core_big_1      = "Cannon's Core - Tails - Big"
+cannon_core_big_2      = "Cannon's Core - Eggman - Big"
+cannon_core_big_3      = "Cannon's Core - Rouge - Big"
+cannon_core_big_4      = "Cannon's Core - Knuckles - Big"
+cannon_core_big_5      = "Cannon's Core - Sonic - Big"
 
 # Green Hill Definitions
-green_hill           = "Green Hill"
-green_hill_chao_1    = "Green Hill - Chao Key 1"
-green_hill_animal_1  = "Green Hill - 1 Animal"
+green_hill            = "Green Hill - 1"
+green_hill_chao_1     = "Green Hill - Chao Key 1"
+green_hill_animal_1   = "Green Hill - 1 Animal"
+green_hill_itembox_1  = "Green Hill - Item Box 1"
+green_hill_itembox_2  = "Green Hill - Item Box 2"
+green_hill_itembox_3  = "Green Hill - Item Box 3"
+green_hill_itembox_4  = "Green Hill - Item Box 4"
+green_hill_itembox_5  = "Green Hill - Item Box 5"
+green_hill_itembox_6  = "Green Hill - Item Box 6"
+green_hill_itembox_7  = "Green Hill - Item Box 7"
+green_hill_itembox_8  = "Green Hill - Item Box 8"
+green_hill_itembox_9  = "Green Hill - Item Box 9"
+green_hill_itembox_10 = "Green Hill - Item Box 10"
+green_hill_itembox_11 = "Green Hill - Item Box 11"
 
 # Boss Definitions
 gate_1_boss = "Gate 1 Boss"
@@ -1380,6 +1914,28 @@ gate_3_boss_region = "Gate 3 Boss"
 gate_4_boss_region = "Gate 4 Boss"
 gate_5_boss_region = "Gate 5 Boss"
 
+boss_gate_names = {
+	"gate 1 boss": 0,
+	"gate 2 boss": 1,
+	"gate 3 boss": 2,
+	"gate 4 boss": 3,
+	"gate 5 boss": 4,
+}
+
+boss_names = {
+	"sonic vs shadow 1": 0,
+	"sonic vs shadow 2": 1,
+	"tails vs eggman 1": 2,
+	"tails vs eggman 2": 3,
+	"knuckles vs rouge 1": 4,
+	"big foot": 5,
+	"hot shot": 6,
+	"flying dog": 7,
+	"egg golem (sonic)": 8,
+	"egg golem (eggman)": 9,
+	"king boom boo": 10,
+}
+
 boss_rush_1_region  = "Boss Rush 1"
 boss_rush_2_region  = "Boss Rush 2"
 boss_rush_3_region  = "Boss Rush 3"
diff --git a/worlds/sa2b/Options.py b/worlds/sa2b/Options.py
index 438e59de5e..4e3058e59a 100644
--- a/worlds/sa2b/Options.py
+++ b/worlds/sa2b/Options.py
@@ -1,6 +1,8 @@
 from dataclasses import dataclass
 
-from Options import Choice, Range, Toggle, DeathLink, DefaultOnToggle, OptionGroup, PerGameCommonOptions
+from Options import Choice, Range, Option, OptionGroup, Toggle, DeathLink, DefaultOnToggle, PerGameCommonOptions, PlandoBosses
+
+from .Names import LocationName
 
 
 class Goal(Choice):
@@ -22,6 +24,8 @@ class Goal(Choice):
     Boss Rush Chaos Emerald Hunt: Find the Seven Chaos Emeralds, then beat all of the bosses in the Boss Rush, ending with Finalhazard
 
     Chaos Chao: Raise a Chaos Chao to win
+
+    Minigame Madness: Win a certain amount of each Minigame Trap, then defeat Finalhazard
     """
     display_name = "Goal"
     option_biolizard = 0
@@ -32,6 +36,7 @@ class Goal(Choice):
     option_cannons_core_boss_rush = 5
     option_boss_rush_chaos_emerald_hunt = 6
     option_chaos_chao = 7
+    option_minigame_madness = 8
     default = 0
 
     @classmethod
@@ -71,6 +76,66 @@ class BossRushShuffle(Choice):
     default = 0
 
 
+class GateBossPlando(PlandoBosses):
+    """
+    Possible Locations:
+    "Gate 1 Boss"
+    "Gate 2 Boss"
+    "Gate 3 Boss"
+    "Gate 4 Boss"
+    "Gate 5 Boss"
+
+    Possible Bosses:
+    "Sonic vs Shadow 1"
+    "Sonic vs Shadow 2"
+    "Tails vs Eggman 1"
+    "Tails vs Eggman 2"
+    "Knuckles vs Rouge 1"
+    "BIG FOOT"
+    "HOT SHOT"
+    "FLYING DOG"
+    "Egg Golem (Sonic)"
+    "Egg Golem (Eggman)"
+    "King Boom Boo"
+    """
+    bosses = frozenset(LocationName.boss_names.keys())
+
+    locations = frozenset(LocationName.boss_gate_names.keys())
+
+    duplicate_bosses = False
+
+    @classmethod
+    def can_place_boss(cls, boss: str, location: str) -> bool:
+        return True
+
+    display_name = "Boss Shuffle"
+    option_plando = 0
+
+
+class MinigameMadnessRequirement(Range):
+    """
+    Determines how many of each Minigame Trap must be won (for Minigame Madness goal)
+
+    Receiving this many of a Minigame Trap will allow you to replay that minigame at-will in the Chao World lobby
+    """
+    display_name = "Minigame Madness Trap Requirement"
+    range_start = 1
+    range_end = 10
+    default = 3
+
+
+class MinigameMadnessMinimum(Range):
+    """
+    Determines the minimum number of each Minigame Trap that are created (for Minigame Madness goal)
+
+    At least this many of each trap will be created as "Progression Traps", regardless of other trap option selections
+    """
+    display_name = "Minigame Madness Trap Minimum"
+    range_start = 1
+    range_end = 10
+    default = 5
+
+
 class BaseTrapWeight(Choice):
     """
     Base Class for Trap Weights
@@ -159,6 +224,34 @@ class ReverseTrapWeight(BaseTrapWeight):
     display_name = "Reverse Trap Weight"
 
 
+class LiteratureTrapWeight(BaseTrapWeight):
+    """
+    Likelihood of receiving a trap which forces you to read
+    """
+    display_name = "Literature Trap Weight"
+
+
+class ControllerDriftTrapWeight(BaseTrapWeight):
+    """
+    Likelihood of receiving a trap which causes your control sticks to drift
+    """
+    display_name = "Controller Drift Trap Weight"
+
+
+class PoisonTrapWeight(BaseTrapWeight):
+    """
+    Likelihood of receiving a trap which causes you to lose rings over time
+    """
+    display_name = "Poison Trap Weight"
+
+
+class BeeTrapWeight(BaseTrapWeight):
+    """
+    Likelihood of receiving a trap which spawns a swarm of bees
+    """
+    display_name = "Bee Trap Weight"
+
+
 class PongTrapWeight(BaseTrapWeight):
     """
     Likelihood of receiving a trap which forces you to play a Pong minigame
@@ -166,14 +259,106 @@ class PongTrapWeight(BaseTrapWeight):
     display_name = "Pong Trap Weight"
 
 
+class BreakoutTrapWeight(BaseTrapWeight):
+    """
+    Likelihood of receiving a trap which forces you to play a Breakout minigame
+    """
+    display_name = "Breakout Trap Weight"
+
+
+class FishingTrapWeight(BaseTrapWeight):
+    """
+    Likelihood of receiving a trap which forces you to play a Fishing minigame
+    """
+    display_name = "Fishing Trap Weight"
+
+
+class TriviaTrapWeight(BaseTrapWeight):
+    """
+    Likelihood of receiving a trap which forces you to play a Trivia minigame
+    """
+    display_name = "Trivia Trap Weight"
+
+
+class PokemonTriviaTrapWeight(BaseTrapWeight):
+    """
+    Likelihood of receiving a trap which forces you to play a Pokemon Trivia minigame
+    """
+    display_name = "Pokemon Trivia Trap Weight"
+
+
+class PokemonCountTrapWeight(BaseTrapWeight):
+    """
+    Likelihood of receiving a trap which forces you to play a Pokemon Count minigame
+    """
+    display_name = "Pokemon Count Trap Weight"
+
+
+class NumberSequenceTrapWeight(BaseTrapWeight):
+    """
+    Likelihood of receiving a trap which forces you to play a Number Sequence minigame
+    """
+    display_name = "Number Sequence Trap Weight"
+
+
+class LightUpPathTrapWeight(BaseTrapWeight):
+    """
+    Likelihood of receiving a trap which forces you to play a Light Up Path minigame
+    """
+    display_name = "Light Up Path Trap Weight"
+
+
+class PinballTrapWeight(BaseTrapWeight):
+    """
+    Likelihood of receiving a trap which forces you to play a Pinball minigame
+    """
+    display_name = "Pinball Trap Weight"
+
+
+class MathQuizTrapWeight(BaseTrapWeight):
+    """
+    Likelihood of receiving a trap which forces you to solve a math problem
+    """
+    display_name = "Math Quiz Trap Weight"
+
+
+class SnakeTrapWeight(BaseTrapWeight):
+    """
+    Likelihood of receiving a trap which forces you to play a Snake minigame
+    """
+    display_name = "Snake Trap Weight"
+
+
+class InputSequenceTrapWeight(BaseTrapWeight):
+    """
+    Likelihood of receiving a trap which forces you to press a sequence of inputs
+    """
+    display_name = "Input Sequence Trap Weight"
+
+
 class MinigameTrapDifficulty(Choice):
     """
     How difficult any Minigame-style traps are
+    Chaos causes the difficulty to be random per-minigame
     """
     display_name = "Minigame Trap Difficulty"
     option_easy = 0
     option_medium = 1
     option_hard = 2
+    option_chaos = 3
+    default = 1
+
+
+class BigFishingDifficulty(Choice):
+    """
+    How difficult Big's Fishing Minigames are
+    Chaos causes the difficulty to be random per-minigame
+    """
+    display_name = "Big Fishing Difficulty"
+    option_easy = 0
+    option_medium = 1
+    option_hard = 2
+    option_chaos = 3
     default = 1
 
 
@@ -197,7 +382,7 @@ class TrapFillPercentage(Range):
     default = 0
 
 
-class Keysanity(Toggle):
+class Keysanity(DefaultOnToggle):
     """
     Determines whether picking up Chao Keys grants checks
     (86 Locations)
@@ -225,7 +410,7 @@ class Whistlesanity(Choice):
     default = 0
 
 
-class Beetlesanity(Toggle):
+class Beetlesanity(DefaultOnToggle):
     """
     Determines whether destroying Gold Beetles grants checks
     (27 Locations)
@@ -244,13 +429,35 @@ class Omosanity(Toggle):
 class Animalsanity(Toggle):
     """
     Determines whether unique counts of animals grant checks.
-    (421 Locations)
+    (422 Locations)
 
     ALL animals must be collected in a single run of a mission to get all checks.
     """
     display_name = "Animalsanity"
 
 
+class ItemBoxsanity(Choice):
+    """
+    Determines whether collecting Item Boxes grants checks
+    None: No Item Boxes grant checks
+    Extra Lives: Extra Life Boxes grant checks (94 Locations)
+    All: All Item Boxes grant checks (502 Locations Total)
+    """
+    display_name = "Itemboxsanity"
+    option_none = 0
+    option_extra_lives = 1
+    option_all = 2
+    default = 0
+
+
+class Bigsanity(Toggle):
+    """
+    Determines whether helping Big fish grants checks.
+    (32 Locations)
+    """
+    display_name = "Bigsanity"
+
+
 class KartRaceChecks(Choice):
     """
     Determines whether Kart Race Mode grants checks
@@ -313,7 +520,7 @@ class LevelGateCosts(Choice):
     option_low = 0
     option_medium = 1
     option_high = 2
-    default = 2
+    default = 0
 
 
 class MaximumEmblemCap(Range):
@@ -523,109 +730,214 @@ class BaseMissionCount(Range):
     default = 2
 
 
-class SpeedMissionCount(BaseMissionCount):
+class SonicMissionCount(BaseMissionCount):
     """
-    The number of active missions to include for Sonic and Shadow stages
+    The number of active missions to include for Sonic stages
     """
-    display_name = "Speed Mission Count"
+    display_name = "Sonic Mission Count"
 
 
-class SpeedMission2(DefaultOnToggle):
+class SonicMission2(DefaultOnToggle):
     """
-    Determines if the Sonic and Shadow 100 rings missions should be included
+    Determines if the Sonic 100 rings missions should be included
     """
-    display_name = "Speed Mission 2"
+    display_name = "Sonic Mission 2"
 
 
-class SpeedMission3(DefaultOnToggle):
+class SonicMission3(DefaultOnToggle):
     """
-    Determines if the Sonic and Shadow lost chao missions should be included
+    Determines if the Sonic lost chao missions should be included
     """
-    display_name = "Speed Mission 3"
+    display_name = "Sonic Mission 3"
 
 
-class SpeedMission4(DefaultOnToggle):
+class SonicMission4(DefaultOnToggle):
     """
-    Determines if the Sonic and Shadow time trial missions should be included
+    Determines if the Sonic time trial missions should be included
     """
-    display_name = "Speed Mission 4"
+    display_name = "Sonic Mission 4"
 
 
-class SpeedMission5(DefaultOnToggle):
+class SonicMission5(DefaultOnToggle):
     """
-    Determines if the Sonic and Shadow hard missions should be included
+    Determines if the Sonic hard missions should be included
     """
-    display_name = "Speed Mission 5"
+    display_name = "Sonic Mission 5"
 
 
-class MechMissionCount(BaseMissionCount):
+class ShadowMissionCount(BaseMissionCount):
     """
-    The number of active missions to include for Tails and Eggman stages
+    The number of active missions to include for Shadow stages
     """
-    display_name = "Mech Mission Count"
+    display_name = "Shadow Mission Count"
 
 
-class MechMission2(DefaultOnToggle):
+class ShadowMission2(DefaultOnToggle):
     """
-    Determines if the Tails and Eggman 100 rings missions should be included
+    Determines if the Shadow 100 rings missions should be included
     """
-    display_name = "Mech Mission 2"
+    display_name = "Shadow Mission 2"
 
 
-class MechMission3(DefaultOnToggle):
+class ShadowMission3(DefaultOnToggle):
     """
-    Determines if the Tails and Eggman lost chao missions should be included
+    Determines if the Shadow lost chao missions should be included
     """
-    display_name = "Mech Mission 3"
+    display_name = "Shadow Mission 3"
 
 
-class MechMission4(DefaultOnToggle):
+class ShadowMission4(DefaultOnToggle):
     """
-    Determines if the Tails and Eggman time trial missions should be included
+    Determines if the Shadow time trial missions should be included
     """
-    display_name = "Mech Mission 4"
+    display_name = "Shadow Mission 4"
 
 
-class MechMission5(DefaultOnToggle):
+class ShadowMission5(DefaultOnToggle):
     """
-    Determines if the Tails and Eggman hard missions should be included
+    Determines if the Shadow hard missions should be included
     """
-    display_name = "Mech Mission 5"
+    display_name = "Shadow Mission 5"
 
 
-class HuntMissionCount(BaseMissionCount):
+class TailsMissionCount(BaseMissionCount):
     """
-    The number of active missions to include for Knuckles and Rouge stages
+    The number of active missions to include for Tails stages
     """
-    display_name = "Hunt Mission Count"
+    display_name = "Tails Mission Count"
 
 
-class HuntMission2(DefaultOnToggle):
+class TailsMission2(DefaultOnToggle):
     """
-    Determines if the Knuckles and Rouge 100 rings missions should be included
+    Determines if the Tails 100 rings missions should be included
     """
-    display_name = "Hunt Mission 2"
+    display_name = "Tails Mission 2"
 
 
-class HuntMission3(DefaultOnToggle):
+class TailsMission3(DefaultOnToggle):
     """
-    Determines if the Knuckles and Rouge lost chao missions should be included
+    Determines if the Tails lost chao missions should be included
     """
-    display_name = "Hunt Mission 3"
+    display_name = "Tails Mission 3"
 
 
-class HuntMission4(DefaultOnToggle):
+class TailsMission4(DefaultOnToggle):
     """
-    Determines if the Knuckles and Rouge time trial missions should be included
+    Determines if the Tails time trial missions should be included
     """
-    display_name = "Hunt Mission 4"
+    display_name = "Tails Mission 4"
 
 
-class HuntMission5(DefaultOnToggle):
+class TailsMission5(DefaultOnToggle):
     """
-    Determines if the Knuckles and Rouge hard missions should be included
+    Determines if the Tails hard missions should be included
     """
-    display_name = "Hunt Mission 5"
+    display_name = "Tails Mission 5"
+
+
+class EggmanMissionCount(BaseMissionCount):
+    """
+    The number of active missions to include for Eggman stages
+    """
+    display_name = "Eggman Mission Count"
+
+
+class EggmanMission2(DefaultOnToggle):
+    """
+    Determines if the Eggman 100 rings missions should be included
+    """
+    display_name = "Eggman Mission 2"
+
+
+class EggmanMission3(DefaultOnToggle):
+    """
+    Determines if the Eggman lost chao missions should be included
+    """
+    display_name = "Eggman Mission 3"
+
+
+class EggmanMission4(DefaultOnToggle):
+    """
+    Determines if the Eggman time trial missions should be included
+    """
+    display_name = "Eggman Mission 4"
+
+
+class EggmanMission5(DefaultOnToggle):
+    """
+    Determines if the Eggman hard missions should be included
+    """
+    display_name = "Eggman Mission 5"
+
+
+class KnucklesMissionCount(BaseMissionCount):
+    """
+    The number of active missions to include for Knuckles stages
+    """
+    display_name = "Knuckles Mission Count"
+
+
+class KnucklesMission2(DefaultOnToggle):
+    """
+    Determines if the Knuckles 100 rings missions should be included
+    """
+    display_name = "Knuckles Mission 2"
+
+
+class KnucklesMission3(DefaultOnToggle):
+    """
+    Determines if the Knuckles lost chao missions should be included
+    """
+    display_name = "Knuckles Mission 3"
+
+
+class KnucklesMission4(DefaultOnToggle):
+    """
+    Determines if the Knuckles time trial missions should be included
+    """
+    display_name = "Knuckles Mission 4"
+
+
+class KnucklesMission5(DefaultOnToggle):
+    """
+    Determines if the Knuckles hard missions should be included
+    """
+    display_name = "Knuckles Mission 5"
+
+
+class RougeMissionCount(BaseMissionCount):
+    """
+    The number of active missions to include for Rouge stages
+    """
+    display_name = "Rouge Mission Count"
+
+
+class RougeMission2(DefaultOnToggle):
+    """
+    Determines if the Rouge 100 rings missions should be included
+    """
+    display_name = "Rouge Mission 2"
+
+
+class RougeMission3(DefaultOnToggle):
+    """
+    Determines if the Rouge lost chao missions should be included
+    """
+    display_name = "Rouge Mission 3"
+
+
+class RougeMission4(DefaultOnToggle):
+    """
+    Determines if the Rouge time trial missions should be included
+    """
+    display_name = "Rouge Mission 4"
+
+
+class RougeMission5(DefaultOnToggle):
+    """
+    Determines if the Rouge hard missions should be included
+    """
+    display_name = "Rouge Mission 5"
 
 
 class KartMissionCount(BaseMissionCount):
@@ -706,7 +1018,7 @@ class RingLoss(Choice):
 
     Modern: You lose 20 rings when hit
 
-    OHKO: You die immediately when hit (NOTE: Some Hard Logic tricks may require damage boosts!)
+    OHKO: You die immediately when hit (NOTE: Some Hard or Expert Logic tricks may require damage boosts!)
     """
     display_name = "Ring Loss"
     option_classic = 0
@@ -729,6 +1041,16 @@ class RingLink(Toggle):
     display_name = "Ring Link"
 
 
+class TrapLink(Toggle):
+    """
+    Whether your received traps are linked to other players
+
+    You will also receive any linked traps from other players with Trap Link enabled,
+    if you have a weight above "none" set for that trap
+    """
+    display_name = "Trap Link"
+
+
 class SADXMusic(Choice):
     """
     Whether the randomizer will include Sonic Adventure DX Music in the music pool
@@ -823,11 +1145,14 @@ class LogicDifficulty(Choice):
 
     Standard: The logic assumes the "intended" usage of Upgrades to progress through levels
 
-    Hard: Some simple skips or sequence breaks may be required
+    Hard: Some simple skips or sequence breaks may be required, but no out-of-bounds
+
+    Expert: If it is humanly possible, it may be required
     """
     display_name = "Logic Difficulty"
     option_standard = 0
     option_hard = 1
+    option_expert = 2
     default = 0
 
 
@@ -835,6 +1160,8 @@ sa2b_option_groups = [
     OptionGroup("General Options", [
         Goal,
         BossRushShuffle,
+        MinigameMadnessRequirement,
+        MinigameMadnessMinimum,
         LogicDifficulty,
         RequiredRank,
         MaximumEmblemCap,
@@ -854,6 +1181,8 @@ sa2b_option_groups = [
         Beetlesanity,
         Omosanity,
         Animalsanity,
+        ItemBoxsanity,
+        Bigsanity,
         KartRaceChecks,
     ]),
     OptionGroup("Chao", [
@@ -885,29 +1214,68 @@ sa2b_option_groups = [
         SlowTrapWeight,
         CutsceneTrapWeight,
         ReverseTrapWeight,
+        LiteratureTrapWeight,
+        ControllerDriftTrapWeight,
+        PoisonTrapWeight,
+        BeeTrapWeight,
+    ]),
+    OptionGroup("Minigames", [
         PongTrapWeight,
+        BreakoutTrapWeight,
+        FishingTrapWeight,
+        TriviaTrapWeight,
+        PokemonTriviaTrapWeight,
+        PokemonCountTrapWeight,
+        NumberSequenceTrapWeight,
+        LightUpPathTrapWeight,
+        PinballTrapWeight,
+        MathQuizTrapWeight,
+        SnakeTrapWeight,
+        InputSequenceTrapWeight,
         MinigameTrapDifficulty,
+        BigFishingDifficulty,
     ]),
-    OptionGroup("Speed Missions", [
-        SpeedMissionCount,
-        SpeedMission2,
-        SpeedMission3,
-        SpeedMission4,
-        SpeedMission5,
+    OptionGroup("Sonic Missions", [
+        SonicMissionCount,
+        SonicMission2,
+        SonicMission3,
+        SonicMission4,
+        SonicMission5,
     ]),
-    OptionGroup("Mech Missions", [
-        MechMissionCount,
-        MechMission2,
-        MechMission3,
-        MechMission4,
-        MechMission5,
+    OptionGroup("Shadow Missions", [
+        ShadowMissionCount,
+        ShadowMission2,
+        ShadowMission3,
+        ShadowMission4,
+        ShadowMission5,
     ]),
-    OptionGroup("Hunt Missions", [
-        HuntMissionCount,
-        HuntMission2,
-        HuntMission3,
-        HuntMission4,
-        HuntMission5,
+    OptionGroup("Tails Missions", [
+        TailsMissionCount,
+        TailsMission2,
+        TailsMission3,
+        TailsMission4,
+        TailsMission5,
+    ]),
+    OptionGroup("Eggman Missions", [
+        EggmanMissionCount,
+        EggmanMission2,
+        EggmanMission3,
+        EggmanMission4,
+        EggmanMission5,
+    ]),
+    OptionGroup("Knuckles Missions", [
+        KnucklesMissionCount,
+        KnucklesMission2,
+        KnucklesMission3,
+        KnucklesMission4,
+        KnucklesMission5,
+    ]),
+    OptionGroup("Rouge Missions", [
+        RougeMissionCount,
+        RougeMission2,
+        RougeMission3,
+        RougeMission4,
+        RougeMission5,
     ]),
     OptionGroup("Kart Missions", [
         KartMissionCount,
@@ -931,11 +1299,13 @@ sa2b_option_groups = [
     ]),
 ]
 
-
 @dataclass
 class SA2BOptions(PerGameCommonOptions):
     goal: Goal
     boss_rush_shuffle: BossRushShuffle
+    minigame_madness_requirement: MinigameMadnessRequirement
+    minigame_madness_minimum: MinigameMadnessMinimum
+    gate_boss_plando: GateBossPlando
     logic_difficulty: LogicDifficulty
     required_rank: RequiredRank
     max_emblem_cap: MaximumEmblemCap
@@ -953,6 +1323,8 @@ class SA2BOptions(PerGameCommonOptions):
     beetlesanity: Beetlesanity
     omosanity: Omosanity
     animalsanity: Animalsanity
+    itemboxsanity: ItemBoxsanity
+    bigsanity: Bigsanity
     kart_race_checks: KartRaceChecks
 
     black_market_slots: BlackMarketSlots
@@ -983,31 +1355,65 @@ class SA2BOptions(PerGameCommonOptions):
     slow_trap_weight: SlowTrapWeight
     cutscene_trap_weight: CutsceneTrapWeight
     reverse_trap_weight: ReverseTrapWeight
+    literature_trap_weight: LiteratureTrapWeight
+    controller_drift_trap_weight: ControllerDriftTrapWeight
+    poison_trap_weight: PoisonTrapWeight
+    bee_trap_weight: BeeTrapWeight
     pong_trap_weight: PongTrapWeight
+    breakout_trap_weight: BreakoutTrapWeight
+    fishing_trap_weight: FishingTrapWeight
+    trivia_trap_weight: TriviaTrapWeight
+    pokemon_trivia_trap_weight: PokemonTriviaTrapWeight
+    pokemon_count_trap_weight: PokemonCountTrapWeight
+    number_sequence_trap_weight: NumberSequenceTrapWeight
+    light_up_path_trap_weight: LightUpPathTrapWeight
+    pinball_trap_weight: PinballTrapWeight
+    math_quiz_trap_weight: MathQuizTrapWeight
+    snake_trap_weight: SnakeTrapWeight
+    input_sequence_trap_weight: InputSequenceTrapWeight
     minigame_trap_difficulty: MinigameTrapDifficulty
+    big_fishing_difficulty: BigFishingDifficulty
 
     sadx_music: SADXMusic
     music_shuffle: MusicShuffle
     voice_shuffle: VoiceShuffle
     narrator: Narrator
 
-    speed_mission_count: SpeedMissionCount
-    speed_mission_2: SpeedMission2
-    speed_mission_3: SpeedMission3
-    speed_mission_4: SpeedMission4
-    speed_mission_5: SpeedMission5
+    sonic_mission_count: SonicMissionCount
+    sonic_mission_2: SonicMission2
+    sonic_mission_3: SonicMission3
+    sonic_mission_4: SonicMission4
+    sonic_mission_5: SonicMission5
 
-    mech_mission_count: MechMissionCount
-    mech_mission_2: MechMission2
-    mech_mission_3: MechMission3
-    mech_mission_4: MechMission4
-    mech_mission_5: MechMission5
+    shadow_mission_count: ShadowMissionCount
+    shadow_mission_2: ShadowMission2
+    shadow_mission_3: ShadowMission3
+    shadow_mission_4: ShadowMission4
+    shadow_mission_5: ShadowMission5
 
-    hunt_mission_count: HuntMissionCount
-    hunt_mission_2: HuntMission2
-    hunt_mission_3: HuntMission3
-    hunt_mission_4: HuntMission4
-    hunt_mission_5: HuntMission5
+    tails_mission_count: TailsMissionCount
+    tails_mission_2: TailsMission2
+    tails_mission_3: TailsMission3
+    tails_mission_4: TailsMission4
+    tails_mission_5: TailsMission5
+
+    eggman_mission_count: EggmanMissionCount
+    eggman_mission_2: EggmanMission2
+    eggman_mission_3: EggmanMission3
+    eggman_mission_4: EggmanMission4
+    eggman_mission_5: EggmanMission5
+
+    knuckles_mission_count: KnucklesMissionCount
+    knuckles_mission_2: KnucklesMission2
+    knuckles_mission_3: KnucklesMission3
+    knuckles_mission_4: KnucklesMission4
+    knuckles_mission_5: KnucklesMission5
+
+    rouge_mission_count: RougeMissionCount
+    rouge_mission_2: RougeMission2
+    rouge_mission_3: RougeMission3
+    rouge_mission_4: RougeMission4
+    rouge_mission_5: RougeMission5
 
     kart_mission_count: KartMissionCount
     kart_mission_2: KartMission2
@@ -1022,4 +1428,5 @@ class SA2BOptions(PerGameCommonOptions):
     cannons_core_mission_5: CannonsCoreMission5
 
     ring_link: RingLink
+    trap_link: TrapLink
     death_link: DeathLink
diff --git a/worlds/sa2b/Presets.py b/worlds/sa2b/Presets.py
new file mode 100644
index 0000000000..39e988b645
--- /dev/null
+++ b/worlds/sa2b/Presets.py
@@ -0,0 +1,502 @@
+from typing import Dict, Any
+
+from .Options import *
+
+minsanity = {
+    "goal": Goal.option_chaos_chao,
+    "max_emblem_cap": MaximumEmblemCap.range_start,
+
+    "keysanity": False,
+    "whistlesanity": Whistlesanity.option_none,
+    "beetlesanity": False,
+    "omosanity": False,
+    "animalsanity": False,
+    "itemboxsanity": ItemBoxsanity.option_none,
+    "bigsanity": False,
+    "kart_race_checks": KartRaceChecks.option_none,
+
+    "junk_fill_percentage": 0,
+
+    "sonic_mission_count": BaseMissionCount.range_start,
+    "sonic_mission_2": False,
+    "sonic_mission_3": False,
+    "sonic_mission_4": False,
+    "sonic_mission_5": False,
+
+    "shadow_mission_count": BaseMissionCount.range_start,
+    "shadow_mission_2": False,
+    "shadow_mission_3": False,
+    "shadow_mission_4": False,
+    "shadow_mission_5": False,
+
+    "tails_mission_count": BaseMissionCount.range_start,
+    "tails_mission_2": False,
+    "tails_mission_3": False,
+    "tails_mission_4": False,
+    "tails_mission_5": False,
+
+    "eggman_mission_count": BaseMissionCount.range_start,
+    "eggman_mission_2": False,
+    "eggman_mission_3": False,
+    "eggman_mission_4": False,
+    "eggman_mission_5": False,
+
+    "knuckles_mission_count": BaseMissionCount.range_start,
+    "knuckles_mission_2": False,
+    "knuckles_mission_3": False,
+    "knuckles_mission_4": False,
+    "knuckles_mission_5": False,
+
+    "rouge_mission_count": BaseMissionCount.range_start,
+    "rouge_mission_2": False,
+    "rouge_mission_3": False,
+    "rouge_mission_4": False,
+    "rouge_mission_5": False,
+
+    "kart_mission_count": BaseMissionCount.range_start,
+    "kart_mission_2": False,
+    "kart_mission_3": False,
+    "kart_mission_4": False,
+    "kart_mission_5": False,
+
+    "cannons_core_mission_count": BaseMissionCount.range_start,
+    "cannons_core_mission_2": False,
+    "cannons_core_mission_3": False,
+    "cannons_core_mission_4": False,
+    "cannons_core_mission_5": False,
+}
+
+chao_centric = {
+    "goal": Goal.option_chaos_chao,
+
+    "keysanity": False,
+    "whistlesanity": Whistlesanity.option_none,
+    "beetlesanity": False,
+    "omosanity": False,
+    "animalsanity": False,
+    "itemboxsanity": ItemBoxsanity.option_none,
+    "bigsanity": False,
+    "kart_race_checks": KartRaceChecks.option_none,
+
+    "black_market_slots": BlackMarketSlots.range_end,
+    "black_market_unlock_costs": BlackMarketUnlockCosts.option_high,
+    "chao_race_difficulty": ChaoRaceDifficulty.option_expert,
+    "chao_karate_difficulty": ChaoKarateDifficulty.option_super,
+    "chao_stadium_checks": ChaoStadiumChecks.option_all,
+    "chao_animal_parts": True,
+    "chao_stats": ChaoStats.range_end,
+    "chao_stats_frequency": 1,
+    "chao_stats_stamina": True,
+    "chao_stats_hidden": True,
+    "chao_kindergarten": ChaoKindergarten.option_full,
+
+    "junk_fill_percentage": 50,
+
+    "sonic_mission_count": BaseMissionCount.range_start,
+    "sonic_mission_2": False,
+    "sonic_mission_3": False,
+    "sonic_mission_4": False,
+    "sonic_mission_5": False,
+
+    "shadow_mission_count": BaseMissionCount.range_start,
+    "shadow_mission_2": False,
+    "shadow_mission_3": False,
+    "shadow_mission_4": False,
+    "shadow_mission_5": False,
+
+    "tails_mission_count": BaseMissionCount.range_start,
+    "tails_mission_2": False,
+    "tails_mission_3": False,
+    "tails_mission_4": False,
+    "tails_mission_5": False,
+
+    "eggman_mission_count": BaseMissionCount.range_start,
+    "eggman_mission_2": False,
+    "eggman_mission_3": False,
+    "eggman_mission_4": False,
+    "eggman_mission_5": False,
+
+    "knuckles_mission_count": BaseMissionCount.range_start,
+    "knuckles_mission_2": False,
+    "knuckles_mission_3": False,
+    "knuckles_mission_4": False,
+    "knuckles_mission_5": False,
+
+    "rouge_mission_count": BaseMissionCount.range_start,
+    "rouge_mission_2": False,
+    "rouge_mission_3": False,
+    "rouge_mission_4": False,
+    "rouge_mission_5": False,
+
+    "kart_mission_count": BaseMissionCount.range_start,
+    "kart_mission_2": False,
+    "kart_mission_3": False,
+    "kart_mission_4": False,
+    "kart_mission_5": False,
+
+    "cannons_core_mission_count": BaseMissionCount.range_start,
+    "cannons_core_mission_2": False,
+    "cannons_core_mission_3": False,
+    "cannons_core_mission_4": False,
+    "cannons_core_mission_5": False,
+}
+
+allsanity_no_chao = {
+    "goal": Goal.option_cannons_core_boss_rush,
+    "boss_rush_shuffle": BossRushShuffle.option_chaos,
+    "minigame_madness_requirement": MinigameMadnessRequirement.range_end,
+    "minigame_madness_minimum": MinigameMadnessMinimum.range_end,
+    "max_emblem_cap": MaximumEmblemCap.range_end,
+
+    "mission_shuffle": True,
+    "required_cannons_core_missions": RequiredCannonsCoreMissions.option_all_active,
+    "emblem_percentage_for_cannons_core": EmblemPercentageForCannonsCore.range_end,
+    "number_of_level_gates": NumberOfLevelGates.range_end,
+    "level_gate_costs": LevelGateCosts.option_high,
+
+    "keysanity": True,
+    "whistlesanity": Whistlesanity.option_both,
+    "beetlesanity": True,
+    "omosanity": True,
+    "animalsanity": True,
+    "itemboxsanity": ItemBoxsanity.option_all,
+    "bigsanity": True,
+    "kart_race_checks": KartRaceChecks.option_full,
+
+    "junk_fill_percentage": 25,
+    "trap_fill_percentage": 25,
+    "omochao_trap_weight": BaseTrapWeight.option_high,
+    "timestop_trap_weight": BaseTrapWeight.option_high,
+    "confusion_trap_weight": BaseTrapWeight.option_high,
+    "tiny_trap_weight": BaseTrapWeight.option_high,
+    "gravity_trap_weight": BaseTrapWeight.option_high,
+    "exposition_trap_weight": BaseTrapWeight.option_high,
+    "ice_trap_weight": BaseTrapWeight.option_high,
+    "slow_trap_weight": BaseTrapWeight.option_high,
+    "cutscene_trap_weight": BaseTrapWeight.option_high,
+    "reverse_trap_weight": BaseTrapWeight.option_high,
+    "literature_trap_weight": BaseTrapWeight.option_high,
+    "controller_drift_trap_weight": BaseTrapWeight.option_high,
+    "poison_trap_weight": BaseTrapWeight.option_high,
+    "bee_trap_weight": BaseTrapWeight.option_high,
+    "pong_trap_weight": BaseTrapWeight.option_high,
+    "breakout_trap_weight": BaseTrapWeight.option_high,
+    "fishing_trap_weight": BaseTrapWeight.option_high,
+    "trivia_trap_weight": BaseTrapWeight.option_high,
+    "pokemon_trivia_trap_weight": BaseTrapWeight.option_high,
+    "pokemon_count_trap_weight": BaseTrapWeight.option_high,
+    "number_sequence_trap_weight": BaseTrapWeight.option_high,
+    "light_up_path_trap_weight": BaseTrapWeight.option_high,
+    "pinball_trap_weight": BaseTrapWeight.option_high,
+    "math_quiz_trap_weight": BaseTrapWeight.option_high,
+    "snake_trap_weight": BaseTrapWeight.option_high,
+    "input_sequence_trap_weight": BaseTrapWeight.option_high,
+    "minigame_trap_difficulty": MinigameTrapDifficulty.option_chaos,
+    "big_fishing_difficulty": BigFishingDifficulty.option_chaos,
+
+    "music_shuffle": MusicShuffle.option_full,
+    "voice_shuffle": VoiceShuffle.option_shuffled,
+
+    "sonic_mission_count": BaseMissionCount.range_end,
+    "sonic_mission_2": True,
+    "sonic_mission_3": True,
+    "sonic_mission_4": True,
+    "sonic_mission_5": True,
+
+    "shadow_mission_count": BaseMissionCount.range_end,
+    "shadow_mission_2": True,
+    "shadow_mission_3": True,
+    "shadow_mission_4": True,
+    "shadow_mission_5": True,
+
+    "tails_mission_count": BaseMissionCount.range_end,
+    "tails_mission_2": True,
+    "tails_mission_3": True,
+    "tails_mission_4": True,
+    "tails_mission_5": True,
+
+    "eggman_mission_count": BaseMissionCount.range_end,
+    "eggman_mission_2": True,
+    "eggman_mission_3": True,
+    "eggman_mission_4": True,
+    "eggman_mission_5": True,
+
+    "knuckles_mission_count": BaseMissionCount.range_end,
+    "knuckles_mission_2": True,
+    "knuckles_mission_3": True,
+    "knuckles_mission_4": True,
+    "knuckles_mission_5": True,
+
+    "rouge_mission_count": BaseMissionCount.range_end,
+    "rouge_mission_2": True,
+    "rouge_mission_3": True,
+    "rouge_mission_4": True,
+    "rouge_mission_5": True,
+
+    "kart_mission_count": BaseMissionCount.range_end,
+    "kart_mission_2": True,
+    "kart_mission_3": True,
+    "kart_mission_4": True,
+    "kart_mission_5": True,
+
+    "cannons_core_mission_count": BaseMissionCount.range_end,
+    "cannons_core_mission_2": True,
+    "cannons_core_mission_3": True,
+    "cannons_core_mission_4": True,
+    "cannons_core_mission_5": True,
+}
+
+allsanity = {
+    "goal": Goal.option_cannons_core_boss_rush,
+    "boss_rush_shuffle": BossRushShuffle.option_chaos,
+    "minigame_madness_requirement": MinigameMadnessRequirement.range_end,
+    "minigame_madness_minimum": MinigameMadnessMinimum.range_end,
+    "max_emblem_cap": MaximumEmblemCap.range_end,
+
+    "mission_shuffle": True,
+    "required_cannons_core_missions": RequiredCannonsCoreMissions.option_all_active,
+    "emblem_percentage_for_cannons_core": EmblemPercentageForCannonsCore.range_end,
+    "number_of_level_gates": NumberOfLevelGates.range_end,
+    "level_gate_costs": LevelGateCosts.option_high,
+
+    "keysanity": True,
+    "whistlesanity": Whistlesanity.option_both,
+    "beetlesanity": True,
+    "omosanity": True,
+    "animalsanity": True,
+    "itemboxsanity": ItemBoxsanity.option_all,
+    "bigsanity": True,
+    "kart_race_checks": KartRaceChecks.option_full,
+
+    "black_market_slots": BlackMarketSlots.range_end,
+    "black_market_unlock_costs": BlackMarketUnlockCosts.option_high,
+    "chao_race_difficulty": ChaoRaceDifficulty.option_expert,
+    "chao_karate_difficulty": ChaoKarateDifficulty.option_super,
+    "chao_stadium_checks": ChaoStadiumChecks.option_all,
+    "chao_animal_parts": True,
+    "chao_stats": ChaoStats.range_end,
+    "chao_stats_frequency": 1,
+    "chao_stats_stamina": True,
+    "chao_stats_hidden": True,
+    "chao_kindergarten": ChaoKindergarten.option_full,
+
+    "junk_fill_percentage": 25,
+    "trap_fill_percentage": 25,
+    "omochao_trap_weight": BaseTrapWeight.option_high,
+    "timestop_trap_weight": BaseTrapWeight.option_high,
+    "confusion_trap_weight": BaseTrapWeight.option_high,
+    "tiny_trap_weight": BaseTrapWeight.option_high,
+    "gravity_trap_weight": BaseTrapWeight.option_high,
+    "exposition_trap_weight": BaseTrapWeight.option_high,
+    "ice_trap_weight": BaseTrapWeight.option_high,
+    "slow_trap_weight": BaseTrapWeight.option_high,
+    "cutscene_trap_weight": BaseTrapWeight.option_high,
+    "reverse_trap_weight": BaseTrapWeight.option_high,
+    "literature_trap_weight": BaseTrapWeight.option_high,
+    "controller_drift_trap_weight": BaseTrapWeight.option_high,
+    "poison_trap_weight": BaseTrapWeight.option_high,
+    "bee_trap_weight": BaseTrapWeight.option_high,
+    "pong_trap_weight": BaseTrapWeight.option_high,
+    "breakout_trap_weight": BaseTrapWeight.option_high,
+    "fishing_trap_weight": BaseTrapWeight.option_high,
+    "trivia_trap_weight": BaseTrapWeight.option_high,
+    "pokemon_trivia_trap_weight": BaseTrapWeight.option_high,
+    "pokemon_count_trap_weight": BaseTrapWeight.option_high,
+    "number_sequence_trap_weight": BaseTrapWeight.option_high,
+    "light_up_path_trap_weight": BaseTrapWeight.option_high,
+    "pinball_trap_weight": BaseTrapWeight.option_high,
+    "math_quiz_trap_weight": BaseTrapWeight.option_high,
+    "snake_trap_weight": BaseTrapWeight.option_high,
+    "input_sequence_trap_weight": BaseTrapWeight.option_high,
+    "minigame_trap_difficulty": MinigameTrapDifficulty.option_chaos,
+    "big_fishing_difficulty": BigFishingDifficulty.option_chaos,
+
+    "music_shuffle": MusicShuffle.option_full,
+    "voice_shuffle": VoiceShuffle.option_shuffled,
+
+    "sonic_mission_count": BaseMissionCount.range_end,
+    "sonic_mission_2": True,
+    "sonic_mission_3": True,
+    "sonic_mission_4": True,
+    "sonic_mission_5": True,
+
+    "shadow_mission_count": BaseMissionCount.range_end,
+    "shadow_mission_2": True,
+    "shadow_mission_3": True,
+    "shadow_mission_4": True,
+    "shadow_mission_5": True,
+
+    "tails_mission_count": BaseMissionCount.range_end,
+    "tails_mission_2": True,
+    "tails_mission_3": True,
+    "tails_mission_4": True,
+    "tails_mission_5": True,
+
+    "eggman_mission_count": BaseMissionCount.range_end,
+    "eggman_mission_2": True,
+    "eggman_mission_3": True,
+    "eggman_mission_4": True,
+    "eggman_mission_5": True,
+
+    "knuckles_mission_count": BaseMissionCount.range_end,
+    "knuckles_mission_2": True,
+    "knuckles_mission_3": True,
+    "knuckles_mission_4": True,
+    "knuckles_mission_5": True,
+
+    "rouge_mission_count": BaseMissionCount.range_end,
+    "rouge_mission_2": True,
+    "rouge_mission_3": True,
+    "rouge_mission_4": True,
+    "rouge_mission_5": True,
+
+    "kart_mission_count": BaseMissionCount.range_end,
+    "kart_mission_2": True,
+    "kart_mission_3": True,
+    "kart_mission_4": True,
+    "kart_mission_5": True,
+
+    "cannons_core_mission_count": BaseMissionCount.range_end,
+    "cannons_core_mission_2": True,
+    "cannons_core_mission_3": True,
+    "cannons_core_mission_4": True,
+    "cannons_core_mission_5": True,
+}
+
+all_random = {
+    "goal": "random",
+    "boss_rush_shuffle": "random",
+    "minigame_madness_requirement": "random",
+    "minigame_madness_minimum": "random",
+    "logic_difficulty": "random",
+    "required_rank": "random",
+    "max_emblem_cap": "random",
+    "ring_loss": "random",
+
+    "mission_shuffle": "random",
+    "required_cannons_core_missions": "random",
+    "emblem_percentage_for_cannons_core": "random",
+    "number_of_level_gates": "random",
+    "level_gate_distribution": "random",
+    "level_gate_costs": "random",
+
+    "keysanity": "random",
+    "whistlesanity": "random",
+    "beetlesanity": "random",
+    "omosanity": "random",
+    "animalsanity": "random",
+    "itemboxsanity": "random",
+    "bigsanity": "random",
+    "kart_race_checks": "random",
+
+    "black_market_slots": "random",
+    "black_market_unlock_costs": "random",
+    "black_market_price_multiplier": "random",
+    "chao_race_difficulty": "random",
+    "chao_karate_difficulty": "random",
+    "chao_stadium_checks": "random",
+    "chao_animal_parts": "random",
+    "chao_stats": "random",
+    "chao_stats_frequency": "random",
+    "chao_stats_stamina": "random",
+    "chao_stats_hidden": "random",
+    "chao_kindergarten": "random",
+    "shuffle_starting_chao_eggs": "random",
+    "chao_entrance_randomization": "random",
+
+    "junk_fill_percentage": "random",
+    "trap_fill_percentage": "random",
+    "omochao_trap_weight": "random",
+    "timestop_trap_weight": "random",
+    "confusion_trap_weight": "random",
+    "tiny_trap_weight": "random",
+    "gravity_trap_weight": "random",
+    "exposition_trap_weight": "random",
+    "ice_trap_weight": "random",
+    "slow_trap_weight": "random",
+    "cutscene_trap_weight": "random",
+    "reverse_trap_weight": "random",
+    "literature_trap_weight": "random",
+    "controller_drift_trap_weight": "random",
+    "poison_trap_weight": "random",
+    "bee_trap_weight": "random",
+    "pong_trap_weight": "random",
+    "breakout_trap_weight": "random",
+    "fishing_trap_weight": "random",
+    "trivia_trap_weight": "random",
+    "pokemon_trivia_trap_weight": "random",
+    "pokemon_count_trap_weight": "random",
+    "number_sequence_trap_weight": "random",
+    "light_up_path_trap_weight": "random",
+    "pinball_trap_weight": "random",
+    "math_quiz_trap_weight": "random",
+    "snake_trap_weight": "random",
+    "input_sequence_trap_weight": "random",
+    "minigame_trap_difficulty": "random",
+    "big_fishing_difficulty": "random",
+
+    "sadx_music": "random",
+    "music_shuffle": "random",
+    "voice_shuffle": "random",
+    "narrator": "random",
+
+    "sonic_mission_count": "random",
+    "sonic_mission_2": "random",
+    "sonic_mission_3": "random",
+    "sonic_mission_4": "random",
+    "sonic_mission_5": "random",
+
+    "shadow_mission_count": "random",
+    "shadow_mission_2": "random",
+    "shadow_mission_3": "random",
+    "shadow_mission_4": "random",
+    "shadow_mission_5": "random",
+
+    "tails_mission_count": "random",
+    "tails_mission_2": "random",
+    "tails_mission_3": "random",
+    "tails_mission_4": "random",
+    "tails_mission_5": "random",
+
+    "eggman_mission_count": "random",
+    "eggman_mission_2": "random",
+    "eggman_mission_3": "random",
+    "eggman_mission_4": "random",
+    "eggman_mission_5": "random",
+
+    "knuckles_mission_count": "random",
+    "knuckles_mission_2": "random",
+    "knuckles_mission_3": "random",
+    "knuckles_mission_4": "random",
+    "knuckles_mission_5": "random",
+
+    "rouge_mission_count": "random",
+    "rouge_mission_2": "random",
+    "rouge_mission_3": "random",
+    "rouge_mission_4": "random",
+    "rouge_mission_5": "random",
+
+    "kart_mission_count": "random",
+    "kart_mission_2": "random",
+    "kart_mission_3": "random",
+    "kart_mission_4": "random",
+    "kart_mission_5": "random",
+
+    "cannons_core_mission_count": "random",
+    "cannons_core_mission_2": "random",
+    "cannons_core_mission_3": "random",
+    "cannons_core_mission_4": "random",
+    "cannons_core_mission_5": "random",
+
+    "ring_link": "random",
+    "trap_link": "random",
+    "death_link": "random",
+}
+
+sa2b_options_presets: Dict[str, Dict[str, Any]] = {
+    "Minsanity": minsanity,
+    "Chao-centric": chao_centric,
+    "Allsanity No Chao": allsanity_no_chao,
+    "Allsanity": allsanity,
+    "All Random": all_random,
+}
diff --git a/worlds/sa2b/Regions.py b/worlds/sa2b/Regions.py
index fb6472d65d..5326204313 100644
--- a/worlds/sa2b/Regions.py
+++ b/worlds/sa2b/Regions.py
@@ -3,12 +3,8 @@ import math
 
 from BaseClasses import MultiWorld, Region, Entrance, ItemClassification
 from worlds.AutoWorld import World
-from .Items import SA2BItem
-from .Locations import SA2BLocation, boss_gate_location_table, boss_gate_set,\
-                                     chao_stat_swim_table, chao_stat_fly_table, chao_stat_run_table,\
-                                     chao_stat_power_table, chao_stat_stamina_table,\
-                                     chao_stat_luck_table, chao_stat_intelligence_table, chao_animal_event_location_table,\
-                                     chao_kindergarten_location_table, chao_kindergarten_basics_location_table, black_market_location_table
+from .Items import SA2BItem, minigame_trap_table
+from .Locations import *
 from .Names import LocationName, ItemName
 from .GateBosses import get_boss_name, all_gate_bosses_table, king_boom_boo
 
@@ -124,1196 +120,96 @@ def create_regions(multiworld: MultiWorld, world: World, player: int, active_loc
         gate_5_region = create_region(multiworld, player, active_locations, 'Gate 5', None)
         conditional_regions += [gate_5_region, gate_5_boss_region]
 
-    city_escape_region_locations = [
-        LocationName.city_escape_1,
-        LocationName.city_escape_2,
-        LocationName.city_escape_3,
-        LocationName.city_escape_4,
-        LocationName.city_escape_5,
-        LocationName.city_escape_chao_1,
-        LocationName.city_escape_chao_2,
-        LocationName.city_escape_chao_3,
-        LocationName.city_escape_pipe_1,
-        LocationName.city_escape_pipe_2,
-        LocationName.city_escape_pipe_3,
-        LocationName.city_escape_pipe_4,
-        LocationName.city_escape_hidden_1,
-        LocationName.city_escape_hidden_2,
-        LocationName.city_escape_hidden_3,
-        LocationName.city_escape_hidden_4,
-        LocationName.city_escape_hidden_5,
-        LocationName.city_escape_omo_1,
-        LocationName.city_escape_omo_2,
-        LocationName.city_escape_omo_3,
-        LocationName.city_escape_omo_4,
-        LocationName.city_escape_omo_5,
-        LocationName.city_escape_omo_6,
-        LocationName.city_escape_omo_7,
-        LocationName.city_escape_omo_8,
-        LocationName.city_escape_omo_9,
-        LocationName.city_escape_omo_10,
-        LocationName.city_escape_omo_11,
-        LocationName.city_escape_omo_12,
-        LocationName.city_escape_omo_13,
-        LocationName.city_escape_omo_14,
-        LocationName.city_escape_beetle,
-        LocationName.city_escape_animal_1,
-        LocationName.city_escape_animal_2,
-        LocationName.city_escape_animal_3,
-        LocationName.city_escape_animal_4,
-        LocationName.city_escape_animal_5,
-        LocationName.city_escape_animal_6,
-        LocationName.city_escape_animal_7,
-        LocationName.city_escape_animal_8,
-        LocationName.city_escape_animal_9,
-        LocationName.city_escape_animal_10,
-        LocationName.city_escape_animal_11,
-        LocationName.city_escape_animal_12,
-        LocationName.city_escape_animal_13,
-        LocationName.city_escape_animal_14,
-        LocationName.city_escape_animal_15,
-        LocationName.city_escape_animal_16,
-        LocationName.city_escape_animal_17,
-        LocationName.city_escape_animal_18,
-        LocationName.city_escape_animal_19,
-        LocationName.city_escape_animal_20,
-        LocationName.city_escape_upgrade,
-    ]
     city_escape_region = create_region(multiworld, player, active_locations, LocationName.city_escape_region,
                                        city_escape_region_locations)
 
-    metal_harbor_region_locations = [
-        LocationName.metal_harbor_1,
-        LocationName.metal_harbor_2,
-        LocationName.metal_harbor_3,
-        LocationName.metal_harbor_4,
-        LocationName.metal_harbor_5,
-        LocationName.metal_harbor_chao_1,
-        LocationName.metal_harbor_chao_2,
-        LocationName.metal_harbor_chao_3,
-        LocationName.metal_harbor_pipe_1,
-        LocationName.metal_harbor_omo_1,
-        LocationName.metal_harbor_omo_2,
-        LocationName.metal_harbor_omo_3,
-        LocationName.metal_harbor_omo_4,
-        LocationName.metal_harbor_omo_5,
-        LocationName.metal_harbor_beetle,
-        LocationName.metal_harbor_animal_1,
-        LocationName.metal_harbor_animal_2,
-        LocationName.metal_harbor_animal_3,
-        LocationName.metal_harbor_animal_4,
-        LocationName.metal_harbor_animal_5,
-        LocationName.metal_harbor_animal_6,
-        LocationName.metal_harbor_animal_7,
-        LocationName.metal_harbor_animal_8,
-        LocationName.metal_harbor_animal_9,
-        LocationName.metal_harbor_animal_10,
-        LocationName.metal_harbor_animal_11,
-        LocationName.metal_harbor_animal_12,
-        LocationName.metal_harbor_animal_13,
-        LocationName.metal_harbor_animal_14,
-        LocationName.metal_harbor_upgrade,
-    ]
     metal_harbor_region = create_region(multiworld, player, active_locations, LocationName.metal_harbor_region,
                                         metal_harbor_region_locations)
 
-    green_forest_region_locations = [
-        LocationName.green_forest_1,
-        LocationName.green_forest_2,
-        LocationName.green_forest_3,
-        LocationName.green_forest_4,
-        LocationName.green_forest_5,
-        LocationName.green_forest_chao_1,
-        LocationName.green_forest_chao_2,
-        LocationName.green_forest_chao_3,
-        LocationName.green_forest_pipe_1,
-        LocationName.green_forest_pipe_2,
-        LocationName.green_forest_hidden_1,
-        LocationName.green_forest_hidden_2,
-        LocationName.green_forest_hidden_3,
-        LocationName.green_forest_hidden_4,
-        LocationName.green_forest_beetle,
-        LocationName.green_forest_animal_1,
-        LocationName.green_forest_animal_2,
-        LocationName.green_forest_animal_3,
-        LocationName.green_forest_animal_4,
-        LocationName.green_forest_animal_5,
-        LocationName.green_forest_animal_6,
-        LocationName.green_forest_animal_7,
-        LocationName.green_forest_animal_8,
-        LocationName.green_forest_animal_9,
-        LocationName.green_forest_animal_10,
-        LocationName.green_forest_animal_11,
-        LocationName.green_forest_animal_12,
-        LocationName.green_forest_animal_13,
-        LocationName.green_forest_animal_14,
-        LocationName.green_forest_animal_15,
-        LocationName.green_forest_animal_16,
-        LocationName.green_forest_animal_17,
-        LocationName.green_forest_animal_18,
-        LocationName.green_forest_upgrade,
-    ]
     green_forest_region = create_region(multiworld, player, active_locations, LocationName.green_forest_region,
                                         green_forest_region_locations)
 
-    pyramid_cave_region_locations = [
-        LocationName.pyramid_cave_1,
-        LocationName.pyramid_cave_2,
-        LocationName.pyramid_cave_3,
-        LocationName.pyramid_cave_4,
-        LocationName.pyramid_cave_5,
-        LocationName.pyramid_cave_chao_1,
-        LocationName.pyramid_cave_chao_2,
-        LocationName.pyramid_cave_chao_3,
-        LocationName.pyramid_cave_pipe_1,
-        LocationName.pyramid_cave_pipe_2,
-        LocationName.pyramid_cave_pipe_3,
-        LocationName.pyramid_cave_pipe_4,
-        LocationName.pyramid_cave_omo_1,
-        LocationName.pyramid_cave_omo_2,
-        LocationName.pyramid_cave_omo_3,
-        LocationName.pyramid_cave_omo_4,
-        LocationName.pyramid_cave_beetle,
-        LocationName.pyramid_cave_animal_1,
-        LocationName.pyramid_cave_animal_2,
-        LocationName.pyramid_cave_animal_3,
-        LocationName.pyramid_cave_animal_4,
-        LocationName.pyramid_cave_animal_5,
-        LocationName.pyramid_cave_animal_6,
-        LocationName.pyramid_cave_animal_7,
-        LocationName.pyramid_cave_animal_8,
-        LocationName.pyramid_cave_animal_9,
-        LocationName.pyramid_cave_animal_10,
-        LocationName.pyramid_cave_animal_11,
-        LocationName.pyramid_cave_animal_12,
-        LocationName.pyramid_cave_animal_13,
-        LocationName.pyramid_cave_animal_14,
-        LocationName.pyramid_cave_animal_15,
-        LocationName.pyramid_cave_animal_16,
-        LocationName.pyramid_cave_animal_17,
-        LocationName.pyramid_cave_animal_18,
-        LocationName.pyramid_cave_animal_19,
-        LocationName.pyramid_cave_upgrade,
-    ]
     pyramid_cave_region = create_region(multiworld, player, active_locations, LocationName.pyramid_cave_region,
                                         pyramid_cave_region_locations)
 
-    crazy_gadget_region_locations = [
-        LocationName.crazy_gadget_1,
-        LocationName.crazy_gadget_2,
-        LocationName.crazy_gadget_3,
-        LocationName.crazy_gadget_4,
-        LocationName.crazy_gadget_5,
-        LocationName.crazy_gadget_chao_1,
-        LocationName.crazy_gadget_chao_2,
-        LocationName.crazy_gadget_chao_3,
-        LocationName.crazy_gadget_pipe_1,
-        LocationName.crazy_gadget_pipe_2,
-        LocationName.crazy_gadget_pipe_3,
-        LocationName.crazy_gadget_pipe_4,
-        LocationName.crazy_gadget_hidden_1,
-        LocationName.crazy_gadget_omo_1,
-        LocationName.crazy_gadget_omo_2,
-        LocationName.crazy_gadget_omo_3,
-        LocationName.crazy_gadget_omo_4,
-        LocationName.crazy_gadget_omo_5,
-        LocationName.crazy_gadget_omo_6,
-        LocationName.crazy_gadget_omo_7,
-        LocationName.crazy_gadget_omo_8,
-        LocationName.crazy_gadget_omo_9,
-        LocationName.crazy_gadget_omo_10,
-        LocationName.crazy_gadget_omo_11,
-        LocationName.crazy_gadget_omo_12,
-        LocationName.crazy_gadget_omo_13,
-        LocationName.crazy_gadget_beetle,
-        LocationName.crazy_gadget_animal_1,
-        LocationName.crazy_gadget_animal_2,
-        LocationName.crazy_gadget_animal_3,
-        LocationName.crazy_gadget_animal_4,
-        LocationName.crazy_gadget_animal_5,
-        LocationName.crazy_gadget_animal_6,
-        LocationName.crazy_gadget_animal_7,
-        LocationName.crazy_gadget_animal_8,
-        LocationName.crazy_gadget_animal_9,
-        LocationName.crazy_gadget_animal_10,
-        LocationName.crazy_gadget_animal_11,
-        LocationName.crazy_gadget_animal_12,
-        LocationName.crazy_gadget_animal_13,
-        LocationName.crazy_gadget_animal_14,
-        LocationName.crazy_gadget_animal_15,
-        LocationName.crazy_gadget_animal_16,
-        LocationName.crazy_gadget_upgrade,
-    ]
     crazy_gadget_region = create_region(multiworld, player, active_locations, LocationName.crazy_gadget_region,
                                         crazy_gadget_region_locations)
 
-    final_rush_region_locations = [
-        LocationName.final_rush_1,
-        LocationName.final_rush_2,
-        LocationName.final_rush_3,
-        LocationName.final_rush_4,
-        LocationName.final_rush_5,
-        LocationName.final_rush_chao_1,
-        LocationName.final_rush_chao_2,
-        LocationName.final_rush_chao_3,
-        LocationName.final_rush_pipe_1,
-        LocationName.final_rush_pipe_2,
-        LocationName.final_rush_omo_1,
-        LocationName.final_rush_omo_2,
-        LocationName.final_rush_omo_3,
-        LocationName.final_rush_beetle,
-        LocationName.final_rush_animal_1,
-        LocationName.final_rush_animal_2,
-        LocationName.final_rush_animal_3,
-        LocationName.final_rush_animal_4,
-        LocationName.final_rush_animal_5,
-        LocationName.final_rush_animal_6,
-        LocationName.final_rush_animal_7,
-        LocationName.final_rush_animal_8,
-        LocationName.final_rush_animal_9,
-        LocationName.final_rush_animal_10,
-        LocationName.final_rush_animal_11,
-        LocationName.final_rush_animal_12,
-        LocationName.final_rush_animal_13,
-        LocationName.final_rush_animal_14,
-        LocationName.final_rush_animal_15,
-        LocationName.final_rush_animal_16,
-        LocationName.final_rush_upgrade,
-    ]
     final_rush_region = create_region(multiworld, player, active_locations, LocationName.final_rush_region,
                                       final_rush_region_locations)
 
-    prison_lane_region_locations = [
-        LocationName.prison_lane_1,
-        LocationName.prison_lane_2,
-        LocationName.prison_lane_3,
-        LocationName.prison_lane_4,
-        LocationName.prison_lane_5,
-        LocationName.prison_lane_chao_1,
-        LocationName.prison_lane_chao_2,
-        LocationName.prison_lane_chao_3,
-        LocationName.prison_lane_pipe_1,
-        LocationName.prison_lane_pipe_2,
-        LocationName.prison_lane_pipe_3,
-        LocationName.prison_lane_hidden_1,
-        LocationName.prison_lane_hidden_2,
-        LocationName.prison_lane_hidden_3,
-        LocationName.prison_lane_omo_1,
-        LocationName.prison_lane_omo_2,
-        LocationName.prison_lane_omo_3,
-        LocationName.prison_lane_omo_4,
-        LocationName.prison_lane_omo_5,
-        LocationName.prison_lane_omo_6,
-        LocationName.prison_lane_omo_7,
-        LocationName.prison_lane_omo_8,
-        LocationName.prison_lane_omo_9,
-        LocationName.prison_lane_omo_10,
-        LocationName.prison_lane_beetle,
-        LocationName.prison_lane_animal_1,
-        LocationName.prison_lane_animal_2,
-        LocationName.prison_lane_animal_3,
-        LocationName.prison_lane_animal_4,
-        LocationName.prison_lane_animal_5,
-        LocationName.prison_lane_animal_6,
-        LocationName.prison_lane_animal_7,
-        LocationName.prison_lane_animal_8,
-        LocationName.prison_lane_animal_9,
-        LocationName.prison_lane_animal_10,
-        LocationName.prison_lane_animal_11,
-        LocationName.prison_lane_animal_12,
-        LocationName.prison_lane_animal_13,
-        LocationName.prison_lane_animal_14,
-        LocationName.prison_lane_animal_15,
-        LocationName.prison_lane_upgrade,
-    ]
     prison_lane_region = create_region(multiworld, player, active_locations, LocationName.prison_lane_region,
                                        prison_lane_region_locations)
 
-    mission_street_region_locations = [
-        LocationName.mission_street_1,
-        LocationName.mission_street_2,
-        LocationName.mission_street_3,
-        LocationName.mission_street_4,
-        LocationName.mission_street_5,
-        LocationName.mission_street_chao_1,
-        LocationName.mission_street_chao_2,
-        LocationName.mission_street_chao_3,
-        LocationName.mission_street_pipe_1,
-        LocationName.mission_street_pipe_2,
-        LocationName.mission_street_pipe_3,
-        LocationName.mission_street_hidden_1,
-        LocationName.mission_street_hidden_2,
-        LocationName.mission_street_hidden_3,
-        LocationName.mission_street_hidden_4,
-        LocationName.mission_street_omo_1,
-        LocationName.mission_street_omo_2,
-        LocationName.mission_street_omo_3,
-        LocationName.mission_street_omo_4,
-        LocationName.mission_street_omo_5,
-        LocationName.mission_street_omo_6,
-        LocationName.mission_street_omo_7,
-        LocationName.mission_street_omo_8,
-        LocationName.mission_street_beetle,
-        LocationName.mission_street_animal_1,
-        LocationName.mission_street_animal_2,
-        LocationName.mission_street_animal_3,
-        LocationName.mission_street_animal_4,
-        LocationName.mission_street_animal_5,
-        LocationName.mission_street_animal_6,
-        LocationName.mission_street_animal_7,
-        LocationName.mission_street_animal_8,
-        LocationName.mission_street_animal_9,
-        LocationName.mission_street_animal_10,
-        LocationName.mission_street_animal_11,
-        LocationName.mission_street_animal_12,
-        LocationName.mission_street_animal_13,
-        LocationName.mission_street_animal_14,
-        LocationName.mission_street_animal_15,
-        LocationName.mission_street_animal_16,
-        LocationName.mission_street_upgrade,
-    ]
     mission_street_region = create_region(multiworld, player, active_locations, LocationName.mission_street_region,
                                           mission_street_region_locations)
 
-    route_101_region_locations = [
-        LocationName.route_101_1,
-        LocationName.route_101_2,
-        LocationName.route_101_3,
-        LocationName.route_101_4,
-        LocationName.route_101_5,
-    ]
     route_101_region = create_region(multiworld, player, active_locations, LocationName.route_101_region,
                                      route_101_region_locations)
 
-    hidden_base_region_locations = [
-        LocationName.hidden_base_1,
-        LocationName.hidden_base_2,
-        LocationName.hidden_base_3,
-        LocationName.hidden_base_4,
-        LocationName.hidden_base_5,
-        LocationName.hidden_base_chao_1,
-        LocationName.hidden_base_chao_2,
-        LocationName.hidden_base_pipe_1,
-        LocationName.hidden_base_pipe_2,
-        LocationName.hidden_base_pipe_3,
-        LocationName.hidden_base_pipe_4,
-        LocationName.hidden_base_pipe_5,
-        LocationName.hidden_base_omo_1,
-        LocationName.hidden_base_omo_2,
-        LocationName.hidden_base_omo_3,
-        LocationName.hidden_base_omo_4,
-        LocationName.hidden_base_beetle,
-        LocationName.hidden_base_animal_1,
-        LocationName.hidden_base_animal_2,
-        LocationName.hidden_base_animal_3,
-        LocationName.hidden_base_animal_4,
-        LocationName.hidden_base_animal_5,
-        LocationName.hidden_base_animal_6,
-        LocationName.hidden_base_animal_7,
-        LocationName.hidden_base_animal_8,
-        LocationName.hidden_base_animal_9,
-        LocationName.hidden_base_animal_10,
-        LocationName.hidden_base_animal_11,
-        LocationName.hidden_base_animal_12,
-        LocationName.hidden_base_animal_13,
-        LocationName.hidden_base_animal_14,
-        LocationName.hidden_base_animal_15,
-        LocationName.hidden_base_upgrade,
-    ]
     hidden_base_region = create_region(multiworld, player, active_locations, LocationName.hidden_base_region,
                                        hidden_base_region_locations)
 
-    eternal_engine_region_locations = [
-        LocationName.eternal_engine_1,
-        LocationName.eternal_engine_2,
-        LocationName.eternal_engine_3,
-        LocationName.eternal_engine_4,
-        LocationName.eternal_engine_5,
-        LocationName.eternal_engine_chao_1,
-        LocationName.eternal_engine_chao_2,
-        LocationName.eternal_engine_chao_3,
-        LocationName.eternal_engine_pipe_1,
-        LocationName.eternal_engine_pipe_2,
-        LocationName.eternal_engine_pipe_3,
-        LocationName.eternal_engine_pipe_4,
-        LocationName.eternal_engine_pipe_5,
-        LocationName.eternal_engine_omo_1,
-        LocationName.eternal_engine_omo_2,
-        LocationName.eternal_engine_omo_3,
-        LocationName.eternal_engine_omo_4,
-        LocationName.eternal_engine_omo_5,
-        LocationName.eternal_engine_omo_6,
-        LocationName.eternal_engine_omo_7,
-        LocationName.eternal_engine_omo_8,
-        LocationName.eternal_engine_omo_9,
-        LocationName.eternal_engine_omo_10,
-        LocationName.eternal_engine_omo_11,
-        LocationName.eternal_engine_omo_12,
-        LocationName.eternal_engine_beetle,
-        LocationName.eternal_engine_animal_1,
-        LocationName.eternal_engine_animal_2,
-        LocationName.eternal_engine_animal_3,
-        LocationName.eternal_engine_animal_4,
-        LocationName.eternal_engine_animal_5,
-        LocationName.eternal_engine_animal_6,
-        LocationName.eternal_engine_animal_7,
-        LocationName.eternal_engine_animal_8,
-        LocationName.eternal_engine_animal_9,
-        LocationName.eternal_engine_animal_10,
-        LocationName.eternal_engine_animal_11,
-        LocationName.eternal_engine_animal_12,
-        LocationName.eternal_engine_animal_13,
-        LocationName.eternal_engine_animal_14,
-        LocationName.eternal_engine_animal_15,
-        LocationName.eternal_engine_upgrade,
-    ]
     eternal_engine_region = create_region(multiworld, player, active_locations, LocationName.eternal_engine_region,
                                           eternal_engine_region_locations)
 
-    wild_canyon_region_locations = [
-        LocationName.wild_canyon_1,
-        LocationName.wild_canyon_2,
-        LocationName.wild_canyon_3,
-        LocationName.wild_canyon_4,
-        LocationName.wild_canyon_5,
-        LocationName.wild_canyon_chao_1,
-        LocationName.wild_canyon_chao_2,
-        LocationName.wild_canyon_chao_3,
-        LocationName.wild_canyon_pipe_1,
-        LocationName.wild_canyon_pipe_2,
-        LocationName.wild_canyon_pipe_3,
-        LocationName.wild_canyon_omo_1,
-        LocationName.wild_canyon_omo_2,
-        LocationName.wild_canyon_omo_3,
-        LocationName.wild_canyon_omo_4,
-        LocationName.wild_canyon_omo_5,
-        LocationName.wild_canyon_omo_6,
-        LocationName.wild_canyon_omo_7,
-        LocationName.wild_canyon_omo_8,
-        LocationName.wild_canyon_omo_9,
-        LocationName.wild_canyon_omo_10,
-        LocationName.wild_canyon_beetle,
-        LocationName.wild_canyon_animal_1,
-        LocationName.wild_canyon_animal_2,
-        LocationName.wild_canyon_animal_3,
-        LocationName.wild_canyon_animal_4,
-        LocationName.wild_canyon_animal_5,
-        LocationName.wild_canyon_animal_6,
-        LocationName.wild_canyon_animal_7,
-        LocationName.wild_canyon_animal_8,
-        LocationName.wild_canyon_animal_9,
-        LocationName.wild_canyon_animal_10,
-        LocationName.wild_canyon_upgrade,
-    ]
     wild_canyon_region = create_region(multiworld, player, active_locations, LocationName.wild_canyon_region,
                                        wild_canyon_region_locations)
 
-    pumpkin_hill_region_locations = [
-        LocationName.pumpkin_hill_1,
-        LocationName.pumpkin_hill_2,
-        LocationName.pumpkin_hill_3,
-        LocationName.pumpkin_hill_4,
-        LocationName.pumpkin_hill_5,
-        LocationName.pumpkin_hill_chao_1,
-        LocationName.pumpkin_hill_chao_2,
-        LocationName.pumpkin_hill_chao_3,
-        LocationName.pumpkin_hill_pipe_1,
-        LocationName.pumpkin_hill_hidden_1,
-        LocationName.pumpkin_hill_omo_1,
-        LocationName.pumpkin_hill_omo_2,
-        LocationName.pumpkin_hill_omo_3,
-        LocationName.pumpkin_hill_omo_4,
-        LocationName.pumpkin_hill_omo_5,
-        LocationName.pumpkin_hill_omo_6,
-        LocationName.pumpkin_hill_omo_7,
-        LocationName.pumpkin_hill_omo_8,
-        LocationName.pumpkin_hill_omo_9,
-        LocationName.pumpkin_hill_omo_10,
-        LocationName.pumpkin_hill_omo_11,
-        LocationName.pumpkin_hill_animal_1,
-        LocationName.pumpkin_hill_animal_2,
-        LocationName.pumpkin_hill_animal_3,
-        LocationName.pumpkin_hill_animal_4,
-        LocationName.pumpkin_hill_animal_5,
-        LocationName.pumpkin_hill_animal_6,
-        LocationName.pumpkin_hill_animal_7,
-        LocationName.pumpkin_hill_animal_8,
-        LocationName.pumpkin_hill_animal_9,
-        LocationName.pumpkin_hill_animal_10,
-        LocationName.pumpkin_hill_animal_11,
-        LocationName.pumpkin_hill_upgrade,
-    ]
     pumpkin_hill_region = create_region(multiworld, player, active_locations, LocationName.pumpkin_hill_region,
                                         pumpkin_hill_region_locations)
 
-    aquatic_mine_region_locations = [
-        LocationName.aquatic_mine_1,
-        LocationName.aquatic_mine_2,
-        LocationName.aquatic_mine_3,
-        LocationName.aquatic_mine_4,
-        LocationName.aquatic_mine_5,
-        LocationName.aquatic_mine_chao_1,
-        LocationName.aquatic_mine_chao_2,
-        LocationName.aquatic_mine_chao_3,
-        LocationName.aquatic_mine_pipe_1,
-        LocationName.aquatic_mine_pipe_2,
-        LocationName.aquatic_mine_pipe_3,
-        LocationName.aquatic_mine_omo_1,
-        LocationName.aquatic_mine_omo_2,
-        LocationName.aquatic_mine_omo_3,
-        LocationName.aquatic_mine_omo_4,
-        LocationName.aquatic_mine_omo_5,
-        LocationName.aquatic_mine_omo_6,
-        LocationName.aquatic_mine_omo_7,
-        LocationName.aquatic_mine_beetle,
-        LocationName.aquatic_mine_animal_1,
-        LocationName.aquatic_mine_animal_2,
-        LocationName.aquatic_mine_animal_3,
-        LocationName.aquatic_mine_animal_4,
-        LocationName.aquatic_mine_animal_5,
-        LocationName.aquatic_mine_animal_6,
-        LocationName.aquatic_mine_animal_7,
-        LocationName.aquatic_mine_animal_8,
-        LocationName.aquatic_mine_animal_9,
-        LocationName.aquatic_mine_animal_10,
-        LocationName.aquatic_mine_upgrade,
-    ]
     aquatic_mine_region = create_region(multiworld, player, active_locations, LocationName.aquatic_mine_region,
                                         aquatic_mine_region_locations)
 
-    death_chamber_region_locations = [
-        LocationName.death_chamber_1,
-        LocationName.death_chamber_2,
-        LocationName.death_chamber_3,
-        LocationName.death_chamber_4,
-        LocationName.death_chamber_5,
-        LocationName.death_chamber_chao_1,
-        LocationName.death_chamber_chao_2,
-        LocationName.death_chamber_chao_3,
-        LocationName.death_chamber_pipe_1,
-        LocationName.death_chamber_pipe_2,
-        LocationName.death_chamber_pipe_3,
-        LocationName.death_chamber_hidden_1,
-        LocationName.death_chamber_hidden_2,
-        LocationName.death_chamber_omo_1,
-        LocationName.death_chamber_omo_2,
-        LocationName.death_chamber_omo_3,
-        LocationName.death_chamber_omo_4,
-        LocationName.death_chamber_omo_5,
-        LocationName.death_chamber_omo_6,
-        LocationName.death_chamber_omo_7,
-        LocationName.death_chamber_omo_8,
-        LocationName.death_chamber_omo_9,
-        LocationName.death_chamber_beetle,
-        LocationName.death_chamber_animal_1,
-        LocationName.death_chamber_animal_2,
-        LocationName.death_chamber_animal_3,
-        LocationName.death_chamber_animal_4,
-        LocationName.death_chamber_animal_5,
-        LocationName.death_chamber_animal_6,
-        LocationName.death_chamber_animal_7,
-        LocationName.death_chamber_animal_8,
-        LocationName.death_chamber_animal_9,
-        LocationName.death_chamber_animal_10,
-        LocationName.death_chamber_upgrade,
-    ]
     death_chamber_region = create_region(multiworld, player, active_locations, LocationName.death_chamber_region,
                                          death_chamber_region_locations)
 
-    meteor_herd_region_locations = [
-        LocationName.meteor_herd_1,
-        LocationName.meteor_herd_2,
-        LocationName.meteor_herd_3,
-        LocationName.meteor_herd_4,
-        LocationName.meteor_herd_5,
-        LocationName.meteor_herd_chao_1,
-        LocationName.meteor_herd_chao_2,
-        LocationName.meteor_herd_chao_3,
-        LocationName.meteor_herd_pipe_1,
-        LocationName.meteor_herd_pipe_2,
-        LocationName.meteor_herd_pipe_3,
-        LocationName.meteor_herd_omo_1,
-        LocationName.meteor_herd_omo_2,
-        LocationName.meteor_herd_omo_3,
-        LocationName.meteor_herd_beetle,
-        LocationName.meteor_herd_animal_1,
-        LocationName.meteor_herd_animal_2,
-        LocationName.meteor_herd_animal_3,
-        LocationName.meteor_herd_animal_4,
-        LocationName.meteor_herd_animal_5,
-        LocationName.meteor_herd_animal_6,
-        LocationName.meteor_herd_animal_7,
-        LocationName.meteor_herd_animal_8,
-        LocationName.meteor_herd_animal_9,
-        LocationName.meteor_herd_animal_10,
-        LocationName.meteor_herd_animal_11,
-        LocationName.meteor_herd_upgrade,
-    ]
     meteor_herd_region = create_region(multiworld, player, active_locations, LocationName.meteor_herd_region,
                                        meteor_herd_region_locations)
 
-    radical_highway_region_locations = [
-        LocationName.radical_highway_1,
-        LocationName.radical_highway_2,
-        LocationName.radical_highway_3,
-        LocationName.radical_highway_4,
-        LocationName.radical_highway_5,
-        LocationName.radical_highway_chao_1,
-        LocationName.radical_highway_chao_2,
-        LocationName.radical_highway_chao_3,
-        LocationName.radical_highway_pipe_1,
-        LocationName.radical_highway_pipe_2,
-        LocationName.radical_highway_pipe_3,
-        LocationName.radical_highway_hidden_1,
-        LocationName.radical_highway_hidden_2,
-        LocationName.radical_highway_hidden_3,
-        LocationName.radical_highway_omo_1,
-        LocationName.radical_highway_omo_2,
-        LocationName.radical_highway_omo_3,
-        LocationName.radical_highway_omo_4,
-        LocationName.radical_highway_omo_5,
-        LocationName.radical_highway_omo_6,
-        LocationName.radical_highway_omo_7,
-        LocationName.radical_highway_omo_8,
-        LocationName.radical_highway_beetle,
-        LocationName.radical_highway_animal_1,
-        LocationName.radical_highway_animal_2,
-        LocationName.radical_highway_animal_3,
-        LocationName.radical_highway_animal_4,
-        LocationName.radical_highway_animal_5,
-        LocationName.radical_highway_animal_6,
-        LocationName.radical_highway_animal_7,
-        LocationName.radical_highway_animal_8,
-        LocationName.radical_highway_animal_9,
-        LocationName.radical_highway_animal_10,
-        LocationName.radical_highway_animal_11,
-        LocationName.radical_highway_animal_12,
-        LocationName.radical_highway_animal_13,
-        LocationName.radical_highway_animal_14,
-        LocationName.radical_highway_animal_15,
-        LocationName.radical_highway_animal_16,
-        LocationName.radical_highway_animal_17,
-        LocationName.radical_highway_animal_18,
-        LocationName.radical_highway_animal_19,
-        LocationName.radical_highway_animal_20,
-        LocationName.radical_highway_upgrade,
-    ]
     radical_highway_region = create_region(multiworld, player, active_locations, LocationName.radical_highway_region,
                                            radical_highway_region_locations)
 
-    white_jungle_region_locations = [
-        LocationName.white_jungle_1,
-        LocationName.white_jungle_2,
-        LocationName.white_jungle_3,
-        LocationName.white_jungle_4,
-        LocationName.white_jungle_5,
-        LocationName.white_jungle_chao_1,
-        LocationName.white_jungle_chao_2,
-        LocationName.white_jungle_chao_3,
-        LocationName.white_jungle_pipe_1,
-        LocationName.white_jungle_pipe_2,
-        LocationName.white_jungle_pipe_3,
-        LocationName.white_jungle_pipe_4,
-        LocationName.white_jungle_hidden_1,
-        LocationName.white_jungle_hidden_2,
-        LocationName.white_jungle_hidden_3,
-        LocationName.white_jungle_omo_1,
-        LocationName.white_jungle_omo_2,
-        LocationName.white_jungle_omo_3,
-        LocationName.white_jungle_omo_4,
-        LocationName.white_jungle_omo_5,
-        LocationName.white_jungle_beetle,
-        LocationName.white_jungle_animal_1,
-        LocationName.white_jungle_animal_2,
-        LocationName.white_jungle_animal_3,
-        LocationName.white_jungle_animal_4,
-        LocationName.white_jungle_animal_5,
-        LocationName.white_jungle_animal_6,
-        LocationName.white_jungle_animal_7,
-        LocationName.white_jungle_animal_8,
-        LocationName.white_jungle_animal_9,
-        LocationName.white_jungle_animal_10,
-        LocationName.white_jungle_animal_11,
-        LocationName.white_jungle_animal_12,
-        LocationName.white_jungle_animal_13,
-        LocationName.white_jungle_animal_14,
-        LocationName.white_jungle_animal_15,
-        LocationName.white_jungle_animal_16,
-        LocationName.white_jungle_upgrade,
-    ]
     white_jungle_region = create_region(multiworld, player, active_locations, LocationName.white_jungle_region,
                                         white_jungle_region_locations)
 
-    sky_rail_region_locations = [
-        LocationName.sky_rail_1,
-        LocationName.sky_rail_2,
-        LocationName.sky_rail_3,
-        LocationName.sky_rail_4,
-        LocationName.sky_rail_5,
-        LocationName.sky_rail_chao_1,
-        LocationName.sky_rail_chao_2,
-        LocationName.sky_rail_chao_3,
-        LocationName.sky_rail_pipe_1,
-        LocationName.sky_rail_pipe_2,
-        LocationName.sky_rail_pipe_3,
-        LocationName.sky_rail_pipe_4,
-        LocationName.sky_rail_pipe_5,
-        LocationName.sky_rail_pipe_6,
-        LocationName.sky_rail_beetle,
-        LocationName.sky_rail_animal_1,
-        LocationName.sky_rail_animal_2,
-        LocationName.sky_rail_animal_3,
-        LocationName.sky_rail_animal_4,
-        LocationName.sky_rail_animal_5,
-        LocationName.sky_rail_animal_6,
-        LocationName.sky_rail_animal_7,
-        LocationName.sky_rail_animal_8,
-        LocationName.sky_rail_animal_9,
-        LocationName.sky_rail_animal_10,
-        LocationName.sky_rail_animal_11,
-        LocationName.sky_rail_animal_12,
-        LocationName.sky_rail_animal_13,
-        LocationName.sky_rail_animal_14,
-        LocationName.sky_rail_animal_15,
-        LocationName.sky_rail_animal_16,
-        LocationName.sky_rail_animal_17,
-        LocationName.sky_rail_animal_18,
-        LocationName.sky_rail_animal_19,
-        LocationName.sky_rail_animal_20,
-        LocationName.sky_rail_upgrade,
-    ]
     sky_rail_region = create_region(multiworld, player, active_locations, LocationName.sky_rail_region,
                                     sky_rail_region_locations)
 
-    final_chase_region_locations = [
-        LocationName.final_chase_1,
-        LocationName.final_chase_2,
-        LocationName.final_chase_3,
-        LocationName.final_chase_4,
-        LocationName.final_chase_5,
-        LocationName.final_chase_chao_1,
-        LocationName.final_chase_chao_2,
-        LocationName.final_chase_chao_3,
-        LocationName.final_chase_pipe_1,
-        LocationName.final_chase_pipe_2,
-        LocationName.final_chase_pipe_3,
-        LocationName.final_chase_omo_1,
-        LocationName.final_chase_beetle,
-        LocationName.final_chase_animal_1,
-        LocationName.final_chase_animal_2,
-        LocationName.final_chase_animal_3,
-        LocationName.final_chase_animal_4,
-        LocationName.final_chase_animal_5,
-        LocationName.final_chase_animal_6,
-        LocationName.final_chase_animal_7,
-        LocationName.final_chase_animal_8,
-        LocationName.final_chase_animal_9,
-        LocationName.final_chase_animal_10,
-        LocationName.final_chase_animal_11,
-        LocationName.final_chase_animal_12,
-        LocationName.final_chase_animal_13,
-        LocationName.final_chase_animal_14,
-        LocationName.final_chase_animal_15,
-        LocationName.final_chase_animal_16,
-        LocationName.final_chase_animal_17,
-        LocationName.final_chase_upgrade,
-    ]
     final_chase_region = create_region(multiworld, player, active_locations, LocationName.final_chase_region,
                                        final_chase_region_locations)
 
-    iron_gate_region_locations = [
-        LocationName.iron_gate_1,
-        LocationName.iron_gate_2,
-        LocationName.iron_gate_3,
-        LocationName.iron_gate_4,
-        LocationName.iron_gate_5,
-        LocationName.iron_gate_chao_1,
-        LocationName.iron_gate_chao_2,
-        LocationName.iron_gate_chao_3,
-        LocationName.iron_gate_pipe_1,
-        LocationName.iron_gate_pipe_2,
-        LocationName.iron_gate_pipe_3,
-        LocationName.iron_gate_pipe_4,
-        LocationName.iron_gate_pipe_5,
-        LocationName.iron_gate_omo_1,
-        LocationName.iron_gate_omo_2,
-        LocationName.iron_gate_omo_3,
-        LocationName.iron_gate_omo_4,
-        LocationName.iron_gate_omo_5,
-        LocationName.iron_gate_omo_6,
-        LocationName.iron_gate_beetle,
-        LocationName.iron_gate_animal_1,
-        LocationName.iron_gate_animal_2,
-        LocationName.iron_gate_animal_3,
-        LocationName.iron_gate_animal_4,
-        LocationName.iron_gate_animal_5,
-        LocationName.iron_gate_animal_6,
-        LocationName.iron_gate_animal_7,
-        LocationName.iron_gate_animal_8,
-        LocationName.iron_gate_animal_9,
-        LocationName.iron_gate_animal_10,
-        LocationName.iron_gate_animal_11,
-        LocationName.iron_gate_animal_12,
-        LocationName.iron_gate_animal_13,
-        LocationName.iron_gate_animal_14,
-        LocationName.iron_gate_animal_15,
-        LocationName.iron_gate_upgrade,
-    ]
     iron_gate_region = create_region(multiworld, player, active_locations, LocationName.iron_gate_region,
                                      iron_gate_region_locations)
 
-    sand_ocean_region_locations = [
-        LocationName.sand_ocean_1,
-        LocationName.sand_ocean_2,
-        LocationName.sand_ocean_3,
-        LocationName.sand_ocean_4,
-        LocationName.sand_ocean_5,
-        LocationName.sand_ocean_chao_1,
-        LocationName.sand_ocean_chao_2,
-        LocationName.sand_ocean_chao_3,
-        LocationName.sand_ocean_pipe_1,
-        LocationName.sand_ocean_pipe_2,
-        LocationName.sand_ocean_pipe_3,
-        LocationName.sand_ocean_pipe_4,
-        LocationName.sand_ocean_pipe_5,
-        LocationName.sand_ocean_omo_1,
-        LocationName.sand_ocean_omo_2,
-        LocationName.sand_ocean_beetle,
-        LocationName.sand_ocean_animal_1,
-        LocationName.sand_ocean_animal_2,
-        LocationName.sand_ocean_animal_3,
-        LocationName.sand_ocean_animal_4,
-        LocationName.sand_ocean_animal_5,
-        LocationName.sand_ocean_animal_6,
-        LocationName.sand_ocean_animal_7,
-        LocationName.sand_ocean_animal_8,
-        LocationName.sand_ocean_animal_9,
-        LocationName.sand_ocean_animal_10,
-        LocationName.sand_ocean_animal_11,
-        LocationName.sand_ocean_animal_12,
-        LocationName.sand_ocean_animal_13,
-        LocationName.sand_ocean_animal_14,
-        LocationName.sand_ocean_animal_15,
-        LocationName.sand_ocean_upgrade,
-    ]
     sand_ocean_region = create_region(multiworld, player, active_locations, LocationName.sand_ocean_region,
                                       sand_ocean_region_locations)
 
-    lost_colony_region_locations = [
-        LocationName.lost_colony_1,
-        LocationName.lost_colony_2,
-        LocationName.lost_colony_3,
-        LocationName.lost_colony_4,
-        LocationName.lost_colony_5,
-        LocationName.lost_colony_chao_1,
-        LocationName.lost_colony_chao_2,
-        LocationName.lost_colony_chao_3,
-        LocationName.lost_colony_pipe_1,
-        LocationName.lost_colony_pipe_2,
-        LocationName.lost_colony_hidden_1,
-        LocationName.lost_colony_omo_1,
-        LocationName.lost_colony_omo_2,
-        LocationName.lost_colony_omo_3,
-        LocationName.lost_colony_omo_4,
-        LocationName.lost_colony_omo_5,
-        LocationName.lost_colony_omo_6,
-        LocationName.lost_colony_omo_7,
-        LocationName.lost_colony_omo_8,
-        LocationName.lost_colony_beetle,
-        LocationName.lost_colony_animal_1,
-        LocationName.lost_colony_animal_2,
-        LocationName.lost_colony_animal_3,
-        LocationName.lost_colony_animal_4,
-        LocationName.lost_colony_animal_5,
-        LocationName.lost_colony_animal_6,
-        LocationName.lost_colony_animal_7,
-        LocationName.lost_colony_animal_8,
-        LocationName.lost_colony_animal_9,
-        LocationName.lost_colony_animal_10,
-        LocationName.lost_colony_animal_11,
-        LocationName.lost_colony_animal_12,
-        LocationName.lost_colony_animal_13,
-        LocationName.lost_colony_animal_14,
-        LocationName.lost_colony_upgrade,
-    ]
     lost_colony_region = create_region(multiworld, player, active_locations, LocationName.lost_colony_region,
                                        lost_colony_region_locations)
 
-    weapons_bed_region_locations = [
-        LocationName.weapons_bed_1,
-        LocationName.weapons_bed_2,
-        LocationName.weapons_bed_3,
-        LocationName.weapons_bed_4,
-        LocationName.weapons_bed_5,
-        LocationName.weapons_bed_chao_1,
-        LocationName.weapons_bed_chao_2,
-        LocationName.weapons_bed_chao_3,
-        LocationName.weapons_bed_pipe_1,
-        LocationName.weapons_bed_pipe_2,
-        LocationName.weapons_bed_pipe_3,
-        LocationName.weapons_bed_pipe_4,
-        LocationName.weapons_bed_pipe_5,
-        LocationName.weapons_bed_omo_1,
-        LocationName.weapons_bed_omo_2,
-        LocationName.weapons_bed_omo_3,
-        LocationName.weapons_bed_animal_1,
-        LocationName.weapons_bed_animal_2,
-        LocationName.weapons_bed_animal_3,
-        LocationName.weapons_bed_animal_4,
-        LocationName.weapons_bed_animal_5,
-        LocationName.weapons_bed_animal_6,
-        LocationName.weapons_bed_animal_7,
-        LocationName.weapons_bed_animal_8,
-        LocationName.weapons_bed_animal_9,
-        LocationName.weapons_bed_animal_10,
-        LocationName.weapons_bed_animal_11,
-        LocationName.weapons_bed_animal_12,
-        LocationName.weapons_bed_animal_13,
-        LocationName.weapons_bed_animal_14,
-        LocationName.weapons_bed_animal_15,
-        LocationName.weapons_bed_upgrade,
-    ]
     weapons_bed_region = create_region(multiworld, player, active_locations, LocationName.weapons_bed_region,
                                        weapons_bed_region_locations)
 
-    cosmic_wall_region_locations = [
-        LocationName.cosmic_wall_1,
-        LocationName.cosmic_wall_2,
-        LocationName.cosmic_wall_3,
-        LocationName.cosmic_wall_4,
-        LocationName.cosmic_wall_5,
-        LocationName.cosmic_wall_chao_1,
-        LocationName.cosmic_wall_chao_2,
-        LocationName.cosmic_wall_chao_3,
-        LocationName.cosmic_wall_pipe_1,
-        LocationName.cosmic_wall_pipe_2,
-        LocationName.cosmic_wall_pipe_3,
-        LocationName.cosmic_wall_pipe_4,
-        LocationName.cosmic_wall_pipe_5,
-        LocationName.cosmic_wall_omo_1,
-        LocationName.cosmic_wall_beetle,
-        LocationName.cosmic_wall_animal_1,
-        LocationName.cosmic_wall_animal_2,
-        LocationName.cosmic_wall_animal_3,
-        LocationName.cosmic_wall_animal_4,
-        LocationName.cosmic_wall_animal_5,
-        LocationName.cosmic_wall_animal_6,
-        LocationName.cosmic_wall_animal_7,
-        LocationName.cosmic_wall_animal_8,
-        LocationName.cosmic_wall_animal_9,
-        LocationName.cosmic_wall_animal_10,
-        LocationName.cosmic_wall_animal_11,
-        LocationName.cosmic_wall_animal_12,
-        LocationName.cosmic_wall_animal_13,
-        LocationName.cosmic_wall_animal_14,
-        LocationName.cosmic_wall_animal_15,
-        LocationName.cosmic_wall_upgrade,
-    ]
     cosmic_wall_region = create_region(multiworld, player, active_locations, LocationName.cosmic_wall_region,
                                        cosmic_wall_region_locations)
 
-    dry_lagoon_region_locations = [
-        LocationName.dry_lagoon_1,
-        LocationName.dry_lagoon_2,
-        LocationName.dry_lagoon_3,
-        LocationName.dry_lagoon_4,
-        LocationName.dry_lagoon_5,
-        LocationName.dry_lagoon_chao_1,
-        LocationName.dry_lagoon_chao_2,
-        LocationName.dry_lagoon_chao_3,
-        LocationName.dry_lagoon_pipe_1,
-        LocationName.dry_lagoon_hidden_1,
-        LocationName.dry_lagoon_omo_1,
-        LocationName.dry_lagoon_omo_2,
-        LocationName.dry_lagoon_omo_3,
-        LocationName.dry_lagoon_omo_4,
-        LocationName.dry_lagoon_omo_5,
-        LocationName.dry_lagoon_omo_6,
-        LocationName.dry_lagoon_omo_7,
-        LocationName.dry_lagoon_omo_8,
-        LocationName.dry_lagoon_omo_9,
-        LocationName.dry_lagoon_omo_10,
-        LocationName.dry_lagoon_omo_11,
-        LocationName.dry_lagoon_omo_12,
-        LocationName.dry_lagoon_beetle,
-        LocationName.dry_lagoon_animal_1,
-        LocationName.dry_lagoon_animal_2,
-        LocationName.dry_lagoon_animal_3,
-        LocationName.dry_lagoon_animal_4,
-        LocationName.dry_lagoon_animal_5,
-        LocationName.dry_lagoon_animal_6,
-        LocationName.dry_lagoon_animal_7,
-        LocationName.dry_lagoon_animal_8,
-        LocationName.dry_lagoon_animal_9,
-        LocationName.dry_lagoon_animal_10,
-        LocationName.dry_lagoon_animal_11,
-        LocationName.dry_lagoon_upgrade,
-    ]
     dry_lagoon_region = create_region(multiworld, player, active_locations, LocationName.dry_lagoon_region,
                                       dry_lagoon_region_locations)
 
-    egg_quarters_region_locations = [
-        LocationName.egg_quarters_1,
-        LocationName.egg_quarters_2,
-        LocationName.egg_quarters_3,
-        LocationName.egg_quarters_4,
-        LocationName.egg_quarters_5,
-        LocationName.egg_quarters_chao_1,
-        LocationName.egg_quarters_chao_2,
-        LocationName.egg_quarters_chao_3,
-        LocationName.egg_quarters_pipe_1,
-        LocationName.egg_quarters_pipe_2,
-        LocationName.egg_quarters_hidden_1,
-        LocationName.egg_quarters_hidden_2,
-        LocationName.egg_quarters_omo_1,
-        LocationName.egg_quarters_omo_2,
-        LocationName.egg_quarters_omo_3,
-        LocationName.egg_quarters_omo_4,
-        LocationName.egg_quarters_omo_5,
-        LocationName.egg_quarters_omo_6,
-        LocationName.egg_quarters_omo_7,
-        LocationName.egg_quarters_beetle,
-        LocationName.egg_quarters_animal_1,
-        LocationName.egg_quarters_animal_2,
-        LocationName.egg_quarters_animal_3,
-        LocationName.egg_quarters_animal_4,
-        LocationName.egg_quarters_animal_5,
-        LocationName.egg_quarters_animal_6,
-        LocationName.egg_quarters_animal_7,
-        LocationName.egg_quarters_animal_8,
-        LocationName.egg_quarters_animal_9,
-        LocationName.egg_quarters_animal_10,
-        LocationName.egg_quarters_upgrade,
-    ]
     egg_quarters_region = create_region(multiworld, player, active_locations, LocationName.egg_quarters_region,
                                         egg_quarters_region_locations)
 
-    security_hall_region_locations = [
-        LocationName.security_hall_1,
-        LocationName.security_hall_2,
-        LocationName.security_hall_3,
-        LocationName.security_hall_4,
-        LocationName.security_hall_5,
-        LocationName.security_hall_chao_1,
-        LocationName.security_hall_chao_2,
-        LocationName.security_hall_chao_3,
-        LocationName.security_hall_pipe_1,
-        LocationName.security_hall_hidden_1,
-        LocationName.security_hall_omo_1,
-        LocationName.security_hall_omo_2,
-        LocationName.security_hall_omo_3,
-        LocationName.security_hall_omo_4,
-        LocationName.security_hall_omo_5,
-        LocationName.security_hall_omo_6,
-        LocationName.security_hall_omo_7,
-        LocationName.security_hall_omo_8,
-        LocationName.security_hall_omo_9,
-        LocationName.security_hall_omo_10,
-        LocationName.security_hall_omo_11,
-        LocationName.security_hall_omo_12,
-        LocationName.security_hall_beetle,
-        LocationName.security_hall_animal_1,
-        LocationName.security_hall_animal_2,
-        LocationName.security_hall_animal_3,
-        LocationName.security_hall_animal_4,
-        LocationName.security_hall_animal_5,
-        LocationName.security_hall_animal_6,
-        LocationName.security_hall_animal_7,
-        LocationName.security_hall_animal_8,
-        LocationName.security_hall_upgrade,
-    ]
     security_hall_region = create_region(multiworld, player, active_locations, LocationName.security_hall_region,
                                          security_hall_region_locations)
 
-    route_280_region_locations = [
-        LocationName.route_280_1,
-        LocationName.route_280_2,
-        LocationName.route_280_3,
-        LocationName.route_280_4,
-        LocationName.route_280_5,
-    ]
     route_280_region = create_region(multiworld, player, active_locations, LocationName.route_280_region,
                                      route_280_region_locations)
 
-    mad_space_region_locations = [
-        LocationName.mad_space_1,
-        LocationName.mad_space_2,
-        LocationName.mad_space_3,
-        LocationName.mad_space_4,
-        LocationName.mad_space_5,
-        LocationName.mad_space_chao_1,
-        LocationName.mad_space_chao_2,
-        LocationName.mad_space_chao_3,
-        LocationName.mad_space_pipe_1,
-        LocationName.mad_space_pipe_2,
-        LocationName.mad_space_pipe_3,
-        LocationName.mad_space_pipe_4,
-        LocationName.mad_space_omo_1,
-        LocationName.mad_space_omo_2,
-        LocationName.mad_space_omo_3,
-        LocationName.mad_space_omo_4,
-        LocationName.mad_space_omo_5,
-        LocationName.mad_space_beetle,
-        LocationName.mad_space_animal_1,
-        LocationName.mad_space_animal_2,
-        LocationName.mad_space_animal_3,
-        LocationName.mad_space_animal_4,
-        LocationName.mad_space_animal_5,
-        LocationName.mad_space_animal_6,
-        LocationName.mad_space_animal_7,
-        LocationName.mad_space_animal_8,
-        LocationName.mad_space_animal_9,
-        LocationName.mad_space_animal_10,
-        LocationName.mad_space_upgrade,
-    ]
     mad_space_region = create_region(multiworld, player, active_locations, LocationName.mad_space_region,
                                      mad_space_region_locations)
 
-    cannon_core_region_locations = [
-        LocationName.cannon_core_1,
-        LocationName.cannon_core_2,
-        LocationName.cannon_core_3,
-        LocationName.cannon_core_4,
-        LocationName.cannon_core_5,
-        LocationName.cannon_core_chao_1,
-        LocationName.cannon_core_chao_2,
-        LocationName.cannon_core_chao_3,
-        LocationName.cannon_core_pipe_1,
-        LocationName.cannon_core_pipe_2,
-        LocationName.cannon_core_pipe_3,
-        LocationName.cannon_core_pipe_4,
-        LocationName.cannon_core_pipe_5,
-        LocationName.cannon_core_hidden_1,
-        LocationName.cannon_core_omo_1,
-        LocationName.cannon_core_omo_2,
-        LocationName.cannon_core_omo_3,
-        LocationName.cannon_core_omo_4,
-        LocationName.cannon_core_omo_5,
-        LocationName.cannon_core_omo_6,
-        LocationName.cannon_core_omo_7,
-        LocationName.cannon_core_omo_8,
-        LocationName.cannon_core_omo_9,
-        LocationName.cannon_core_animal_1,
-        LocationName.cannon_core_animal_2,
-        LocationName.cannon_core_animal_3,
-        LocationName.cannon_core_animal_4,
-        LocationName.cannon_core_animal_5,
-        LocationName.cannon_core_animal_6,
-        LocationName.cannon_core_animal_7,
-        LocationName.cannon_core_animal_8,
-        LocationName.cannon_core_animal_9,
-        LocationName.cannon_core_animal_10,
-        LocationName.cannon_core_animal_11,
-        LocationName.cannon_core_animal_12,
-        LocationName.cannon_core_animal_13,
-        LocationName.cannon_core_animal_14,
-        LocationName.cannon_core_animal_15,
-        LocationName.cannon_core_animal_16,
-        LocationName.cannon_core_animal_17,
-        LocationName.cannon_core_animal_18,
-        LocationName.cannon_core_animal_19,
-        LocationName.cannon_core_beetle,
-    ]
     cannon_core_region = create_region(multiworld, player, active_locations, LocationName.cannon_core_region,
                                        cannon_core_region_locations)
 
@@ -1722,7 +618,7 @@ def create_regions(multiworld: MultiWorld, world: World, player: int, active_loc
         grand_prix_region = create_region(multiworld, player, active_locations, LocationName.grand_prix_region,
                                           grand_prix_region_locations)
         conditional_regions += [grand_prix_region]
-    elif world.options.goal in [0, 2, 4, 5, 6]:
+    elif world.options.goal in [0, 2, 4, 5, 6, 8]:
         biolizard_region_locations = [
             LocationName.finalhazard,
         ]
@@ -1742,6 +638,17 @@ def create_regions(multiworld: MultiWorld, world: World, player: int, active_loc
             LocationName.green_hill,
             LocationName.green_hill_chao_1,
             #LocationName.green_hill_animal_1,
+            LocationName.green_hill_itembox_1, 
+            LocationName.green_hill_itembox_2, 
+            LocationName.green_hill_itembox_3, 
+            LocationName.green_hill_itembox_4, 
+            LocationName.green_hill_itembox_5, 
+            LocationName.green_hill_itembox_6, 
+            LocationName.green_hill_itembox_7, 
+            LocationName.green_hill_itembox_8, 
+            LocationName.green_hill_itembox_9, 
+            LocationName.green_hill_itembox_10,
+            LocationName.green_hill_itembox_11,
         ]
         green_hill_region = create_region(multiworld, player, active_locations, LocationName.green_hill_region,
                                           green_hill_region_locations)
@@ -1866,6 +773,10 @@ def connect_regions(multiworld: MultiWorld, world: World, player: int, gates: ty
     elif world.options.goal == 7:
         connect(multiworld, player, names, LocationName.gate_0_region, LocationName.chaos_chao,
                 lambda state: (state.has_all(chao_animal_event_location_table.keys(), player)))
+    elif world.options.goal == 8:
+        trap_item_mapping = { minigame: world.options.minigame_madness_requirement.value for minigame in minigame_trap_table.keys() }
+        connect(multiworld, player, names, LocationName.gate_0_region, LocationName.biolizard_region,
+                lambda state: (state.has_all_counts(trap_item_mapping, player)))
 
     for i in range(len(gates[0].gate_levels)):
         connect(multiworld, player, names, LocationName.gate_0_region, shuffleable_regions[gates[0].gate_levels[i]])
@@ -2336,22 +1247,44 @@ def connect_regions(multiworld: MultiWorld, world: World, player: int, gates: ty
             connect(multiworld, player, names, LocationName.cannon_core_region, LocationName.animal_phoenix,
                     lambda state: (state.has(ItemName.tails_booster, player)))
 
-        if world.options.keysanity:
-            connect(multiworld, player, names, LocationName.wild_canyon_region, LocationName.animal_dragon,
-                    lambda state: (state.has(ItemName.knuckles_shovel_claws, player)))
+        elif world.options.logic_difficulty.value == 2:
+            connect(multiworld, player, names, LocationName.metal_harbor_region, LocationName.animal_phoenix)
 
+            connect(multiworld, player, names, LocationName.crazy_gadget_region, LocationName.animal_skunk)
+            connect(multiworld, player, names, LocationName.crazy_gadget_region, LocationName.animal_phoenix)
+
+            connect(multiworld, player, names, LocationName.weapons_bed_region, LocationName.animal_phoenix,
+                    lambda state: (state.has(ItemName.eggman_jet_engine, player)))
+
+            connect(multiworld, player, names, LocationName.mad_space_region, LocationName.animal_gorilla)
+            connect(multiworld, player, names, LocationName.mad_space_region, LocationName.animal_raccoon)
+            connect(multiworld, player, names, LocationName.mad_space_region, LocationName.animal_halffish)
+
+            connect(multiworld, player, names, LocationName.cannon_core_region, LocationName.animal_otter)
+            connect(multiworld, player, names, LocationName.cannon_core_region, LocationName.animal_rabbit)
+            connect(multiworld, player, names, LocationName.cannon_core_region, LocationName.animal_cheetah)
+            connect(multiworld, player, names, LocationName.cannon_core_region, LocationName.animal_warthog)
+            connect(multiworld, player, names, LocationName.cannon_core_region, LocationName.animal_parrot)
+            connect(multiworld, player, names, LocationName.cannon_core_region, LocationName.animal_condor)
+            connect(multiworld, player, names, LocationName.cannon_core_region, LocationName.animal_raccoon)
+            connect(multiworld, player, names, LocationName.cannon_core_region, LocationName.animal_phoenix)
+
+        if world.options.keysanity:
             connect(multiworld, player, names, LocationName.mission_street_region, LocationName.animal_phoenix,
                     lambda state: (state.has(ItemName.tails_booster, player) and
                                    state.has(ItemName.tails_bazooka, player)))
 
-            connect(multiworld, player, names, LocationName.pyramid_cave_region, LocationName.animal_skeleton_dog,
-                    lambda state: (state.has(ItemName.sonic_light_shoes, player) and
-                                   state.has(ItemName.sonic_flame_ring, player)))
-
             connect(multiworld, player, names, LocationName.lost_colony_region, LocationName.animal_raccoon,
                     lambda state: (state.has(ItemName.eggman_jet_engine, player)))
 
             if world.options.logic_difficulty.value == 0:
+                connect(multiworld, player, names, LocationName.wild_canyon_region, LocationName.animal_dragon,
+                        lambda state: (state.has(ItemName.knuckles_shovel_claws, player)))
+
+                connect(multiworld, player, names, LocationName.pyramid_cave_region, LocationName.animal_skeleton_dog,
+                        lambda state: (state.has(ItemName.sonic_bounce_bracelet, player) and
+                                       state.has(ItemName.sonic_flame_ring, player)))
+
                 connect(multiworld, player, names, LocationName.iron_gate_region, LocationName.animal_dragon,
                         lambda state: (state.has(ItemName.eggman_jet_engine, player) and
                                        state.has(ItemName.eggman_large_cannon, player)))
@@ -2360,6 +1293,23 @@ def connect_regions(multiworld: MultiWorld, world: World, player: int, gates: ty
                         lambda state: (state.has(ItemName.eggman_jet_engine, player) and
                                        state.has(ItemName.eggman_large_cannon, player)))
             if world.options.logic_difficulty.value == 1:
+                connect(multiworld, player, names, LocationName.wild_canyon_region, LocationName.animal_dragon,
+                        lambda state: (state.has(ItemName.knuckles_shovel_claws, player)))
+
+                connect(multiworld, player, names, LocationName.pyramid_cave_region, LocationName.animal_skeleton_dog,
+                        lambda state: (state.has(ItemName.sonic_flame_ring, player)))
+
+                connect(multiworld, player, names, LocationName.iron_gate_region, LocationName.animal_dragon,
+                        lambda state: (state.has(ItemName.eggman_jet_engine, player)))
+
+                connect(multiworld, player, names, LocationName.sand_ocean_region, LocationName.animal_skeleton_dog,
+                        lambda state: (state.has(ItemName.eggman_jet_engine, player)))
+            if world.options.logic_difficulty.value == 2:
+                connect(multiworld, player, names, LocationName.wild_canyon_region, LocationName.animal_dragon)
+
+                connect(multiworld, player, names, LocationName.pyramid_cave_region, LocationName.animal_skeleton_dog,
+                        lambda state: (state.has(ItemName.sonic_flame_ring, player)))
+
                 connect(multiworld, player, names, LocationName.iron_gate_region, LocationName.animal_dragon,
                         lambda state: (state.has(ItemName.eggman_jet_engine, player)))
 
@@ -2376,10 +1326,6 @@ def connect_regions(multiworld: MultiWorld, world: World, player: int, gates: ty
             connect(multiworld, player, names, LocationName.mission_street_region, LocationName.animal_phoenix,
                     lambda state: (state.has(ItemName.tails_booster, player)))
 
-            connect(multiworld, player, names, LocationName.death_chamber_region, LocationName.animal_skeleton_dog,
-                    lambda state: (state.has(ItemName.knuckles_shovel_claws, player) and
-                                   state.has(ItemName.knuckles_hammer_gloves, player)))
-
             connect(multiworld, player, names, LocationName.eternal_engine_region, LocationName.animal_halffish,
                     lambda state: (state.has(ItemName.tails_booster, player) and
                                    state.has(ItemName.tails_bazooka, player)))
@@ -2393,9 +1339,6 @@ def connect_regions(multiworld: MultiWorld, world: World, player: int, gates: ty
             connect(multiworld, player, names, LocationName.lost_colony_region, LocationName.animal_raccoon)
             connect(multiworld, player, names, LocationName.lost_colony_region, LocationName.animal_skeleton_dog)
 
-            connect(multiworld, player, names, LocationName.security_hall_region, LocationName.animal_phoenix,
-                    lambda state: (state.has(ItemName.rouge_pick_nails, player)))
-
             connect(multiworld, player, names, LocationName.sky_rail_region, LocationName.animal_phoenix)
 
             if world.options.logic_difficulty.value == 0:
@@ -2404,6 +1347,13 @@ def connect_regions(multiworld: MultiWorld, world: World, player: int, gates: ty
                                        state.has(ItemName.sonic_bounce_bracelet, player) and
                                        state.has(ItemName.sonic_mystic_melody, player)))
 
+                connect(multiworld, player, names, LocationName.death_chamber_region, LocationName.animal_skeleton_dog,
+                        lambda state: (state.has(ItemName.knuckles_shovel_claws, player) and
+                                       state.has(ItemName.knuckles_hammer_gloves, player)))
+
+                connect(multiworld, player, names, LocationName.security_hall_region, LocationName.animal_phoenix,
+                        lambda state: (state.has(ItemName.rouge_pick_nails, player)))
+
                 connect(multiworld, player, names, LocationName.white_jungle_region, LocationName.animal_dragon,
                         lambda state: (state.has(ItemName.shadow_air_shoes, player)))
 
@@ -2415,11 +1365,28 @@ def connect_regions(multiworld: MultiWorld, world: World, player: int, gates: ty
             elif world.options.logic_difficulty.value == 1:
                 connect(multiworld, player, names, LocationName.pyramid_cave_region, LocationName.animal_skeleton_dog)
 
+                connect(multiworld, player, names, LocationName.death_chamber_region, LocationName.animal_skeleton_dog,
+                        lambda state: (state.has(ItemName.knuckles_shovel_claws, player) and
+                                       state.has(ItemName.knuckles_hammer_gloves, player)))
+
+                connect(multiworld, player, names, LocationName.security_hall_region, LocationName.animal_phoenix,
+                        lambda state: (state.has(ItemName.rouge_pick_nails, player)))
+
                 connect(multiworld, player, names, LocationName.white_jungle_region, LocationName.animal_dragon)
 
                 connect(multiworld, player, names, LocationName.cannon_core_region, LocationName.animal_dragon,
                         lambda state: (state.has(ItemName.tails_booster, player) and
                                        state.has(ItemName.knuckles_hammer_gloves, player)))
+            elif world.options.logic_difficulty.value == 2:
+                connect(multiworld, player, names, LocationName.pyramid_cave_region, LocationName.animal_skeleton_dog)
+
+                connect(multiworld, player, names, LocationName.death_chamber_region, LocationName.animal_skeleton_dog)
+
+                connect(multiworld, player, names, LocationName.security_hall_region, LocationName.animal_phoenix)
+
+                connect(multiworld, player, names, LocationName.white_jungle_region, LocationName.animal_dragon)
+
+                connect(multiworld, player, names, LocationName.cannon_core_region, LocationName.animal_dragon)
 
     if world.options.black_market_slots.value > 0:
         connect(multiworld, player, names, LocationName.gate_0_region, LocationName.black_market_region)
@@ -2430,7 +1397,7 @@ def create_region(multiworld: MultiWorld, player: int, active_locations, name: s
     if locations:
         for location in locations:
             loc_id = active_locations.get(location, 0)
-            if loc_id:
+            if loc_id != 0:
                 location = SA2BLocation(player, location, loc_id, ret)
                 ret.locations.append(location)
 
diff --git a/worlds/sa2b/Rules.py b/worlds/sa2b/Rules.py
index afd0dcb182..583b84c55b 100644
--- a/worlds/sa2b/Rules.py
+++ b/worlds/sa2b/Rules.py
@@ -614,7 +614,9 @@ def set_mission_upgrade_rules_standard(multiworld: MultiWorld, world: World, pla
         add_rule(multiworld.get_location(LocationName.death_chamber_hidden_2, player),
                  lambda state: state.has(ItemName.knuckles_hammer_gloves, player))
         add_rule(multiworld.get_location(LocationName.crazy_gadget_hidden_1, player),
-                 lambda state: state.has(ItemName.sonic_light_shoes, player))
+                 lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
+        add_rule(multiworld.get_location(LocationName.lost_colony_hidden_1, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
         add_rule(multiworld.get_location(LocationName.white_jungle_hidden_3, player),
                  lambda state: state.has(ItemName.shadow_air_shoes, player))
         add_rule(multiworld.get_location(LocationName.cannon_core_hidden_1, player),
@@ -817,11 +819,9 @@ def set_mission_upgrade_rules_standard(multiworld: MultiWorld, world: World, pla
         add_rule(multiworld.get_location(LocationName.white_jungle_beetle, player),
                  lambda state: state.has(ItemName.shadow_air_shoes, player))
         add_rule(multiworld.get_location(LocationName.mad_space_beetle, player),
-                 lambda state: state.has(ItemName.rouge_mystic_melody, player) and
-                               state.has(ItemName.rouge_iron_boots, player))
+                 lambda state: state.has(ItemName.rouge_iron_boots, player))
         add_rule(multiworld.get_location(LocationName.cosmic_wall_beetle, player),
-                 lambda state: state.has(ItemName.eggman_mystic_melody, player) and
-                               state.has(ItemName.eggman_jet_engine, player))
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
 
         add_rule(multiworld.get_location(LocationName.cannon_core_beetle, player),
                  lambda state: state.has(ItemName.tails_booster, player) and
@@ -1316,6 +1316,7 @@ def set_mission_upgrade_rules_standard(multiworld: MultiWorld, world: World, pla
         add_rule(multiworld.get_location(LocationName.pyramid_cave_animal_19, player),
                  lambda state: state.has(ItemName.sonic_light_shoes, player) and
                                state.has(ItemName.sonic_bounce_bracelet, player) and
+                               state.has(ItemName.sonic_flame_ring, player) and
                                state.has(ItemName.sonic_mystic_melody, player))
 
         add_rule(multiworld.get_location(LocationName.cannon_core_animal_19, player),
@@ -1330,6 +1331,751 @@ def set_mission_upgrade_rules_standard(multiworld: MultiWorld, world: World, pla
         add_rule(multiworld.get_location(LocationName.radical_highway_animal_20, player),
                  lambda state: state.has(ItemName.shadow_flame_ring, player))
 
+    # Extra Life Box Upgrade Requirements
+    if world.options.itemboxsanity.value > 0:
+        add_rule(multiworld.get_location(LocationName.prison_lane_lifebox_1, player),
+                 lambda state: state.has(ItemName.tails_bazooka, player))
+        add_rule(multiworld.get_location(LocationName.pumpkin_hill_lifebox_1, player),
+                 lambda state: state.has(ItemName.knuckles_shovel_claws, player))
+        add_rule(multiworld.get_location(LocationName.mission_street_lifebox_1, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+        add_rule(multiworld.get_location(LocationName.aquatic_mine_lifebox_1, player),
+                 lambda state: state.has(ItemName.knuckles_mystic_melody, player))
+        add_rule(multiworld.get_location(LocationName.hidden_base_lifebox_1, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+        add_rule(multiworld.get_location(LocationName.death_chamber_lifebox_1, player),
+                 lambda state: (state.has(ItemName.knuckles_mystic_melody, player) and
+                                state.has(ItemName.knuckles_shovel_claws, player) and
+                                state.has(ItemName.knuckles_air_necklace, player) and
+                                state.has(ItemName.knuckles_hammer_gloves, player)))
+        add_rule(multiworld.get_location(LocationName.eternal_engine_lifebox_1, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+        add_rule(multiworld.get_location(LocationName.crazy_gadget_lifebox_1, player),
+                 lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
+
+        add_rule(multiworld.get_location(LocationName.iron_gate_lifebox_1, player),
+                 lambda state: (state.has(ItemName.eggman_mystic_melody, player) and
+                                state.has(ItemName.eggman_jet_engine, player) and
+                                state.has(ItemName.eggman_large_cannon, player)))
+        add_rule(multiworld.get_location(LocationName.dry_lagoon_lifebox_1, player),
+                 lambda state: (state.has(ItemName.rouge_mystic_melody, player) and
+                                state.has(ItemName.rouge_pick_nails, player) and
+                                state.has(ItemName.rouge_treasure_scope, player) and
+                                state.has(ItemName.rouge_iron_boots, player)))
+        add_rule(multiworld.get_location(LocationName.egg_quarters_lifebox_1, player),
+                 lambda state: state.has(ItemName.rouge_iron_boots, player))
+        add_rule(multiworld.get_location(LocationName.lost_colony_lifebox_1, player),
+                 lambda state: (state.has(ItemName.eggman_jet_engine, player) and
+                                state.has(ItemName.eggman_large_cannon, player)))
+        add_rule(multiworld.get_location(LocationName.weapons_bed_lifebox_1, player),
+                 lambda state: (state.has(ItemName.eggman_jet_engine, player) and
+                                state.has(ItemName.eggman_large_cannon, player)))
+        add_rule(multiworld.get_location(LocationName.security_hall_lifebox_1, player),
+                 lambda state: (state.has(ItemName.rouge_mystic_melody, player) and
+                                state.has(ItemName.rouge_treasure_scope, player) and
+                                state.has(ItemName.rouge_iron_boots, player)))
+        add_rule(multiworld.get_location(LocationName.mad_space_lifebox_1, player),
+                 lambda state: state.has(ItemName.rouge_treasure_scope, player))
+
+        add_rule(multiworld.get_location(LocationName.cannon_core_lifebox_1, player),
+                 lambda state: (state.has(ItemName.tails_booster, player) and
+                                state.has(ItemName.eggman_jet_engine, player)))
+
+        add_rule(multiworld.get_location(LocationName.prison_lane_lifebox_2, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+        add_rule(multiworld.get_location(LocationName.metal_harbor_lifebox_2, player),
+                 lambda state: state.has(ItemName.sonic_light_shoes, player))
+        add_rule(multiworld.get_location(LocationName.mission_street_lifebox_2, player),
+                 lambda state: (state.has(ItemName.tails_booster, player) and
+                                state.has(ItemName.tails_mystic_melody, player)))
+        add_rule(multiworld.get_location(LocationName.pyramid_cave_lifebox_2, player),
+                 lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
+        add_rule(multiworld.get_location(LocationName.eternal_engine_lifebox_2, player),
+                 lambda state: (state.has(ItemName.tails_booster, player) and
+                                state.has(ItemName.tails_bazooka, player)))
+        add_rule(multiworld.get_location(LocationName.crazy_gadget_lifebox_2, player),
+                 lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
+
+        add_rule(multiworld.get_location(LocationName.iron_gate_lifebox_2, player),
+                 lambda state: (state.has(ItemName.eggman_mystic_melody, player) and
+                                state.has(ItemName.eggman_jet_engine, player) and
+                                state.has(ItemName.eggman_large_cannon, player)))
+        add_rule(multiworld.get_location(LocationName.dry_lagoon_lifebox_2, player),
+                 lambda state: state.has(ItemName.rouge_treasure_scope, player))
+        add_rule(multiworld.get_location(LocationName.sand_ocean_lifebox_2, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+        add_rule(multiworld.get_location(LocationName.egg_quarters_lifebox_2, player),
+                 lambda state: (state.has(ItemName.rouge_mystic_melody, player) and
+                                state.has(ItemName.rouge_treasure_scope, player)))
+        add_rule(multiworld.get_location(LocationName.white_jungle_lifebox_2, player),
+                 lambda state: state.has(ItemName.shadow_flame_ring, player))
+
+        add_rule(multiworld.get_location(LocationName.metal_harbor_lifebox_3, player),
+                 lambda state: state.has(ItemName.sonic_light_shoes, player))
+        add_rule(multiworld.get_location(LocationName.pyramid_cave_lifebox_3, player),
+                 lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
+        add_rule(multiworld.get_location(LocationName.meteor_herd_lifebox_3, player),
+                 lambda state: (state.has(ItemName.knuckles_hammer_gloves, player) and
+                                state.has(ItemName.knuckles_sunglasses, player)))
+        add_rule(multiworld.get_location(LocationName.crazy_gadget_lifebox_3, player),
+                 lambda state: (state.has(ItemName.sonic_light_shoes, player) and
+                                state.has(ItemName.sonic_bounce_bracelet, player) and
+                                state.has(ItemName.sonic_flame_ring, player)))
+
+        add_rule(multiworld.get_location(LocationName.sand_ocean_lifebox_3, player),
+                 lambda state: (state.has(ItemName.eggman_jet_engine, player) and
+                                state.has(ItemName.eggman_large_cannon, player)))
+        add_rule(multiworld.get_location(LocationName.mad_space_lifebox_3, player),
+                 lambda state: state.has(ItemName.rouge_treasure_scope, player))
+
+        add_rule(multiworld.get_location(LocationName.pyramid_cave_lifebox_4, player),
+                 lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
+        add_rule(multiworld.get_location(LocationName.crazy_gadget_lifebox_4, player),
+                 lambda state: (state.has(ItemName.sonic_light_shoes, player) and
+                                state.has(ItemName.sonic_bounce_bracelet, player) and
+                                state.has(ItemName.sonic_flame_ring, player)))
+
+        add_rule(multiworld.get_location(LocationName.mad_space_lifebox_4, player),
+                 lambda state: state.has(ItemName.rouge_iron_boots, player))
+
+        add_rule(multiworld.get_location(LocationName.pyramid_cave_lifebox_5, player),
+                 lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
+
+        add_rule(multiworld.get_location(LocationName.pyramid_cave_lifebox_6, player),
+                 lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
+
+        add_rule(multiworld.get_location(LocationName.pyramid_cave_lifebox_7, player),
+                 lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
+
+        add_rule(multiworld.get_location(LocationName.final_rush_lifebox_8, player),
+                 lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
+
+        add_rule(multiworld.get_location(LocationName.final_rush_lifebox_9, player),
+                 lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
+
+        add_rule(multiworld.get_location(LocationName.final_rush_lifebox_10, player),
+                 lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
+
+        add_rule(multiworld.get_location(LocationName.final_rush_lifebox_11, player),
+                 lambda state: (state.has(ItemName.sonic_light_shoes, player) and
+                                state.has(ItemName.sonic_bounce_bracelet, player) and
+                                state.has(ItemName.sonic_flame_ring, player) and
+                                state.has(ItemName.sonic_mystic_melody, player)))
+
+        add_rule(multiworld.get_location(LocationName.final_rush_lifebox_12, player),
+                 lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
+
+        add_rule(multiworld.get_location(LocationName.final_rush_lifebox_13, player),
+                 lambda state: (state.has(ItemName.sonic_light_shoes, player) and
+                                state.has(ItemName.sonic_bounce_bracelet, player) and
+                                state.has(ItemName.sonic_mystic_melody, player)))
+
+    # Item Box Upgrade Requirements
+    if world.options.itemboxsanity.value == 2:
+        add_rule(multiworld.get_location(LocationName.prison_lane_itembox_1, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+        add_rule(multiworld.get_location(LocationName.metal_harbor_itembox_1, player),
+                 lambda state: state.has(ItemName.sonic_light_shoes, player))
+        add_rule(multiworld.get_location(LocationName.death_chamber_itembox_1, player),
+                 lambda state: state.has(ItemName.knuckles_hammer_gloves, player))
+        add_rule(multiworld.get_location(LocationName.eternal_engine_itembox_1, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+
+        add_rule(multiworld.get_location(LocationName.weapons_bed_itembox_1, player),
+                 lambda state: (state.has(ItemName.eggman_jet_engine, player) and
+                                state.has(ItemName.eggman_large_cannon, player)))
+        add_rule(multiworld.get_location(LocationName.security_hall_itembox_1, player),
+                 lambda state: state.has(ItemName.rouge_pick_nails, player))
+
+        add_rule(multiworld.get_location(LocationName.cannon_core_itembox_1, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+
+        add_rule(multiworld.get_location(LocationName.metal_harbor_itembox_2, player),
+                 lambda state: state.has(ItemName.sonic_light_shoes, player))
+        add_rule(multiworld.get_location(LocationName.hidden_base_itembox_2, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+        add_rule(multiworld.get_location(LocationName.death_chamber_itembox_2, player),
+                 lambda state: state.has(ItemName.knuckles_hammer_gloves, player))
+        add_rule(multiworld.get_location(LocationName.eternal_engine_itembox_2, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+        add_rule(multiworld.get_location(LocationName.crazy_gadget_itembox_2, player),
+                 lambda state: state.has(ItemName.sonic_flame_ring, player))
+
+        add_rule(multiworld.get_location(LocationName.sand_ocean_itembox_2, player),
+                 lambda state: state.has(ItemName.eggman_large_cannon, player))
+        add_rule(multiworld.get_location(LocationName.egg_quarters_itembox_2, player),
+                 lambda state: state.has(ItemName.rouge_iron_boots, player))
+        add_rule(multiworld.get_location(LocationName.lost_colony_itembox_2, player),
+                 lambda state: (state.has(ItemName.eggman_jet_engine, player) and
+                                state.has(ItemName.eggman_large_cannon, player)))
+        add_rule(multiworld.get_location(LocationName.weapons_bed_itembox_2, player),
+                 lambda state: (state.has(ItemName.eggman_jet_engine, player) and
+                                state.has(ItemName.eggman_large_cannon, player)))
+        add_rule(multiworld.get_location(LocationName.security_hall_itembox_2, player),
+                 lambda state: state.has(ItemName.rouge_pick_nails, player))
+        add_rule(multiworld.get_location(LocationName.mad_space_itembox_2, player),
+                 lambda state: state.has(ItemName.rouge_treasure_scope, player))
+
+        add_rule(multiworld.get_location(LocationName.cannon_core_itembox_2, player),
+                 lambda state: (state.has(ItemName.tails_booster, player) and
+                                state.has(ItemName.eggman_mystic_melody, player) and
+                                state.has(ItemName.eggman_jet_engine, player) and
+                                state.has(ItemName.eggman_large_cannon, player)))
+
+        add_rule(multiworld.get_location(LocationName.metal_harbor_itembox_3, player),
+                 lambda state: state.has(ItemName.sonic_light_shoes, player))
+        add_rule(multiworld.get_location(LocationName.mission_street_itembox_3, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+        add_rule(multiworld.get_location(LocationName.hidden_base_itembox_3, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+        add_rule(multiworld.get_location(LocationName.death_chamber_itembox_3, player),
+                 lambda state: (state.has(ItemName.knuckles_shovel_claws, player) and
+                                state.has(ItemName.knuckles_hammer_gloves, player)))
+        add_rule(multiworld.get_location(LocationName.eternal_engine_itembox_3, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+        add_rule(multiworld.get_location(LocationName.meteor_herd_itembox_3, player),
+                 lambda state: state.has(ItemName.knuckles_sunglasses, player))
+        add_rule(multiworld.get_location(LocationName.crazy_gadget_itembox_3, player),
+                 lambda state: state.has(ItemName.sonic_flame_ring, player))
+
+        add_rule(multiworld.get_location(LocationName.lost_colony_itembox_3, player),
+                 lambda state: (state.has(ItemName.eggman_jet_engine, player) and
+                                state.has(ItemName.eggman_large_cannon, player)))
+        add_rule(multiworld.get_location(LocationName.weapons_bed_itembox_3, player),
+                 lambda state: (state.has(ItemName.eggman_jet_engine, player) and
+                                state.has(ItemName.eggman_large_cannon, player)))
+        add_rule(multiworld.get_location(LocationName.security_hall_itembox_3, player),
+                 lambda state: state.has(ItemName.rouge_pick_nails, player))
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_itembox_3, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+
+        add_rule(multiworld.get_location(LocationName.cannon_core_itembox_3, player),
+                 lambda state: (state.has(ItemName.tails_booster, player) and
+                                state.has(ItemName.eggman_jet_engine, player)))
+
+        add_rule(multiworld.get_location(LocationName.metal_harbor_itembox_4, player),
+                 lambda state: state.has(ItemName.sonic_light_shoes, player))
+        add_rule(multiworld.get_location(LocationName.mission_street_itembox_4, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+        add_rule(multiworld.get_location(LocationName.hidden_base_itembox_4, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+        add_rule(multiworld.get_location(LocationName.death_chamber_itembox_4, player),
+                 lambda state: (state.has(ItemName.knuckles_shovel_claws, player) and
+                                state.has(ItemName.knuckles_hammer_gloves, player) and
+                                state.has(ItemName.knuckles_sunglasses, player)))
+        add_rule(multiworld.get_location(LocationName.eternal_engine_itembox_4, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+        add_rule(multiworld.get_location(LocationName.crazy_gadget_itembox_4, player),
+                 lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
+
+        add_rule(multiworld.get_location(LocationName.weapons_bed_itembox_4, player),
+                 lambda state: (state.has(ItemName.eggman_jet_engine, player) and
+                                state.has(ItemName.eggman_large_cannon, player)))
+        add_rule(multiworld.get_location(LocationName.security_hall_itembox_4, player),
+                 lambda state: state.has(ItemName.rouge_pick_nails, player))
+        add_rule(multiworld.get_location(LocationName.mad_space_itembox_4, player),
+                 lambda state: state.has(ItemName.rouge_iron_boots, player))
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_itembox_4, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+
+        add_rule(multiworld.get_location(LocationName.cannon_core_itembox_4, player),
+                 lambda state: (state.has(ItemName.tails_booster, player) and
+                                state.has(ItemName.eggman_mystic_melody, player) and
+                                state.has(ItemName.eggman_jet_engine, player) and
+                                state.has(ItemName.eggman_large_cannon, player) and
+                                state.has(ItemName.rouge_mystic_melody, player)))
+
+        add_rule(multiworld.get_location(LocationName.metal_harbor_itembox_5, player),
+                 lambda state: state.has(ItemName.sonic_light_shoes, player))
+        add_rule(multiworld.get_location(LocationName.green_forest_itembox_5, player),
+                 lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
+        add_rule(multiworld.get_location(LocationName.mission_street_itembox_5, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+        add_rule(multiworld.get_location(LocationName.hidden_base_itembox_5, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+        add_rule(multiworld.get_location(LocationName.pyramid_cave_itembox_5, player),
+                 lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
+        add_rule(multiworld.get_location(LocationName.death_chamber_itembox_5, player),
+                 lambda state: (state.has(ItemName.knuckles_shovel_claws, player) and
+                                state.has(ItemName.knuckles_hammer_gloves, player)))
+        add_rule(multiworld.get_location(LocationName.eternal_engine_itembox_5, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+        add_rule(multiworld.get_location(LocationName.crazy_gadget_itembox_5, player),
+                 lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
+
+        add_rule(multiworld.get_location(LocationName.weapons_bed_itembox_5, player),
+                 lambda state: (state.has(ItemName.eggman_jet_engine, player) and
+                                state.has(ItemName.eggman_large_cannon, player)))
+        add_rule(multiworld.get_location(LocationName.security_hall_itembox_5, player),
+                 lambda state: state.has(ItemName.rouge_pick_nails, player))
+        add_rule(multiworld.get_location(LocationName.mad_space_itembox_5, player),
+                 lambda state: state.has(ItemName.rouge_treasure_scope, player))
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_itembox_5, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+
+        add_rule(multiworld.get_location(LocationName.cannon_core_itembox_5, player),
+                 lambda state: (state.has(ItemName.tails_booster, player) and
+                                state.has(ItemName.eggman_jet_engine, player) and
+                                state.has(ItemName.rouge_iron_boots, player)))
+
+        add_rule(multiworld.get_location(LocationName.mission_street_itembox_6, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+        add_rule(multiworld.get_location(LocationName.pyramid_cave_itembox_6, player),
+                 lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
+        add_rule(multiworld.get_location(LocationName.death_chamber_itembox_6, player),
+                 lambda state: (state.has(ItemName.knuckles_shovel_claws, player) and
+                                state.has(ItemName.knuckles_air_necklace, player) and
+                                state.has(ItemName.knuckles_hammer_gloves, player)))
+        add_rule(multiworld.get_location(LocationName.eternal_engine_itembox_6, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+        add_rule(multiworld.get_location(LocationName.meteor_herd_itembox_6, player),
+                 lambda state: (state.has(ItemName.knuckles_hammer_gloves, player) and
+                                state.has(ItemName.knuckles_sunglasses, player)))
+        add_rule(multiworld.get_location(LocationName.crazy_gadget_itembox_6, player),
+                 lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
+
+        add_rule(multiworld.get_location(LocationName.egg_quarters_itembox_6, player),
+                 lambda state: state.has(ItemName.rouge_mystic_melody, player))
+        add_rule(multiworld.get_location(LocationName.weapons_bed_itembox_6, player),
+                 lambda state: (state.has(ItemName.eggman_jet_engine, player) and
+                                state.has(ItemName.eggman_large_cannon, player)))
+        add_rule(multiworld.get_location(LocationName.security_hall_itembox_6, player),
+                 lambda state: state.has(ItemName.rouge_pick_nails, player))
+        add_rule(multiworld.get_location(LocationName.white_jungle_itembox_6, player),
+                 lambda state: state.has(ItemName.shadow_air_shoes, player))
+        add_rule(multiworld.get_location(LocationName.mad_space_itembox_6, player),
+                 lambda state: state.has(ItemName.rouge_treasure_scope, player))
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_itembox_6, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+
+        add_rule(multiworld.get_location(LocationName.cannon_core_itembox_6, player),
+                 lambda state: (state.has(ItemName.tails_booster, player) and
+                                state.has(ItemName.eggman_mystic_melody, player) and
+                                state.has(ItemName.eggman_jet_engine, player) and
+                                state.has(ItemName.eggman_large_cannon, player) and
+                                state.has(ItemName.rouge_mystic_melody, player) and
+                                state.has(ItemName.knuckles_mystic_melody, player)))
+
+        add_rule(multiworld.get_location(LocationName.wild_canyon_itembox_7, player),
+                 lambda state: (state.has(ItemName.knuckles_mystic_melody, player) and
+                                state.has(ItemName.knuckles_shovel_claws, player) and
+                                state.has(ItemName.knuckles_sunglasses, player)))
+        add_rule(multiworld.get_location(LocationName.pyramid_cave_itembox_7, player),
+                 lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
+        add_rule(multiworld.get_location(LocationName.death_chamber_itembox_7, player),
+                 lambda state: (state.has(ItemName.knuckles_shovel_claws, player) and
+                                state.has(ItemName.knuckles_hammer_gloves, player) and
+                                state.has(ItemName.knuckles_sunglasses, player)))
+        add_rule(multiworld.get_location(LocationName.eternal_engine_itembox_7, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+        add_rule(multiworld.get_location(LocationName.meteor_herd_itembox_7, player),
+                 lambda state: (state.has(ItemName.knuckles_hammer_gloves, player) and
+                                state.has(ItemName.knuckles_sunglasses, player)))
+        add_rule(multiworld.get_location(LocationName.crazy_gadget_itembox_7, player),
+                 lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
+
+        add_rule(multiworld.get_location(LocationName.egg_quarters_itembox_7, player),
+                 lambda state: state.has(ItemName.rouge_mystic_melody, player))
+        add_rule(multiworld.get_location(LocationName.weapons_bed_itembox_7, player),
+                 lambda state: (state.has(ItemName.eggman_jet_engine, player) and
+                                state.has(ItemName.eggman_large_cannon, player)))
+        add_rule(multiworld.get_location(LocationName.security_hall_itembox_7, player),
+                 lambda state: state.has(ItemName.rouge_pick_nails, player))
+        add_rule(multiworld.get_location(LocationName.white_jungle_itembox_7, player),
+                 lambda state: state.has(ItemName.shadow_air_shoes, player))
+        add_rule(multiworld.get_location(LocationName.sky_rail_itembox_7, player),
+                 lambda state: (state.has(ItemName.shadow_air_shoes, player) and
+                                state.has(ItemName.shadow_mystic_melody, player)))
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_itembox_7, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+
+        add_rule(multiworld.get_location(LocationName.cannon_core_itembox_7, player),
+                 lambda state: (state.has(ItemName.tails_booster, player) and
+                                state.has(ItemName.eggman_jet_engine, player) and
+                                state.has(ItemName.knuckles_air_necklace, player)))
+
+        add_rule(multiworld.get_location(LocationName.wild_canyon_itembox_8, player),
+                 lambda state: (state.has(ItemName.knuckles_mystic_melody, player) and
+                                state.has(ItemName.knuckles_shovel_claws, player) and
+                                state.has(ItemName.knuckles_sunglasses, player)))
+        add_rule(multiworld.get_location(LocationName.pumpkin_hill_itembox_8, player),
+                 lambda state: state.has(ItemName.knuckles_sunglasses, player))
+        add_rule(multiworld.get_location(LocationName.pyramid_cave_itembox_8, player),
+                 lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
+        add_rule(multiworld.get_location(LocationName.death_chamber_itembox_8, player),
+                 lambda state: (state.has(ItemName.knuckles_shovel_claws, player) and
+                                state.has(ItemName.knuckles_hammer_gloves, player) and
+                                state.has(ItemName.knuckles_sunglasses, player)))
+        add_rule(multiworld.get_location(LocationName.eternal_engine_itembox_8, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+        add_rule(multiworld.get_location(LocationName.crazy_gadget_itembox_8, player),
+                 lambda state: (state.has(ItemName.sonic_bounce_bracelet, player) and
+                                state.has(ItemName.sonic_mystic_melody, player)))
+
+        add_rule(multiworld.get_location(LocationName.iron_gate_itembox_8, player),
+                 lambda state: (state.has(ItemName.eggman_mystic_melody, player) and
+                                state.has(ItemName.eggman_jet_engine, player) and
+                                state.has(ItemName.eggman_large_cannon, player)))
+        add_rule(multiworld.get_location(LocationName.egg_quarters_itembox_8, player),
+                 lambda state: state.has(ItemName.rouge_mystic_melody, player))
+        add_rule(multiworld.get_location(LocationName.lost_colony_itembox_8, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+        add_rule(multiworld.get_location(LocationName.white_jungle_itembox_8, player),
+                 lambda state: state.has(ItemName.shadow_air_shoes, player))
+        add_rule(multiworld.get_location(LocationName.mad_space_itembox_8, player),
+                 lambda state: state.has(ItemName.rouge_iron_boots, player))
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_itembox_8, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+
+        add_rule(multiworld.get_location(LocationName.cannon_core_itembox_8, player),
+                 lambda state: (state.has(ItemName.tails_booster, player) and
+                                state.has(ItemName.eggman_jet_engine, player) and
+                                state.has(ItemName.knuckles_air_necklace, player)))
+
+        add_rule(multiworld.get_location(LocationName.pyramid_cave_itembox_9, player),
+                 lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
+        add_rule(multiworld.get_location(LocationName.death_chamber_itembox_9, player),
+                 lambda state: (state.has(ItemName.knuckles_shovel_claws, player) and
+                                state.has(ItemName.knuckles_hammer_gloves, player) and
+                                state.has(ItemName.knuckles_sunglasses, player)))
+        add_rule(multiworld.get_location(LocationName.eternal_engine_itembox_9, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+        add_rule(multiworld.get_location(LocationName.crazy_gadget_itembox_9, player),
+                 lambda state: (state.has(ItemName.sonic_light_shoes, player) and
+                                state.has(ItemName.sonic_bounce_bracelet, player) and
+                                state.has(ItemName.sonic_flame_ring, player)))
+
+        add_rule(multiworld.get_location(LocationName.lost_colony_itembox_9, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+        add_rule(multiworld.get_location(LocationName.security_hall_itembox_9, player),
+                 lambda state: state.has(ItemName.rouge_pick_nails, player))
+        add_rule(multiworld.get_location(LocationName.mad_space_itembox_9, player),
+                 lambda state: state.has(ItemName.rouge_iron_boots, player))
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_itembox_9, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+
+        add_rule(multiworld.get_location(LocationName.cannon_core_itembox_9, player),
+                 lambda state: (state.has(ItemName.tails_booster, player) and
+                                state.has(ItemName.eggman_jet_engine, player) and
+                                state.has(ItemName.knuckles_air_necklace, player)))
+
+        add_rule(multiworld.get_location(LocationName.pyramid_cave_itembox_10, player),
+                 lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
+        add_rule(multiworld.get_location(LocationName.death_chamber_itembox_10, player),
+                 lambda state: (state.has(ItemName.knuckles_shovel_claws, player) and
+                                state.has(ItemName.knuckles_hammer_gloves, player) and
+                                state.has(ItemName.knuckles_sunglasses, player)))
+        add_rule(multiworld.get_location(LocationName.eternal_engine_itembox_10, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+        add_rule(multiworld.get_location(LocationName.crazy_gadget_itembox_10, player),
+                 lambda state: (state.has(ItemName.sonic_light_shoes, player) and
+                                state.has(ItemName.sonic_bounce_bracelet, player) and
+                                state.has(ItemName.sonic_flame_ring, player)))
+
+        add_rule(multiworld.get_location(LocationName.egg_quarters_itembox_10, player),
+                 lambda state: (state.has(ItemName.rouge_mystic_melody, player) and
+                                state.has(ItemName.rouge_treasure_scope, player)))
+        add_rule(multiworld.get_location(LocationName.security_hall_itembox_10, player),
+                 lambda state: state.has(ItemName.rouge_pick_nails, player))
+        add_rule(multiworld.get_location(LocationName.mad_space_itembox_10, player),
+                 lambda state: state.has(ItemName.rouge_iron_boots, player))
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_itembox_10, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+
+        add_rule(multiworld.get_location(LocationName.cannon_core_itembox_10, player),
+                 lambda state: (state.has(ItemName.tails_booster, player) and
+                                state.has(ItemName.eggman_jet_engine, player) and
+                                state.has(ItemName.knuckles_air_necklace, player) and
+                                state.has(ItemName.knuckles_hammer_gloves, player)))
+
+        add_rule(multiworld.get_location(LocationName.pyramid_cave_itembox_11, player),
+                 lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
+        add_rule(multiworld.get_location(LocationName.death_chamber_itembox_11, player),
+                 lambda state: (state.has(ItemName.knuckles_shovel_claws, player) and
+                                state.has(ItemName.knuckles_hammer_gloves, player)))
+        add_rule(multiworld.get_location(LocationName.eternal_engine_itembox_11, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+        add_rule(multiworld.get_location(LocationName.crazy_gadget_itembox_11, player),
+                 lambda state: (state.has(ItemName.sonic_light_shoes, player) and
+                                state.has(ItemName.sonic_bounce_bracelet, player) and
+                                state.has(ItemName.sonic_flame_ring, player)))
+
+        add_rule(multiworld.get_location(LocationName.egg_quarters_itembox_11, player),
+                 lambda state: (state.has(ItemName.rouge_mystic_melody, player) and
+                                state.has(ItemName.rouge_pick_nails, player) and
+                                state.has(ItemName.rouge_iron_boots, player)))
+        add_rule(multiworld.get_location(LocationName.security_hall_itembox_11, player),
+                 lambda state: state.has(ItemName.rouge_pick_nails, player))
+        add_rule(multiworld.get_location(LocationName.mad_space_itembox_11, player),
+                 lambda state: state.has(ItemName.rouge_iron_boots, player))
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_itembox_11, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+
+        add_rule(multiworld.get_location(LocationName.cannon_core_itembox_11, player),
+                 lambda state: (state.has(ItemName.tails_booster, player) and
+                                state.has(ItemName.eggman_jet_engine, player) and
+                                state.has(ItemName.knuckles_air_necklace, player) and
+                                state.has(ItemName.knuckles_hammer_gloves, player)))
+
+        add_rule(multiworld.get_location(LocationName.pyramid_cave_itembox_12, player),
+                 lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
+        add_rule(multiworld.get_location(LocationName.eternal_engine_itembox_12, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+        add_rule(multiworld.get_location(LocationName.crazy_gadget_itembox_12, player),
+                 lambda state: (state.has(ItemName.sonic_light_shoes, player) and
+                                state.has(ItemName.sonic_bounce_bracelet, player) and
+                                state.has(ItemName.sonic_flame_ring, player)))
+
+        add_rule(multiworld.get_location(LocationName.security_hall_itembox_12, player),
+                 lambda state: state.has(ItemName.rouge_pick_nails, player))
+        add_rule(multiworld.get_location(LocationName.mad_space_itembox_12, player),
+                 lambda state: (state.has(ItemName.rouge_treasure_scope, player) and
+                                state.has(ItemName.rouge_iron_boots, player)))
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_itembox_12, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+
+        add_rule(multiworld.get_location(LocationName.cannon_core_itembox_12, player),
+                 lambda state: (state.has(ItemName.tails_booster, player) and
+                                state.has(ItemName.eggman_jet_engine, player) and
+                                state.has(ItemName.knuckles_air_necklace, player) and
+                                state.has(ItemName.knuckles_hammer_gloves, player)))
+
+        add_rule(multiworld.get_location(LocationName.pyramid_cave_itembox_13, player),
+                 lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
+        add_rule(multiworld.get_location(LocationName.eternal_engine_itembox_13, player),
+                 lambda state: (state.has(ItemName.tails_booster, player) and
+                                state.has(ItemName.tails_bazooka, player)))
+        add_rule(multiworld.get_location(LocationName.crazy_gadget_itembox_13, player),
+                 lambda state: (state.has(ItemName.sonic_light_shoes, player) and
+                                state.has(ItemName.sonic_bounce_bracelet, player) and
+                                state.has(ItemName.sonic_flame_ring, player)))
+
+        add_rule(multiworld.get_location(LocationName.security_hall_itembox_13, player),
+                 lambda state: state.has(ItemName.rouge_pick_nails, player))
+        add_rule(multiworld.get_location(LocationName.mad_space_itembox_13, player),
+                 lambda state: (state.has(ItemName.rouge_treasure_scope, player) and
+                                state.has(ItemName.rouge_iron_boots, player)))
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_itembox_13, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+
+        add_rule(multiworld.get_location(LocationName.pyramid_cave_itembox_14, player),
+                 lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
+        add_rule(multiworld.get_location(LocationName.eternal_engine_itembox_14, player),
+                 lambda state: (state.has(ItemName.tails_booster, player) and
+                                state.has(ItemName.tails_bazooka, player)))
+        add_rule(multiworld.get_location(LocationName.crazy_gadget_itembox_14, player),
+                 lambda state: (state.has(ItemName.sonic_light_shoes, player) and
+                                state.has(ItemName.sonic_bounce_bracelet, player) and
+                                state.has(ItemName.sonic_flame_ring, player)))
+
+        add_rule(multiworld.get_location(LocationName.security_hall_itembox_14, player),
+                 lambda state: state.has(ItemName.rouge_pick_nails, player))
+        add_rule(multiworld.get_location(LocationName.mad_space_itembox_14, player),
+                 lambda state: state.has(ItemName.rouge_iron_boots, player))
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_itembox_14, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+
+        add_rule(multiworld.get_location(LocationName.pyramid_cave_itembox_15, player),
+                 lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
+
+        add_rule(multiworld.get_location(LocationName.security_hall_itembox_15, player),
+                 lambda state: state.has(ItemName.rouge_pick_nails, player))
+        add_rule(multiworld.get_location(LocationName.mad_space_itembox_15, player),
+                 lambda state: state.has(ItemName.rouge_iron_boots, player))
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_itembox_15, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+
+        add_rule(multiworld.get_location(LocationName.mad_space_itembox_16, player),
+                 lambda state: state.has(ItemName.rouge_iron_boots, player))
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_itembox_16, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+
+        add_rule(multiworld.get_location(LocationName.mad_space_itembox_17, player),
+                 lambda state: state.has(ItemName.rouge_iron_boots, player))
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_itembox_17, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+
+        add_rule(multiworld.get_location(LocationName.security_hall_itembox_18, player),
+                 lambda state: state.has(ItemName.rouge_pick_nails, player))
+        add_rule(multiworld.get_location(LocationName.mad_space_itembox_18, player),
+                 lambda state: state.has(ItemName.rouge_iron_boots, player))
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_itembox_18, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+
+        add_rule(multiworld.get_location(LocationName.final_rush_itembox_19, player),
+                 lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
+
+        add_rule(multiworld.get_location(LocationName.security_hall_itembox_19, player),
+                 lambda state: state.has(ItemName.rouge_pick_nails, player))
+        add_rule(multiworld.get_location(LocationName.mad_space_itembox_19, player),
+                 lambda state: state.has(ItemName.rouge_iron_boots, player))
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_itembox_19, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+
+        add_rule(multiworld.get_location(LocationName.final_rush_itembox_20, player),
+                 lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
+
+        add_rule(multiworld.get_location(LocationName.security_hall_itembox_20, player),
+                 lambda state: state.has(ItemName.rouge_pick_nails, player))
+        add_rule(multiworld.get_location(LocationName.mad_space_itembox_20, player),
+                 lambda state: state.has(ItemName.rouge_iron_boots, player))
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_itembox_20, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+
+        add_rule(multiworld.get_location(LocationName.final_rush_itembox_21, player),
+                 lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
+
+        add_rule(multiworld.get_location(LocationName.security_hall_itembox_21, player),
+                 lambda state: state.has(ItemName.rouge_pick_nails, player))
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_itembox_21, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+
+        add_rule(multiworld.get_location(LocationName.final_rush_itembox_22, player),
+                 lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
+
+        add_rule(multiworld.get_location(LocationName.security_hall_itembox_22, player),
+                 lambda state: state.has(ItemName.rouge_pick_nails, player))
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_itembox_22, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+
+        add_rule(multiworld.get_location(LocationName.final_rush_itembox_23, player),
+                 lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
+
+        add_rule(multiworld.get_location(LocationName.security_hall_itembox_23, player),
+                 lambda state: state.has(ItemName.rouge_iron_boots, player))
+        add_rule(multiworld.get_location(LocationName.sky_rail_itembox_23, player),
+                 lambda state: state.has(ItemName.shadow_flame_ring, player))
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_itembox_23, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+
+        add_rule(multiworld.get_location(LocationName.final_rush_itembox_24, player),
+                 lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
+
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_itembox_24, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+
+        add_rule(multiworld.get_location(LocationName.final_rush_itembox_25, player),
+                 lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
+
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_itembox_25, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+
+        add_rule(multiworld.get_location(LocationName.final_rush_itembox_26, player),
+                 lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
+
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_itembox_26, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+
+        add_rule(multiworld.get_location(LocationName.final_rush_itembox_27, player),
+                 lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
+
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_itembox_27, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+
+        add_rule(multiworld.get_location(LocationName.final_rush_itembox_28, player),
+                 lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
+
+        add_rule(multiworld.get_location(LocationName.final_rush_itembox_29, player),
+                 lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
+
+        add_rule(multiworld.get_location(LocationName.final_rush_itembox_30, player),
+                 lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
+
+        add_rule(multiworld.get_location(LocationName.final_rush_itembox_31, player),
+                 lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
+
+        add_rule(multiworld.get_location(LocationName.final_rush_itembox_32, player),
+                 lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
+
+        add_rule(multiworld.get_location(LocationName.final_rush_itembox_33, player),
+                 lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
+
+        add_rule(multiworld.get_location(LocationName.final_chase_itembox_33, player),
+                 lambda state: (state.has(ItemName.shadow_air_shoes, player) and
+                                state.has(ItemName.shadow_mystic_melody, player)))
+
+        add_rule(multiworld.get_location(LocationName.final_rush_itembox_34, player),
+                 lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
+
+        add_rule(multiworld.get_location(LocationName.final_chase_itembox_34, player),
+                 lambda state: (state.has(ItemName.shadow_air_shoes, player) and
+                                state.has(ItemName.shadow_mystic_melody, player)))
+
+        add_rule(multiworld.get_location(LocationName.final_rush_itembox_35, player),
+                 lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
+
+        add_rule(multiworld.get_location(LocationName.final_chase_itembox_35, player),
+                 lambda state: (state.has(ItemName.shadow_air_shoes, player) and
+                                state.has(ItemName.shadow_mystic_melody, player)))
+
+        add_rule(multiworld.get_location(LocationName.final_rush_itembox_36, player),
+                 lambda state: (state.has(ItemName.sonic_light_shoes, player) and
+                                state.has(ItemName.sonic_bounce_bracelet, player) and
+                                state.has(ItemName.sonic_flame_ring, player) and
+                                state.has(ItemName.sonic_mystic_melody, player)))
+
+        add_rule(multiworld.get_location(LocationName.final_rush_itembox_37, player),
+                 lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
+
+        add_rule(multiworld.get_location(LocationName.final_rush_itembox_38, player),
+                 lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
+
+        add_rule(multiworld.get_location(LocationName.final_rush_itembox_39, player),
+                 lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
+
+        add_rule(multiworld.get_location(LocationName.final_rush_itembox_40, player),
+                 lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
+
+    # Big Upgrade Requirements
+    if world.options.bigsanity:
+        add_rule(multiworld.get_location(LocationName.metal_harbor_big, player),
+                 lambda state: state.has(ItemName.sonic_light_shoes, player))
+        add_rule(multiworld.get_location(LocationName.mission_street_big, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+        add_rule(multiworld.get_location(LocationName.hidden_base_big, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+        add_rule(multiworld.get_location(LocationName.pyramid_cave_big, player),
+                 lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
+        add_rule(multiworld.get_location(LocationName.death_chamber_big, player),
+                 lambda state: state.has(ItemName.knuckles_hammer_gloves, player))
+        add_rule(multiworld.get_location(LocationName.eternal_engine_big, player),
+                 lambda state: state.has(ItemName.tails_booster, player) and
+                               state.has(ItemName.tails_bazooka, player))
+        add_rule(multiworld.get_location(LocationName.crazy_gadget_big, player),
+                 lambda state: state.has(ItemName.sonic_light_shoes, player) and
+                               state.has(ItemName.sonic_bounce_bracelet, player) and
+                               state.has(ItemName.sonic_flame_ring, player))
+        add_rule(multiworld.get_location(LocationName.final_rush_big, player),
+                 lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
+
+        add_rule(multiworld.get_location(LocationName.lost_colony_big, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+        add_rule(multiworld.get_location(LocationName.white_jungle_big_1, player),
+                 lambda state: state.has(ItemName.shadow_air_shoes, player))
+        add_rule(multiworld.get_location(LocationName.white_jungle_big_2, player),
+                 lambda state: state.has(ItemName.shadow_air_shoes, player))
+        add_rule(multiworld.get_location(LocationName.mad_space_big, player),
+                 lambda state: state.has(ItemName.rouge_iron_boots, player))
+
+        add_rule(multiworld.get_location(LocationName.cannon_core_big_2, player),
+                 lambda state: state.has(ItemName.tails_booster, player) and
+                               state.has(ItemName.eggman_jet_engine, player))
+        add_rule(multiworld.get_location(LocationName.cannon_core_big_3, player),
+                 lambda state: state.has(ItemName.tails_booster, player) and
+                               state.has(ItemName.eggman_jet_engine, player))
+        add_rule(multiworld.get_location(LocationName.cannon_core_big_4, player),
+                 lambda state: state.has(ItemName.tails_booster, player) and
+                               state.has(ItemName.eggman_jet_engine, player) and
+                               state.has(ItemName.knuckles_hammer_gloves, player) and
+                               state.has(ItemName.knuckles_air_necklace, player))
+        add_rule(multiworld.get_location(LocationName.cannon_core_big_5, player),
+                 lambda state: state.has(ItemName.tails_booster, player) and
+                               state.has(ItemName.eggman_jet_engine, player) and
+                               state.has(ItemName.knuckles_hammer_gloves, player) and
+                               state.has(ItemName.knuckles_air_necklace, player) and
+                               state.has(ItemName.sonic_bounce_bracelet, player))
+
+
 def set_mission_upgrade_rules_hard(multiworld: MultiWorld, world: World, player: int):
     # Mission 1 Upgrade Requirements
     add_rule_safe(multiworld, LocationName.pumpkin_hill_1, player,
@@ -1550,8 +2296,6 @@ def set_mission_upgrade_rules_hard(multiworld: MultiWorld, world: World, player:
     if world.options.keysanity:
         add_rule(multiworld.get_location(LocationName.prison_lane_chao_1, player),
                  lambda state: state.has(ItemName.tails_bazooka, player))
-        add_rule(multiworld.get_location(LocationName.mission_street_chao_1, player),
-                 lambda state: state.has(ItemName.tails_booster, player))
         add_rule(multiworld.get_location(LocationName.hidden_base_chao_1, player),
                  lambda state: state.has(ItemName.tails_booster, player))
         add_rule(multiworld.get_location(LocationName.death_chamber_chao_1, player),
@@ -1570,8 +2314,6 @@ def set_mission_upgrade_rules_hard(multiworld: MultiWorld, world: World, player:
 
         add_rule(multiworld.get_location(LocationName.prison_lane_chao_2, player),
                  lambda state: state.has(ItemName.tails_booster, player))
-        add_rule(multiworld.get_location(LocationName.mission_street_chao_2, player),
-                 lambda state: state.has(ItemName.tails_booster, player))
         add_rule(multiworld.get_location(LocationName.hidden_base_chao_2, player),
                  lambda state: state.has(ItemName.tails_booster, player))
         add_rule(multiworld.get_location(LocationName.death_chamber_chao_2, player),
@@ -1850,8 +2592,7 @@ def set_mission_upgrade_rules_hard(multiworld: MultiWorld, world: World, player:
         add_rule(multiworld.get_location(LocationName.lost_colony_beetle, player),
                  lambda state: state.has(ItemName.eggman_jet_engine, player))
         add_rule(multiworld.get_location(LocationName.cosmic_wall_beetle, player),
-                 lambda state: state.has(ItemName.eggman_mystic_melody, player) and
-                               state.has(ItemName.eggman_jet_engine, player))
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
 
         add_rule(multiworld.get_location(LocationName.cannon_core_beetle, player),
                  lambda state: state.has(ItemName.tails_booster, player) and
@@ -2180,8 +2921,7 @@ def set_mission_upgrade_rules_hard(multiworld: MultiWorld, world: World, player:
                                state.has(ItemName.knuckles_hammer_gloves, player))
 
         add_rule(multiworld.get_location(LocationName.pyramid_cave_animal_19, player),
-                 lambda state: state.has(ItemName.sonic_bounce_bracelet, player) and
-                               state.has(ItemName.sonic_mystic_melody, player))
+                 lambda state: state.has(ItemName.sonic_flame_ring, player))
 
         add_rule(multiworld.get_location(LocationName.cannon_core_animal_19, player),
                  lambda state: state.has(ItemName.tails_booster, player) and
@@ -2192,6 +2932,1353 @@ def set_mission_upgrade_rules_hard(multiworld: MultiWorld, world: World, player:
         add_rule(multiworld.get_location(LocationName.radical_highway_animal_20, player),
                  lambda state: state.has(ItemName.shadow_flame_ring, player))
 
+    # Extra Life Box Upgrade Requirements
+    if world.options.itemboxsanity.value > 0:
+        add_rule(multiworld.get_location(LocationName.pumpkin_hill_lifebox_1, player),
+                 lambda state: state.has(ItemName.knuckles_shovel_claws, player))
+        add_rule(multiworld.get_location(LocationName.aquatic_mine_lifebox_1, player),
+                 lambda state: state.has(ItemName.knuckles_mystic_melody, player))
+        add_rule(multiworld.get_location(LocationName.hidden_base_lifebox_1, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+        add_rule(multiworld.get_location(LocationName.death_chamber_lifebox_1, player),
+                 lambda state: (state.has(ItemName.knuckles_mystic_melody, player) and
+                                state.has(ItemName.knuckles_shovel_claws, player) and
+                                state.has(ItemName.knuckles_hammer_gloves, player)))
+        add_rule(multiworld.get_location(LocationName.eternal_engine_lifebox_1, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+
+        add_rule(multiworld.get_location(LocationName.iron_gate_lifebox_1, player),
+                 lambda state: (state.has(ItemName.eggman_mystic_melody, player) and
+                                state.has(ItemName.eggman_jet_engine, player)))
+        add_rule(multiworld.get_location(LocationName.dry_lagoon_lifebox_1, player),
+                 lambda state: (state.has(ItemName.rouge_mystic_melody, player) and
+                                state.has(ItemName.rouge_pick_nails, player) and
+                                state.has(ItemName.rouge_treasure_scope, player) and
+                                state.has(ItemName.rouge_iron_boots, player)))
+        add_rule(multiworld.get_location(LocationName.egg_quarters_lifebox_1, player),
+                 lambda state: state.has(ItemName.rouge_iron_boots, player))
+        add_rule(multiworld.get_location(LocationName.weapons_bed_lifebox_1, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+        add_rule(multiworld.get_location(LocationName.security_hall_lifebox_1, player),
+                 lambda state: (state.has(ItemName.rouge_mystic_melody, player) and
+                                state.has(ItemName.rouge_treasure_scope, player) and
+                                state.has(ItemName.rouge_iron_boots, player)))
+        add_rule(multiworld.get_location(LocationName.mad_space_lifebox_1, player),
+                 lambda state: state.has(ItemName.rouge_treasure_scope, player))
+
+        add_rule(multiworld.get_location(LocationName.cannon_core_lifebox_1, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+
+        add_rule(multiworld.get_location(LocationName.mission_street_lifebox_2, player),
+                 lambda state: (state.has(ItemName.tails_booster, player) and
+-                               state.has(ItemName.tails_mystic_melody, player)))
+        add_rule(multiworld.get_location(LocationName.eternal_engine_lifebox_2, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+
+        add_rule(multiworld.get_location(LocationName.iron_gate_lifebox_2, player),
+                 lambda state: (state.has(ItemName.eggman_mystic_melody, player) and
+                                state.has(ItemName.eggman_jet_engine, player)))
+        add_rule(multiworld.get_location(LocationName.dry_lagoon_lifebox_2, player),
+                 lambda state: state.has(ItemName.rouge_treasure_scope, player))
+        add_rule(multiworld.get_location(LocationName.sand_ocean_lifebox_2, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+        add_rule(multiworld.get_location(LocationName.egg_quarters_lifebox_2, player),
+                 lambda state: (state.has(ItemName.rouge_mystic_melody, player) and
+                                state.has(ItemName.rouge_treasure_scope, player)))
+
+        add_rule(multiworld.get_location(LocationName.meteor_herd_lifebox_3, player),
+                 lambda state: (state.has(ItemName.knuckles_hammer_gloves, player) and
+                                state.has(ItemName.knuckles_sunglasses, player)))
+        add_rule(multiworld.get_location(LocationName.crazy_gadget_lifebox_3, player),
+                 lambda state: (state.has(ItemName.sonic_light_shoes, player) and
+                                state.has(ItemName.sonic_flame_ring, player)))
+
+        add_rule(multiworld.get_location(LocationName.sand_ocean_lifebox_3, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+        add_rule(multiworld.get_location(LocationName.mad_space_lifebox_3, player),
+                 lambda state: state.has(ItemName.rouge_treasure_scope, player))
+
+        add_rule(multiworld.get_location(LocationName.crazy_gadget_lifebox_4, player),
+                 lambda state: (state.has(ItemName.sonic_light_shoes, player) and
+                                state.has(ItemName.sonic_flame_ring, player)))
+
+        add_rule(multiworld.get_location(LocationName.final_rush_lifebox_8, player),
+                 lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
+
+        add_rule(multiworld.get_location(LocationName.final_rush_lifebox_9, player),
+                 lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
+
+        add_rule(multiworld.get_location(LocationName.final_rush_lifebox_10, player),
+                 lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
+
+        add_rule(multiworld.get_location(LocationName.final_rush_lifebox_11, player),
+                 lambda state: (state.has(ItemName.sonic_bounce_bracelet, player) and
+                                state.has(ItemName.sonic_flame_ring, player)))
+
+        add_rule(multiworld.get_location(LocationName.final_rush_lifebox_12, player),
+                 lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
+
+        add_rule(multiworld.get_location(LocationName.final_rush_lifebox_13, player),
+                 lambda state: (state.has(ItemName.sonic_bounce_bracelet, player) and
+                                state.has(ItemName.sonic_mystic_melody, player)))
+
+    # Item Box Upgrade Requirements
+    if world.options.itemboxsanity.value == 2:
+        add_rule(multiworld.get_location(LocationName.death_chamber_itembox_1, player),
+                 lambda state: state.has(ItemName.knuckles_hammer_gloves, player))
+        add_rule(multiworld.get_location(LocationName.eternal_engine_itembox_1, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+
+        add_rule(multiworld.get_location(LocationName.weapons_bed_itembox_1, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+        add_rule(multiworld.get_location(LocationName.security_hall_itembox_1, player),
+                 lambda state: state.has(ItemName.rouge_pick_nails, player))
+
+        add_rule(multiworld.get_location(LocationName.cannon_core_itembox_1, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+
+        add_rule(multiworld.get_location(LocationName.hidden_base_itembox_2, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+        add_rule(multiworld.get_location(LocationName.death_chamber_itembox_2, player),
+                 lambda state: state.has(ItemName.knuckles_hammer_gloves, player))
+        add_rule(multiworld.get_location(LocationName.eternal_engine_itembox_2, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+
+        add_rule(multiworld.get_location(LocationName.egg_quarters_itembox_2, player),
+                 lambda state: state.has(ItemName.rouge_iron_boots, player))
+        add_rule(multiworld.get_location(LocationName.weapons_bed_itembox_2, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+        add_rule(multiworld.get_location(LocationName.security_hall_itembox_2, player),
+                 lambda state: state.has(ItemName.rouge_pick_nails, player))
+        add_rule(multiworld.get_location(LocationName.mad_space_itembox_2, player),
+                 lambda state: state.has(ItemName.rouge_treasure_scope, player))
+
+        add_rule(multiworld.get_location(LocationName.cannon_core_itembox_2, player),
+                 lambda state: (state.has(ItemName.tails_booster, player) and
+                                state.has(ItemName.eggman_mystic_melody, player) and
+                                state.has(ItemName.eggman_jet_engine, player)))
+
+        add_rule(multiworld.get_location(LocationName.hidden_base_itembox_3, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+        add_rule(multiworld.get_location(LocationName.death_chamber_itembox_3, player),
+                 lambda state: (state.has(ItemName.knuckles_shovel_claws, player) and
+                                state.has(ItemName.knuckles_hammer_gloves, player)))
+        add_rule(multiworld.get_location(LocationName.eternal_engine_itembox_3, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+        add_rule(multiworld.get_location(LocationName.meteor_herd_itembox_3, player),
+                 lambda state: state.has(ItemName.knuckles_sunglasses, player))
+
+        add_rule(multiworld.get_location(LocationName.weapons_bed_itembox_3, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+        add_rule(multiworld.get_location(LocationName.security_hall_itembox_3, player),
+                 lambda state: state.has(ItemName.rouge_pick_nails, player))
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_itembox_3, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+
+        add_rule(multiworld.get_location(LocationName.cannon_core_itembox_3, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+
+        add_rule(multiworld.get_location(LocationName.hidden_base_itembox_4, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+        add_rule(multiworld.get_location(LocationName.death_chamber_itembox_4, player),
+                 lambda state: (state.has(ItemName.knuckles_shovel_claws, player) and
+                                state.has(ItemName.knuckles_hammer_gloves, player) and
+                                state.has(ItemName.knuckles_sunglasses, player)))
+        add_rule(multiworld.get_location(LocationName.eternal_engine_itembox_4, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+
+        add_rule(multiworld.get_location(LocationName.weapons_bed_itembox_4, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+        add_rule(multiworld.get_location(LocationName.security_hall_itembox_4, player),
+                 lambda state: state.has(ItemName.rouge_pick_nails, player))
+        add_rule(multiworld.get_location(LocationName.mad_space_itembox_4, player),
+                 lambda state: state.has(ItemName.rouge_iron_boots, player))
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_itembox_4, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+
+        add_rule(multiworld.get_location(LocationName.cannon_core_itembox_4, player),
+                 lambda state: (state.has(ItemName.tails_booster, player) and
+                                state.has(ItemName.eggman_mystic_melody, player) and
+                                state.has(ItemName.eggman_jet_engine, player) and
+                                state.has(ItemName.rouge_mystic_melody, player)))
+
+        add_rule(multiworld.get_location(LocationName.hidden_base_itembox_5, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+        add_rule(multiworld.get_location(LocationName.death_chamber_itembox_5, player),
+                 lambda state: (state.has(ItemName.knuckles_shovel_claws, player) and
+                                state.has(ItemName.knuckles_hammer_gloves, player)))
+        add_rule(multiworld.get_location(LocationName.eternal_engine_itembox_5, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+
+        add_rule(multiworld.get_location(LocationName.weapons_bed_itembox_5, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+        add_rule(multiworld.get_location(LocationName.security_hall_itembox_5, player),
+                 lambda state: state.has(ItemName.rouge_pick_nails, player))
+        add_rule(multiworld.get_location(LocationName.mad_space_itembox_5, player),
+                 lambda state: state.has(ItemName.rouge_treasure_scope, player))
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_itembox_5, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+
+        add_rule(multiworld.get_location(LocationName.cannon_core_itembox_5, player),
+                 lambda state: (state.has(ItemName.tails_booster, player) and
+                                state.has(ItemName.rouge_iron_boots, player)))
+
+        add_rule(multiworld.get_location(LocationName.mission_street_itembox_6, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+        add_rule(multiworld.get_location(LocationName.death_chamber_itembox_6, player),
+                 lambda state: (state.has(ItemName.knuckles_shovel_claws, player) and
+                                state.has(ItemName.knuckles_hammer_gloves, player)))
+        add_rule(multiworld.get_location(LocationName.eternal_engine_itembox_6, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+        add_rule(multiworld.get_location(LocationName.meteor_herd_itembox_6, player),
+                 lambda state: (state.has(ItemName.knuckles_hammer_gloves, player) and
+                                state.has(ItemName.knuckles_sunglasses, player)))
+
+        add_rule(multiworld.get_location(LocationName.egg_quarters_itembox_6, player),
+                 lambda state: state.has(ItemName.rouge_mystic_melody, player))
+        add_rule(multiworld.get_location(LocationName.weapons_bed_itembox_6, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+        add_rule(multiworld.get_location(LocationName.security_hall_itembox_6, player),
+                 lambda state: state.has(ItemName.rouge_pick_nails, player))
+        add_rule(multiworld.get_location(LocationName.mad_space_itembox_6, player),
+                 lambda state: state.has(ItemName.rouge_treasure_scope, player))
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_itembox_6, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+
+        add_rule(multiworld.get_location(LocationName.cannon_core_itembox_6, player),
+                 lambda state: (state.has(ItemName.tails_booster, player) and
+                                state.has(ItemName.eggman_mystic_melody, player) and
+                                state.has(ItemName.eggman_jet_engine, player) and
+                                state.has(ItemName.rouge_mystic_melody, player) and
+                                state.has(ItemName.knuckles_mystic_melody, player)))
+
+        add_rule(multiworld.get_location(LocationName.wild_canyon_itembox_7, player),
+                 lambda state: (state.has(ItemName.knuckles_mystic_melody, player) and
+                                state.has(ItemName.knuckles_shovel_claws, player) and
+                                state.has(ItemName.knuckles_sunglasses, player)))
+        add_rule(multiworld.get_location(LocationName.death_chamber_itembox_7, player),
+                 lambda state: (state.has(ItemName.knuckles_shovel_claws, player) and
+                                state.has(ItemName.knuckles_hammer_gloves, player) and
+                                state.has(ItemName.knuckles_sunglasses, player)))
+        add_rule(multiworld.get_location(LocationName.eternal_engine_itembox_7, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+        add_rule(multiworld.get_location(LocationName.meteor_herd_itembox_7, player),
+                 lambda state: (state.has(ItemName.knuckles_hammer_gloves, player) and
+                                state.has(ItemName.knuckles_sunglasses, player)))
+
+        add_rule(multiworld.get_location(LocationName.egg_quarters_itembox_7, player),
+                 lambda state: state.has(ItemName.rouge_mystic_melody, player))
+        add_rule(multiworld.get_location(LocationName.weapons_bed_itembox_7, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+        add_rule(multiworld.get_location(LocationName.security_hall_itembox_7, player),
+                 lambda state: state.has(ItemName.rouge_pick_nails, player))
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_itembox_7, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+
+        add_rule(multiworld.get_location(LocationName.cannon_core_itembox_7, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+
+        add_rule(multiworld.get_location(LocationName.wild_canyon_itembox_8, player),
+                 lambda state: (state.has(ItemName.knuckles_mystic_melody, player) and
+                                state.has(ItemName.knuckles_shovel_claws, player) and
+                                state.has(ItemName.knuckles_sunglasses, player)))
+        add_rule(multiworld.get_location(LocationName.pumpkin_hill_itembox_8, player),
+                 lambda state: state.has(ItemName.knuckles_sunglasses, player))
+        add_rule(multiworld.get_location(LocationName.death_chamber_itembox_8, player),
+                 lambda state: (state.has(ItemName.knuckles_shovel_claws, player) and
+                                state.has(ItemName.knuckles_hammer_gloves, player) and
+                                state.has(ItemName.knuckles_sunglasses, player)))
+        add_rule(multiworld.get_location(LocationName.eternal_engine_itembox_8, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+
+        add_rule(multiworld.get_location(LocationName.iron_gate_itembox_8, player),
+                 lambda state: (state.has(ItemName.eggman_mystic_melody, player) and
+                                state.has(ItemName.eggman_jet_engine, player)))
+        add_rule(multiworld.get_location(LocationName.egg_quarters_itembox_8, player),
+                 lambda state: state.has(ItemName.rouge_mystic_melody, player))
+        add_rule(multiworld.get_location(LocationName.lost_colony_itembox_8, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_itembox_8, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+
+        add_rule(multiworld.get_location(LocationName.cannon_core_itembox_8, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+
+        add_rule(multiworld.get_location(LocationName.death_chamber_itembox_9, player),
+                 lambda state: (state.has(ItemName.knuckles_shovel_claws, player) and
+                                state.has(ItemName.knuckles_hammer_gloves, player) and
+                                state.has(ItemName.knuckles_sunglasses, player)))
+        add_rule(multiworld.get_location(LocationName.eternal_engine_itembox_9, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+        add_rule(multiworld.get_location(LocationName.crazy_gadget_itembox_9, player),
+                 lambda state: (state.has(ItemName.sonic_light_shoes, player) and
+                                state.has(ItemName.sonic_flame_ring, player)))
+
+        add_rule(multiworld.get_location(LocationName.lost_colony_itembox_9, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+        add_rule(multiworld.get_location(LocationName.security_hall_itembox_9, player),
+                 lambda state: state.has(ItemName.rouge_pick_nails, player))
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_itembox_9, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+
+        add_rule(multiworld.get_location(LocationName.cannon_core_itembox_9, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+
+        add_rule(multiworld.get_location(LocationName.death_chamber_itembox_10, player),
+                 lambda state: (state.has(ItemName.knuckles_shovel_claws, player) and
+                                state.has(ItemName.knuckles_hammer_gloves, player) and
+                                state.has(ItemName.knuckles_sunglasses, player)))
+        add_rule(multiworld.get_location(LocationName.eternal_engine_itembox_10, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+        add_rule(multiworld.get_location(LocationName.crazy_gadget_itembox_10, player),
+                 lambda state: (state.has(ItemName.sonic_light_shoes, player) and
+                                state.has(ItemName.sonic_flame_ring, player)))
+
+        add_rule(multiworld.get_location(LocationName.egg_quarters_itembox_10, player),
+                 lambda state: (state.has(ItemName.rouge_mystic_melody, player) and
+                                state.has(ItemName.rouge_treasure_scope, player)))
+        add_rule(multiworld.get_location(LocationName.security_hall_itembox_10, player),
+                 lambda state: state.has(ItemName.rouge_pick_nails, player))
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_itembox_10, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+
+        add_rule(multiworld.get_location(LocationName.cannon_core_itembox_10, player),
+                 lambda state: (state.has(ItemName.tails_booster, player) and
+                                state.has(ItemName.knuckles_hammer_gloves, player)))
+
+        add_rule(multiworld.get_location(LocationName.death_chamber_itembox_11, player),
+                 lambda state: (state.has(ItemName.knuckles_shovel_claws, player) and
+                                state.has(ItemName.knuckles_hammer_gloves, player)))
+        add_rule(multiworld.get_location(LocationName.eternal_engine_itembox_11, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+        add_rule(multiworld.get_location(LocationName.crazy_gadget_itembox_11, player),
+                 lambda state: (state.has(ItemName.sonic_light_shoes, player) and
+                                state.has(ItemName.sonic_flame_ring, player)))
+
+        add_rule(multiworld.get_location(LocationName.egg_quarters_itembox_11, player),
+                 lambda state: (state.has(ItemName.rouge_mystic_melody, player) and
+                                state.has(ItemName.rouge_pick_nails, player) and
+                                state.has(ItemName.rouge_iron_boots, player)))
+        add_rule(multiworld.get_location(LocationName.security_hall_itembox_11, player),
+                 lambda state: state.has(ItemName.rouge_pick_nails, player))
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_itembox_11, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+
+        add_rule(multiworld.get_location(LocationName.cannon_core_itembox_11, player),
+                 lambda state: (state.has(ItemName.tails_booster, player) and
+                                state.has(ItemName.knuckles_hammer_gloves, player)))
+
+        add_rule(multiworld.get_location(LocationName.eternal_engine_itembox_12, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+        add_rule(multiworld.get_location(LocationName.crazy_gadget_itembox_12, player),
+                 lambda state: (state.has(ItemName.sonic_light_shoes, player) and
+                                state.has(ItemName.sonic_flame_ring, player)))
+
+        add_rule(multiworld.get_location(LocationName.security_hall_itembox_12, player),
+                 lambda state: state.has(ItemName.rouge_pick_nails, player))
+        add_rule(multiworld.get_location(LocationName.mad_space_itembox_12, player),
+                 lambda state: state.has(ItemName.rouge_treasure_scope, player))
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_itembox_12, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+
+        add_rule(multiworld.get_location(LocationName.cannon_core_itembox_12, player),
+                 lambda state: (state.has(ItemName.tails_booster, player) and
+                                state.has(ItemName.knuckles_hammer_gloves, player)))
+
+        add_rule(multiworld.get_location(LocationName.eternal_engine_itembox_13, player),
+                 lambda state: (state.has(ItemName.tails_booster, player) and
+                                state.has(ItemName.tails_bazooka, player)))
+        add_rule(multiworld.get_location(LocationName.crazy_gadget_itembox_13, player),
+                 lambda state: (state.has(ItemName.sonic_light_shoes, player) and
+                                state.has(ItemName.sonic_flame_ring, player)))
+
+        add_rule(multiworld.get_location(LocationName.security_hall_itembox_13, player),
+                 lambda state: state.has(ItemName.rouge_pick_nails, player))
+        add_rule(multiworld.get_location(LocationName.mad_space_itembox_13, player),
+                 lambda state: state.has(ItemName.rouge_treasure_scope, player))
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_itembox_13, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+
+        add_rule(multiworld.get_location(LocationName.eternal_engine_itembox_14, player),
+                 lambda state: (state.has(ItemName.tails_booster, player) and
+                                state.has(ItemName.tails_bazooka, player)))
+        add_rule(multiworld.get_location(LocationName.crazy_gadget_itembox_14, player),
+                 lambda state: (state.has(ItemName.sonic_light_shoes, player) and
+                                state.has(ItemName.sonic_flame_ring, player)))
+
+        add_rule(multiworld.get_location(LocationName.security_hall_itembox_14, player),
+                 lambda state: state.has(ItemName.rouge_pick_nails, player))
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_itembox_14, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+
+        add_rule(multiworld.get_location(LocationName.security_hall_itembox_15, player),
+                 lambda state: state.has(ItemName.rouge_pick_nails, player))
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_itembox_15, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_itembox_16, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_itembox_17, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+
+        add_rule(multiworld.get_location(LocationName.security_hall_itembox_18, player),
+                 lambda state: state.has(ItemName.rouge_pick_nails, player))
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_itembox_18, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+
+        add_rule(multiworld.get_location(LocationName.final_rush_itembox_19, player),
+                 lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
+
+        add_rule(multiworld.get_location(LocationName.security_hall_itembox_19, player),
+                 lambda state: state.has(ItemName.rouge_pick_nails, player))
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_itembox_19, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+
+        add_rule(multiworld.get_location(LocationName.final_rush_itembox_20, player),
+                 lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
+
+        add_rule(multiworld.get_location(LocationName.security_hall_itembox_20, player),
+                 lambda state: state.has(ItemName.rouge_pick_nails, player))
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_itembox_20, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+
+        add_rule(multiworld.get_location(LocationName.final_rush_itembox_21, player),
+                 lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
+
+        add_rule(multiworld.get_location(LocationName.security_hall_itembox_21, player),
+                 lambda state: state.has(ItemName.rouge_pick_nails, player))
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_itembox_21, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+
+        add_rule(multiworld.get_location(LocationName.final_rush_itembox_22, player),
+                 lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
+
+        add_rule(multiworld.get_location(LocationName.security_hall_itembox_22, player),
+                 lambda state: state.has(ItemName.rouge_pick_nails, player))
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_itembox_22, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+
+        add_rule(multiworld.get_location(LocationName.final_rush_itembox_23, player),
+                 lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
+
+        add_rule(multiworld.get_location(LocationName.security_hall_itembox_23, player),
+                 lambda state: state.has(ItemName.rouge_iron_boots, player))
+        add_rule(multiworld.get_location(LocationName.sky_rail_itembox_23, player),
+                 lambda state: state.has(ItemName.shadow_flame_ring, player))
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_itembox_23, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+
+        add_rule(multiworld.get_location(LocationName.final_rush_itembox_24, player),
+                 lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
+
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_itembox_24, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+
+        add_rule(multiworld.get_location(LocationName.final_rush_itembox_25, player),
+                 lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
+
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_itembox_25, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+
+        add_rule(multiworld.get_location(LocationName.final_rush_itembox_26, player),
+                 lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
+
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_itembox_26, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+
+        add_rule(multiworld.get_location(LocationName.final_rush_itembox_27, player),
+                 lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
+
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_itembox_27, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+
+        add_rule(multiworld.get_location(LocationName.final_rush_itembox_28, player),
+                 lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
+
+        add_rule(multiworld.get_location(LocationName.final_rush_itembox_29, player),
+                 lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
+
+        add_rule(multiworld.get_location(LocationName.final_rush_itembox_30, player),
+                 lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
+
+        add_rule(multiworld.get_location(LocationName.final_rush_itembox_31, player),
+                 lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
+
+        add_rule(multiworld.get_location(LocationName.final_rush_itembox_32, player),
+                 lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
+
+        add_rule(multiworld.get_location(LocationName.final_rush_itembox_33, player),
+                 lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
+
+        add_rule(multiworld.get_location(LocationName.final_rush_itembox_34, player),
+                 lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
+
+        add_rule(multiworld.get_location(LocationName.final_rush_itembox_35, player),
+                 lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
+
+        add_rule(multiworld.get_location(LocationName.final_rush_itembox_36, player),
+                 lambda state: (state.has(ItemName.sonic_bounce_bracelet, player) and
+                                state.has(ItemName.sonic_flame_ring, player)))
+
+        add_rule(multiworld.get_location(LocationName.final_rush_itembox_37, player),
+                 lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
+
+        add_rule(multiworld.get_location(LocationName.final_rush_itembox_38, player),
+                 lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
+
+        add_rule(multiworld.get_location(LocationName.final_rush_itembox_39, player),
+                 lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
+
+        add_rule(multiworld.get_location(LocationName.final_rush_itembox_40, player),
+                 lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
+
+    # Big Upgrade Requirements
+    if world.options.bigsanity:
+        add_rule(multiworld.get_location(LocationName.metal_harbor_big, player),
+                 lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
+        add_rule(multiworld.get_location(LocationName.mission_street_big, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+        add_rule(multiworld.get_location(LocationName.hidden_base_big, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+        add_rule(multiworld.get_location(LocationName.death_chamber_big, player),
+                 lambda state: state.has(ItemName.knuckles_hammer_gloves, player))
+        add_rule(multiworld.get_location(LocationName.eternal_engine_big, player),
+                 lambda state: state.has(ItemName.tails_booster, player) and
+                               state.has(ItemName.tails_bazooka, player))
+        add_rule(multiworld.get_location(LocationName.crazy_gadget_big, player),
+                 lambda state: state.has(ItemName.sonic_light_shoes, player) and
+                               state.has(ItemName.sonic_flame_ring, player))
+        add_rule(multiworld.get_location(LocationName.final_rush_big, player),
+                 lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
+
+        add_rule(multiworld.get_location(LocationName.lost_colony_big, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+        add_rule(multiworld.get_location(LocationName.weapons_bed_big, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+
+        add_rule(multiworld.get_location(LocationName.cannon_core_big_2, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+        add_rule(multiworld.get_location(LocationName.cannon_core_big_3, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+        add_rule(multiworld.get_location(LocationName.cannon_core_big_4, player),
+                 lambda state: state.has(ItemName.tails_booster, player) and
+                               state.has(ItemName.knuckles_hammer_gloves, player))
+        add_rule(multiworld.get_location(LocationName.cannon_core_big_5, player),
+                 lambda state: state.has(ItemName.tails_booster, player) and
+                               state.has(ItemName.knuckles_hammer_gloves, player))
+
+
+def set_mission_upgrade_rules_expert(multiworld: MultiWorld, world: World, player: int):
+    # Mission 1 Upgrade Requirements
+    add_rule_safe(multiworld, LocationName.pumpkin_hill_1, player,
+                  lambda state: state.has(ItemName.knuckles_shovel_claws, player))
+    add_rule_safe(multiworld, LocationName.mission_street_1, player,
+                  lambda state: state.has(ItemName.tails_booster, player))
+    add_rule_safe(multiworld, LocationName.hidden_base_1, player,
+                  lambda state: state.has(ItemName.tails_booster, player))
+    add_rule_safe(multiworld, LocationName.eternal_engine_1, player,
+                  lambda state: state.has(ItemName.tails_booster, player))
+
+    add_rule_safe(multiworld, LocationName.egg_quarters_1, player,
+                  lambda state: state.has(ItemName.rouge_pick_nails, player))
+    add_rule_safe(multiworld, LocationName.lost_colony_1, player,
+                  lambda state: state.has(ItemName.eggman_jet_engine, player))
+    add_rule_safe(multiworld, LocationName.weapons_bed_1, player,
+                  lambda state: state.has(ItemName.eggman_jet_engine, player))
+    add_rule_safe(multiworld, LocationName.cosmic_wall_1, player,
+                  lambda state: state.has(ItemName.eggman_jet_engine, player))
+
+    # Mission 2 Upgrade Requirements
+    add_rule_safe(multiworld, LocationName.mission_street_2, player,
+                  lambda state: state.has(ItemName.tails_booster, player))
+    add_rule_safe(multiworld, LocationName.hidden_base_2, player,
+                  lambda state: state.has(ItemName.tails_booster, player))
+    add_rule_safe(multiworld, LocationName.eternal_engine_2, player,
+                  lambda state: state.has(ItemName.tails_booster, player))
+
+    add_rule_safe(multiworld, LocationName.weapons_bed_2, player,
+                  lambda state: state.has(ItemName.eggman_jet_engine, player))
+    add_rule_safe(multiworld, LocationName.cosmic_wall_2, player,
+                  lambda state: state.has(ItemName.eggman_jet_engine, player))
+
+    # Mission 3 Upgrade Requirements
+    add_rule_safe(multiworld, LocationName.prison_lane_3, player,
+                  lambda state: state.has(ItemName.tails_booster, player))
+    add_rule_safe(multiworld, LocationName.mission_street_3, player,
+                  lambda state: state.has(ItemName.tails_booster, player))
+    add_rule_safe(multiworld, LocationName.hidden_base_3, player,
+                  lambda state: state.has(ItemName.tails_booster, player))
+    add_rule_safe(multiworld, LocationName.eternal_engine_3, player,
+                  lambda state: state.has(ItemName.tails_booster, player))
+    add_rule_safe(multiworld, LocationName.meteor_herd_3, player,
+                  lambda state: state.has(ItemName.knuckles_mystic_melody, player))
+
+    add_rule_safe(multiworld, LocationName.iron_gate_3, player,
+                  lambda state: state.has(ItemName.eggman_jet_engine, player))
+    add_rule_safe(multiworld, LocationName.sand_ocean_3, player,
+                  lambda state: state.has(ItemName.eggman_jet_engine, player))
+    add_rule_safe(multiworld, LocationName.lost_colony_3, player,
+                  lambda state: state.has(ItemName.eggman_mystic_melody, player) and
+                                state.has(ItemName.eggman_jet_engine, player))
+    add_rule_safe(multiworld, LocationName.weapons_bed_3, player,
+                  lambda state: state.has(ItemName.eggman_jet_engine, player))
+    add_rule_safe(multiworld, LocationName.mad_space_3, player,
+                  lambda state: state.has(ItemName.rouge_mystic_melody, player) and
+                                state.has(ItemName.rouge_iron_boots, player))
+    add_rule_safe(multiworld, LocationName.cosmic_wall_3, player,
+                  lambda state: state.has(ItemName.eggman_jet_engine, player))
+
+    # Mission 4 Upgrade Requirements
+    add_rule_safe(multiworld, LocationName.pumpkin_hill_4, player,
+                  lambda state: state.has(ItemName.knuckles_shovel_claws, player))
+    add_rule_safe(multiworld, LocationName.mission_street_4, player,
+                  lambda state: state.has(ItemName.tails_booster, player))
+    add_rule_safe(multiworld, LocationName.hidden_base_4, player,
+                  lambda state: state.has(ItemName.tails_booster, player))
+    add_rule_safe(multiworld, LocationName.eternal_engine_4, player,
+                  lambda state: state.has(ItemName.tails_booster, player))
+
+    add_rule_safe(multiworld, LocationName.egg_quarters_4, player,
+                  lambda state: state.has(ItemName.rouge_pick_nails, player))
+    add_rule_safe(multiworld, LocationName.lost_colony_4, player,
+                  lambda state: state.has(ItemName.eggman_jet_engine, player))
+    add_rule_safe(multiworld, LocationName.weapons_bed_4, player,
+                  lambda state: state.has(ItemName.eggman_jet_engine, player))
+    add_rule_safe(multiworld, LocationName.cosmic_wall_4, player,
+                  lambda state: state.has(ItemName.eggman_jet_engine, player))
+
+    # Mission 5 Upgrade Requirements
+    add_rule_safe(multiworld, LocationName.mission_street_5, player,
+                  lambda state: state.has(ItemName.tails_booster, player))
+    add_rule_safe(multiworld, LocationName.hidden_base_5, player,
+                  lambda state: state.has(ItemName.tails_booster, player))
+    add_rule_safe(multiworld, LocationName.eternal_engine_5, player,
+                  lambda state: state.has(ItemName.tails_booster, player))
+
+    add_rule_safe(multiworld, LocationName.iron_gate_5, player,
+                  lambda state: state.has(ItemName.eggman_large_cannon, player))
+    add_rule_safe(multiworld, LocationName.sand_ocean_5, player,
+                  lambda state: state.has(ItemName.eggman_jet_engine, player))
+    add_rule_safe(multiworld, LocationName.egg_quarters_5, player,
+                  lambda state: state.has(ItemName.rouge_treasure_scope, player))
+    add_rule_safe(multiworld, LocationName.lost_colony_5, player,
+                  lambda state: state.has(ItemName.eggman_jet_engine, player) and
+                                state.has(ItemName.eggman_large_cannon, player))
+    add_rule_safe(multiworld, LocationName.weapons_bed_5, player,
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+    add_rule_safe(multiworld, LocationName.cosmic_wall_5, player,
+                  lambda state: state.has(ItemName.eggman_jet_engine, player))
+
+    # Upgrade Spot Upgrade Requirements
+    add_rule(multiworld.get_location(LocationName.prison_lane_upgrade, player),
+             lambda state: state.has(ItemName.tails_bazooka, player))
+    add_rule(multiworld.get_location(LocationName.hidden_base_upgrade, player),
+             lambda state: state.has(ItemName.tails_booster, player))
+    add_rule(multiworld.get_location(LocationName.eternal_engine_upgrade, player),
+             lambda state: state.has(ItemName.tails_booster, player))
+
+    add_rule(multiworld.get_location(LocationName.iron_gate_upgrade, player),
+             lambda state: state.has(ItemName.eggman_jet_engine, player) or
+                           state.has(ItemName.eggman_large_cannon, player))
+    add_rule(multiworld.get_location(LocationName.cosmic_wall_upgrade, player),
+             lambda state: state.has(ItemName.eggman_jet_engine, player))
+
+    # Chao Key Upgrade Requirements
+    if world.options.keysanity:
+        add_rule(multiworld.get_location(LocationName.prison_lane_chao_1, player),
+                 lambda state: state.has(ItemName.tails_booster, player) or
+                               state.has(ItemName.tails_bazooka, player))
+        add_rule(multiworld.get_location(LocationName.hidden_base_chao_1, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+        add_rule(multiworld.get_location(LocationName.eternal_engine_chao_1, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_chao_1, player),
+                 lambda state: state.has(ItemName.eggman_mystic_melody, player) and
+                               state.has(ItemName.eggman_jet_engine, player))
+
+        add_rule(multiworld.get_location(LocationName.cannon_core_chao_1, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player) and
+                               state.has(ItemName.eggman_large_cannon, player))
+
+        add_rule(multiworld.get_location(LocationName.prison_lane_chao_2, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+        add_rule(multiworld.get_location(LocationName.hidden_base_chao_2, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+        add_rule(multiworld.get_location(LocationName.eternal_engine_chao_2, player),
+                 lambda state: state.has(ItemName.tails_booster, player) and
+                               state.has(ItemName.tails_bazooka, player))
+
+        add_rule(multiworld.get_location(LocationName.weapons_bed_chao_2, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_chao_2, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+
+        add_rule(multiworld.get_location(LocationName.mission_street_chao_3, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+        add_rule(multiworld.get_location(LocationName.eternal_engine_chao_3, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+
+        add_rule(multiworld.get_location(LocationName.lost_colony_chao_3, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+        add_rule(multiworld.get_location(LocationName.weapons_bed_chao_3, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_chao_3, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+
+    # Pipe Upgrade Requirements
+    if world.options.whistlesanity.value == 1 or world.options.whistlesanity.value == 3:
+        add_rule(multiworld.get_location(LocationName.hidden_base_pipe_1, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_pipe_1, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+
+        add_rule(multiworld.get_location(LocationName.hidden_base_pipe_2, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+        add_rule(multiworld.get_location(LocationName.eternal_engine_pipe_2, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+
+        add_rule(multiworld.get_location(LocationName.lost_colony_pipe_2, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_pipe_2, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+
+        add_rule(multiworld.get_location(LocationName.cannon_core_pipe_2, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+
+        add_rule(multiworld.get_location(LocationName.prison_lane_pipe_3, player),
+                 lambda state: state.has(ItemName.tails_bazooka, player))
+        add_rule(multiworld.get_location(LocationName.mission_street_pipe_3, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+        add_rule(multiworld.get_location(LocationName.hidden_base_pipe_3, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+        add_rule(multiworld.get_location(LocationName.eternal_engine_pipe_3, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+
+        add_rule(multiworld.get_location(LocationName.weapons_bed_pipe_3, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_pipe_3, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+
+        add_rule(multiworld.get_location(LocationName.hidden_base_pipe_4, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+        add_rule(multiworld.get_location(LocationName.eternal_engine_pipe_4, player),
+                 lambda state: state.has(ItemName.tails_booster, player) and
+                               state.has(ItemName.tails_bazooka, player))
+
+        add_rule(multiworld.get_location(LocationName.weapons_bed_pipe_4, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_pipe_4, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+
+        add_rule(multiworld.get_location(LocationName.hidden_base_pipe_5, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+        add_rule(multiworld.get_location(LocationName.eternal_engine_pipe_5, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+
+        add_rule(multiworld.get_location(LocationName.weapons_bed_pipe_5, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_pipe_5, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+
+    # Hidden Whistle Upgrade Requirements
+    if world.options.whistlesanity.value == 2 or world.options.whistlesanity.value == 3:
+        add_rule(multiworld.get_location(LocationName.mission_street_hidden_3, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+        add_rule(multiworld.get_location(LocationName.mission_street_hidden_4, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+
+    # Omochao Upgrade Requirements
+    if world.options.omosanity:
+        add_rule(multiworld.get_location(LocationName.eternal_engine_omo_1, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+
+        add_rule(multiworld.get_location(LocationName.hidden_base_omo_2, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+        add_rule(multiworld.get_location(LocationName.eternal_engine_omo_2, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+
+        add_rule(multiworld.get_location(LocationName.weapons_bed_omo_2, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player) or
+                               state.has(ItemName.eggman_large_cannon, player))
+
+        add_rule(multiworld.get_location(LocationName.hidden_base_omo_3, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+        add_rule(multiworld.get_location(LocationName.eternal_engine_omo_3, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+
+        add_rule(multiworld.get_location(LocationName.weapons_bed_omo_3, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+
+        add_rule(multiworld.get_location(LocationName.hidden_base_omo_4, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+        add_rule(multiworld.get_location(LocationName.eternal_engine_omo_4, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+
+        add_rule(multiworld.get_location(LocationName.mission_street_omo_5, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+        add_rule(multiworld.get_location(LocationName.eternal_engine_omo_5, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+
+        add_rule(multiworld.get_location(LocationName.mission_street_omo_6, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+        add_rule(multiworld.get_location(LocationName.eternal_engine_omo_6, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+
+        add_rule(multiworld.get_location(LocationName.lost_colony_omo_6, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+
+        add_rule(multiworld.get_location(LocationName.mission_street_omo_7, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+        add_rule(multiworld.get_location(LocationName.eternal_engine_omo_7, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+
+        add_rule(multiworld.get_location(LocationName.lost_colony_omo_7, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+
+        add_rule(multiworld.get_location(LocationName.mission_street_omo_8, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+        add_rule(multiworld.get_location(LocationName.death_chamber_omo_8, player),
+                 lambda state: state.has(ItemName.knuckles_shovel_claws, player) or
+                               state.has(ItemName.knuckles_hammer_gloves, player))
+        add_rule(multiworld.get_location(LocationName.eternal_engine_omo_8, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+
+        add_rule(multiworld.get_location(LocationName.lost_colony_omo_8, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+
+        add_rule(multiworld.get_location(LocationName.eternal_engine_omo_9, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+
+        add_rule(multiworld.get_location(LocationName.eternal_engine_omo_10, player),
+                 lambda state: state.has(ItemName.tails_booster, player) and
+                               state.has(ItemName.tails_bazooka, player))
+
+        add_rule(multiworld.get_location(LocationName.eternal_engine_omo_11, player),
+                 lambda state: state.has(ItemName.tails_booster, player) and
+                               state.has(ItemName.tails_bazooka, player))
+
+        add_rule(multiworld.get_location(LocationName.eternal_engine_omo_12, player),
+                 lambda state: state.has(ItemName.tails_booster, player) and
+                               state.has(ItemName.tails_bazooka, player))
+
+    # Gold Beetle Upgrade Requirements
+    if world.options.beetlesanity:
+        add_rule(multiworld.get_location(LocationName.hidden_base_beetle, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+        add_rule(multiworld.get_location(LocationName.eternal_engine_beetle, player),
+                 lambda state: state.has(ItemName.tails_booster, player) and
+                               state.has(ItemName.tails_bazooka, player))
+
+        add_rule(multiworld.get_location(LocationName.lost_colony_beetle, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_beetle, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+
+        add_rule(multiworld.get_location(LocationName.cannon_core_beetle, player),
+                 lambda state: state.has(ItemName.tails_booster, player) and
+                               state.has(ItemName.knuckles_hammer_gloves, player))
+
+    # Animal Upgrade Requirements
+    if world.options.animalsanity:
+        add_rule(multiworld.get_location(LocationName.hidden_base_animal_2, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_animal_2, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+
+        add_rule(multiworld.get_location(LocationName.hidden_base_animal_3, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+        add_rule(multiworld.get_location(LocationName.eternal_engine_animal_3, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_animal_3, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+
+        add_rule(multiworld.get_location(LocationName.hidden_base_animal_4, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+        add_rule(multiworld.get_location(LocationName.eternal_engine_animal_4, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+
+        add_rule(multiworld.get_location(LocationName.weapons_bed_animal_4, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_animal_4, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+
+        add_rule(multiworld.get_location(LocationName.hidden_base_animal_5, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+        add_rule(multiworld.get_location(LocationName.eternal_engine_animal_5, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+
+        add_rule(multiworld.get_location(LocationName.weapons_bed_animal_5, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_animal_5, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+
+        add_rule(multiworld.get_location(LocationName.hidden_base_animal_6, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+        add_rule(multiworld.get_location(LocationName.eternal_engine_animal_6, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+
+        add_rule(multiworld.get_location(LocationName.weapons_bed_animal_6, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_animal_6, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+
+        add_rule(multiworld.get_location(LocationName.hidden_base_animal_7, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+        add_rule(multiworld.get_location(LocationName.eternal_engine_animal_7, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+
+        add_rule(multiworld.get_location(LocationName.weapons_bed_animal_7, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_animal_7, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+
+        add_rule(multiworld.get_location(LocationName.hidden_base_animal_8, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+        add_rule(multiworld.get_location(LocationName.eternal_engine_animal_8, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+
+        add_rule(multiworld.get_location(LocationName.weapons_bed_animal_8, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+        add_rule(multiworld.get_location(LocationName.security_hall_animal_8, player),
+                 lambda state: state.has(ItemName.rouge_pick_nails, player) and
+                               state.has(ItemName.rouge_iron_boots, player))
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_animal_8, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+
+        add_rule(multiworld.get_location(LocationName.mission_street_animal_9, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+        add_rule(multiworld.get_location(LocationName.hidden_base_animal_9, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+        add_rule(multiworld.get_location(LocationName.eternal_engine_animal_9, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+
+        add_rule(multiworld.get_location(LocationName.lost_colony_animal_9, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player) or
+                               state.has(ItemName.eggman_large_cannon, player))
+        add_rule(multiworld.get_location(LocationName.weapons_bed_animal_9, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_animal_9, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+
+        add_rule(multiworld.get_location(LocationName.mission_street_animal_10, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+        add_rule(multiworld.get_location(LocationName.hidden_base_animal_10, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+        add_rule(multiworld.get_location(LocationName.eternal_engine_animal_10, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+
+        add_rule(multiworld.get_location(LocationName.egg_quarters_animal_10, player),
+                 lambda state: state.has(ItemName.rouge_iron_boots, player))
+        add_rule(multiworld.get_location(LocationName.lost_colony_animal_10, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+        add_rule(multiworld.get_location(LocationName.weapons_bed_animal_10, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+        add_rule(multiworld.get_location(LocationName.mad_space_animal_10, player),
+                 lambda state: state.has(ItemName.rouge_iron_boots, player))
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_animal_10, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+
+        add_rule(multiworld.get_location(LocationName.mission_street_animal_11, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+        add_rule(multiworld.get_location(LocationName.hidden_base_animal_11, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+        add_rule(multiworld.get_location(LocationName.eternal_engine_animal_11, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+
+        add_rule(multiworld.get_location(LocationName.lost_colony_animal_11, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+        add_rule(multiworld.get_location(LocationName.weapons_bed_animal_11, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_animal_11, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+
+        add_rule(multiworld.get_location(LocationName.mission_street_animal_12, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+        add_rule(multiworld.get_location(LocationName.hidden_base_animal_12, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+        add_rule(multiworld.get_location(LocationName.eternal_engine_animal_12, player),
+                 lambda state: state.has(ItemName.tails_booster, player) and
+                               state.has(ItemName.tails_bazooka, player))
+
+        add_rule(multiworld.get_location(LocationName.lost_colony_animal_12, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+        add_rule(multiworld.get_location(LocationName.weapons_bed_animal_12, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_animal_12, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+
+        add_rule(multiworld.get_location(LocationName.prison_lane_animal_13, player),
+                 lambda state: state.has(ItemName.tails_booster, player) or
+                               state.has(ItemName.tails_bazooka, player))
+        add_rule(multiworld.get_location(LocationName.mission_street_animal_13, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+        add_rule(multiworld.get_location(LocationName.hidden_base_animal_13, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+        add_rule(multiworld.get_location(LocationName.eternal_engine_animal_13, player),
+                 lambda state: state.has(ItemName.tails_booster, player) and
+                               state.has(ItemName.tails_bazooka, player))
+
+        add_rule(multiworld.get_location(LocationName.lost_colony_animal_13, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+        add_rule(multiworld.get_location(LocationName.weapons_bed_animal_13, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_animal_13, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+
+        add_rule(multiworld.get_location(LocationName.prison_lane_animal_14, player),
+                 lambda state: state.has(ItemName.tails_bazooka, player))
+        add_rule(multiworld.get_location(LocationName.mission_street_animal_14, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+        add_rule(multiworld.get_location(LocationName.hidden_base_animal_14, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+        add_rule(multiworld.get_location(LocationName.eternal_engine_animal_14, player),
+                 lambda state: state.has(ItemName.tails_booster, player) and
+                               state.has(ItemName.tails_bazooka, player))
+        add_rule(multiworld.get_location(LocationName.crazy_gadget_animal_14, player),
+                 lambda state: state.has(ItemName.sonic_flame_ring, player))
+
+        add_rule(multiworld.get_location(LocationName.lost_colony_animal_14, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player) and
+                               state.has(ItemName.eggman_large_cannon, player))
+        add_rule(multiworld.get_location(LocationName.weapons_bed_animal_14, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player) and
+                               state.has(ItemName.eggman_large_cannon, player))
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_animal_14, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+
+        add_rule(multiworld.get_location(LocationName.prison_lane_animal_15, player),
+                 lambda state: state.has(ItemName.tails_booster, player) and
+                               state.has(ItemName.tails_bazooka, player))
+        add_rule(multiworld.get_location(LocationName.mission_street_animal_15, player),
+                 lambda state: state.has(ItemName.tails_booster, player) and
+                               state.has(ItemName.tails_bazooka, player))
+        add_rule(multiworld.get_location(LocationName.hidden_base_animal_15, player),
+                 lambda state: state.has(ItemName.tails_booster, player) and
+                               state.has(ItemName.tails_bazooka, player))
+        add_rule(multiworld.get_location(LocationName.eternal_engine_animal_15, player),
+                 lambda state: state.has(ItemName.tails_booster, player) and
+                               state.has(ItemName.tails_bazooka, player))
+        add_rule(multiworld.get_location(LocationName.crazy_gadget_animal_15, player),
+                 lambda state: state.has(ItemName.sonic_flame_ring, player))
+
+        add_rule(multiworld.get_location(LocationName.iron_gate_animal_15, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+        add_rule(multiworld.get_location(LocationName.sand_ocean_animal_15, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player) and
+                               state.has(ItemName.eggman_large_cannon, player))
+        add_rule(multiworld.get_location(LocationName.weapons_bed_animal_15, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player) and
+                               state.has(ItemName.eggman_large_cannon, player))
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_animal_15, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+
+        add_rule(multiworld.get_location(LocationName.mission_street_animal_16, player),
+                 lambda state: state.has(ItemName.tails_booster, player) and
+                               state.has(ItemName.tails_bazooka, player))
+        add_rule(multiworld.get_location(LocationName.crazy_gadget_animal_16, player),
+                 lambda state: state.has(ItemName.sonic_flame_ring, player))
+        add_rule(multiworld.get_location(LocationName.final_rush_animal_16, player),
+                 lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
+
+        add_rule(multiworld.get_location(LocationName.final_chase_animal_17, player),
+                 lambda state: state.has(ItemName.shadow_flame_ring, player))
+
+        add_rule(multiworld.get_location(LocationName.cannon_core_animal_17, player),
+                 lambda state: state.has(ItemName.eggman_large_cannon, player) or
+                               state.has(ItemName.knuckles_hammer_gloves, player) or
+                               state.has(ItemName.sonic_flame_ring, player))
+
+        add_rule(multiworld.get_location(LocationName.cannon_core_animal_18, player),
+                 lambda state: (state.has(ItemName.eggman_large_cannon, player) and state.has(ItemName.knuckles_hammer_gloves, player)) or
+                               (state.has(ItemName.eggman_large_cannon, player) and state.has(ItemName.sonic_flame_ring, player)) or
+                               (state.has(ItemName.knuckles_hammer_gloves, player)) and state.has(ItemName.sonic_flame_ring, player))
+
+        add_rule(multiworld.get_location(LocationName.pyramid_cave_animal_19, player),
+                 lambda state: state.has(ItemName.sonic_flame_ring, player))
+
+        add_rule(multiworld.get_location(LocationName.cannon_core_animal_19, player),
+                 lambda state: state.has(ItemName.eggman_large_cannon, player) and
+                               state.has(ItemName.knuckles_hammer_gloves, player) and
+                               state.has(ItemName.sonic_flame_ring, player))
+
+        add_rule(multiworld.get_location(LocationName.radical_highway_animal_20, player),
+                 lambda state: state.has(ItemName.shadow_flame_ring, player))
+
+    # Extra Life Box Upgrade Requirements
+    if world.options.itemboxsanity.value > 0:
+        add_rule(multiworld.get_location(LocationName.pumpkin_hill_lifebox_1, player),
+                 lambda state: state.has(ItemName.knuckles_shovel_claws, player))
+        add_rule(multiworld.get_location(LocationName.hidden_base_lifebox_1, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+        add_rule(multiworld.get_location(LocationName.eternal_engine_lifebox_1, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+
+        add_rule(multiworld.get_location(LocationName.iron_gate_lifebox_1, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+        add_rule(multiworld.get_location(LocationName.dry_lagoon_lifebox_1, player),
+                 lambda state: state.has(ItemName.rouge_treasure_scope, player))
+        add_rule(multiworld.get_location(LocationName.egg_quarters_lifebox_1, player),
+                 lambda state: state.has(ItemName.rouge_iron_boots, player))
+        add_rule(multiworld.get_location(LocationName.weapons_bed_lifebox_1, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+        add_rule(multiworld.get_location(LocationName.security_hall_lifebox_1, player),
+                 lambda state: state.has(ItemName.rouge_treasure_scope, player))
+        add_rule(multiworld.get_location(LocationName.mad_space_lifebox_1, player),
+                 lambda state: state.has(ItemName.rouge_treasure_scope, player))
+
+        add_rule(multiworld.get_location(LocationName.mission_street_lifebox_2, player),
+                 lambda state: (state.has(ItemName.tails_booster, player) and
+                                state.has(ItemName.tails_mystic_melody, player)))
+        add_rule(multiworld.get_location(LocationName.eternal_engine_lifebox_2, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+
+        add_rule(multiworld.get_location(LocationName.iron_gate_lifebox_2, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+        add_rule(multiworld.get_location(LocationName.dry_lagoon_lifebox_2, player),
+                 lambda state: state.has(ItemName.rouge_treasure_scope, player))
+        add_rule(multiworld.get_location(LocationName.sand_ocean_lifebox_2, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+        add_rule(multiworld.get_location(LocationName.egg_quarters_lifebox_2, player),
+                 lambda state: state.has(ItemName.rouge_treasure_scope, player))
+
+        add_rule(multiworld.get_location(LocationName.meteor_herd_lifebox_3, player),
+                 lambda state: state.has(ItemName.knuckles_sunglasses, player))
+
+        add_rule(multiworld.get_location(LocationName.sand_ocean_lifebox_3, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+        add_rule(multiworld.get_location(LocationName.mad_space_lifebox_3, player),
+                 lambda state: state.has(ItemName.rouge_treasure_scope, player))
+
+        add_rule(multiworld.get_location(LocationName.final_rush_lifebox_13, player),
+                 lambda state: state.has(ItemName.sonic_mystic_melody, player))
+
+    # Item Box Upgrade Requirements
+    if world.options.itemboxsanity.value == 2:
+        add_rule(multiworld.get_location(LocationName.eternal_engine_itembox_1, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+
+        add_rule(multiworld.get_location(LocationName.weapons_bed_itembox_1, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+
+        add_rule(multiworld.get_location(LocationName.hidden_base_itembox_2, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+        add_rule(multiworld.get_location(LocationName.eternal_engine_itembox_2, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+
+        add_rule(multiworld.get_location(LocationName.egg_quarters_itembox_2, player),
+                 lambda state: state.has(ItemName.rouge_iron_boots, player))
+        add_rule(multiworld.get_location(LocationName.weapons_bed_itembox_2, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+        add_rule(multiworld.get_location(LocationName.mad_space_itembox_2, player),
+                 lambda state: state.has(ItemName.rouge_treasure_scope, player))
+
+        add_rule(multiworld.get_location(LocationName.cannon_core_itembox_2, player),
+                 lambda state: (state.has(ItemName.eggman_mystic_melody, player) and
+                                state.has(ItemName.eggman_jet_engine, player)))
+
+        add_rule(multiworld.get_location(LocationName.hidden_base_itembox_3, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+        add_rule(multiworld.get_location(LocationName.eternal_engine_itembox_3, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+        add_rule(multiworld.get_location(LocationName.meteor_herd_itembox_3, player),
+                 lambda state: state.has(ItemName.knuckles_sunglasses, player))
+
+        add_rule(multiworld.get_location(LocationName.weapons_bed_itembox_3, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_itembox_3, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+
+        add_rule(multiworld.get_location(LocationName.hidden_base_itembox_4, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+        add_rule(multiworld.get_location(LocationName.death_chamber_itembox_4, player),
+                 lambda state: state.has(ItemName.knuckles_sunglasses, player))
+        add_rule(multiworld.get_location(LocationName.eternal_engine_itembox_4, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+
+        add_rule(multiworld.get_location(LocationName.weapons_bed_itembox_4, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_itembox_4, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+
+        add_rule(multiworld.get_location(LocationName.cannon_core_itembox_4, player),
+                 lambda state: (state.has(ItemName.eggman_mystic_melody, player) and
+                                state.has(ItemName.eggman_jet_engine, player) and
+                                state.has(ItemName.rouge_mystic_melody, player)))
+
+        add_rule(multiworld.get_location(LocationName.hidden_base_itembox_5, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+        add_rule(multiworld.get_location(LocationName.eternal_engine_itembox_5, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+
+        add_rule(multiworld.get_location(LocationName.weapons_bed_itembox_5, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+        add_rule(multiworld.get_location(LocationName.mad_space_itembox_5, player),
+                 lambda state: state.has(ItemName.rouge_treasure_scope, player))
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_itembox_5, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+
+        add_rule(multiworld.get_location(LocationName.mission_street_itembox_6, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+        add_rule(multiworld.get_location(LocationName.eternal_engine_itembox_6, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+        add_rule(multiworld.get_location(LocationName.meteor_herd_itembox_6, player),
+                 lambda state: state.has(ItemName.knuckles_sunglasses, player))
+
+        add_rule(multiworld.get_location(LocationName.weapons_bed_itembox_6, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+        add_rule(multiworld.get_location(LocationName.mad_space_itembox_6, player),
+                 lambda state: state.has(ItemName.rouge_treasure_scope, player))
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_itembox_6, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+
+        add_rule(multiworld.get_location(LocationName.cannon_core_itembox_6, player),
+                 lambda state: (state.has(ItemName.eggman_mystic_melody, player) and
+                                state.has(ItemName.eggman_jet_engine, player) and
+                                state.has(ItemName.rouge_mystic_melody, player) and
+                                state.has(ItemName.knuckles_mystic_melody, player)))
+
+        add_rule(multiworld.get_location(LocationName.wild_canyon_itembox_7, player),
+                 lambda state: state.has(ItemName.knuckles_sunglasses, player))
+        add_rule(multiworld.get_location(LocationName.death_chamber_itembox_7, player),
+                 lambda state: state.has(ItemName.knuckles_sunglasses, player))
+        add_rule(multiworld.get_location(LocationName.eternal_engine_itembox_7, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+        add_rule(multiworld.get_location(LocationName.meteor_herd_itembox_7, player),
+                 lambda state: state.has(ItemName.knuckles_sunglasses, player))
+
+        add_rule(multiworld.get_location(LocationName.weapons_bed_itembox_7, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_itembox_7, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+
+        add_rule(multiworld.get_location(LocationName.wild_canyon_itembox_8, player),
+                 lambda state: state.has(ItemName.knuckles_sunglasses, player))
+        add_rule(multiworld.get_location(LocationName.pumpkin_hill_itembox_8, player),
+                 lambda state: state.has(ItemName.knuckles_sunglasses, player))
+        add_rule(multiworld.get_location(LocationName.death_chamber_itembox_8, player),
+                 lambda state: state.has(ItemName.knuckles_sunglasses, player))
+        add_rule(multiworld.get_location(LocationName.eternal_engine_itembox_8, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+
+        add_rule(multiworld.get_location(LocationName.iron_gate_itembox_8, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+        add_rule(multiworld.get_location(LocationName.lost_colony_itembox_8, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_itembox_8, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+
+        add_rule(multiworld.get_location(LocationName.death_chamber_itembox_9, player),
+                 lambda state: state.has(ItemName.knuckles_sunglasses, player))
+        add_rule(multiworld.get_location(LocationName.eternal_engine_itembox_9, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+
+        add_rule(multiworld.get_location(LocationName.lost_colony_itembox_9, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_itembox_9, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+
+        add_rule(multiworld.get_location(LocationName.death_chamber_itembox_10, player),
+                 lambda state: state.has(ItemName.knuckles_sunglasses, player))
+        add_rule(multiworld.get_location(LocationName.eternal_engine_itembox_10, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+
+        add_rule(multiworld.get_location(LocationName.egg_quarters_itembox_10, player),
+                 lambda state: state.has(ItemName.rouge_treasure_scope, player))
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_itembox_10, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+
+        add_rule(multiworld.get_location(LocationName.eternal_engine_itembox_11, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+
+        add_rule(multiworld.get_location(LocationName.egg_quarters_itembox_11, player),
+                 lambda state: (state.has(ItemName.rouge_pick_nails, player) and
+                                state.has(ItemName.rouge_iron_boots, player)))
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_itembox_11, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+
+        add_rule(multiworld.get_location(LocationName.eternal_engine_itembox_12, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+
+        add_rule(multiworld.get_location(LocationName.mad_space_itembox_12, player),
+                 lambda state: state.has(ItemName.rouge_treasure_scope, player))
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_itembox_12, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+
+        add_rule(multiworld.get_location(LocationName.eternal_engine_itembox_13, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+
+        add_rule(multiworld.get_location(LocationName.mad_space_itembox_13, player),
+                 lambda state: state.has(ItemName.rouge_treasure_scope, player))
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_itembox_13, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+
+        add_rule(multiworld.get_location(LocationName.eternal_engine_itembox_14, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_itembox_14, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_itembox_15, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_itembox_16, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_itembox_17, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_itembox_18, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_itembox_19, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_itembox_20, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_itembox_21, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_itembox_22, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_itembox_23, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_itembox_24, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_itembox_25, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_itembox_26, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_itembox_27, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+
+    # Big Upgrade Requirements
+    if world.options.bigsanity:
+        add_rule(multiworld.get_location(LocationName.metal_harbor_big, player),
+                 lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
+        add_rule(multiworld.get_location(LocationName.mission_street_big, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+        add_rule(multiworld.get_location(LocationName.hidden_base_big, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+        add_rule(multiworld.get_location(LocationName.eternal_engine_big, player),
+                 lambda state: state.has(ItemName.tails_booster, player) and
+                               state.has(ItemName.tails_bazooka, player))
+
+        add_rule(multiworld.get_location(LocationName.lost_colony_big, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+        add_rule(multiworld.get_location(LocationName.weapons_bed_big, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+
 
 def set_boss_gate_rules(multiworld: MultiWorld, player: int, gate_bosses: typing.Dict[int, int]):
     for x in range(len(gate_bosses)):
@@ -2210,6 +4297,8 @@ def set_rules(multiworld: MultiWorld, world: World, player: int, gate_bosses: ty
             set_mission_upgrade_rules_standard(multiworld, world, player)
         elif world.options.logic_difficulty.value == 1:
             set_mission_upgrade_rules_hard(multiworld, world, player)
+        elif world.options.logic_difficulty.value == 2:
+            set_mission_upgrade_rules_expert(multiworld, world, player)
 
         for i in range(world.options.black_market_slots.value):
             add_rule(multiworld.get_location(LocationName.chao_black_market_base + str(i + 1), player),
diff --git a/worlds/sa2b/__init__.py b/worlds/sa2b/__init__.py
index f7d1ca72b0..d7c9ceaeba 100644
--- a/worlds/sa2b/__init__.py
+++ b/worlds/sa2b/__init__.py
@@ -8,12 +8,13 @@ from worlds.AutoWorld import WebWorld, World
 from .AestheticData import chao_name_conversion, sample_chao_names, totally_real_item_names, \
                            all_exits, all_destinations, multi_rooms, single_rooms, room_to_exits_map, exit_to_room_map, valid_kindergarten_exits
 from .GateBosses import get_gate_bosses, get_boss_rush_bosses, get_boss_name
-from .Items import SA2BItem, ItemData, item_table, upgrades_table, emeralds_table, junk_table, trap_table, item_groups, \
-                   eggs_table, fruits_table, seeds_table, hats_table, animals_table, chaos_drives_table
-from .Locations import SA2BLocation, all_locations, setup_locations, chao_animal_event_location_table, black_market_location_table
-from .Missions import get_mission_table, get_mission_count_table, get_first_and_last_cannons_core_missions
+from .Items import SA2BItem, ItemData, item_table, upgrades_table, emeralds_table, junk_table, minigame_trap_table, item_groups, \
+                   eggs_table, fruits_table, seeds_table, hats_table, animals_table, chaos_drives_table, event_table
+from .Locations import SA2BLocation, all_locations, location_groups, setup_locations, chao_animal_event_location_table, black_market_location_table
+from .Missions import get_mission_table, get_mission_count_table, get_first_and_last_cannons_core_missions, print_mission_orders_to_spoiler
 from .Names import ItemName, LocationName
 from .Options import SA2BOptions, sa2b_option_groups
+from .Presets import sa2b_options_presets
 from .Regions import create_regions, shuffleable_regions, connect_regions, LevelGate, gate_0_whitelist_regions, \
     gate_0_blacklist_regions
 from .Rules import set_rules
@@ -33,6 +34,7 @@ class SA2BWeb(WebWorld):
 
     tutorials = [setup_en]
     option_groups = sa2b_option_groups
+    options_presets = sa2b_options_presets
 
 
 def check_for_impossible_shuffle(shuffled_levels: typing.List[int], gate_0_range: int, multiworld: MultiWorld):
@@ -60,11 +62,14 @@ class SA2BWorld(World):
     topology_present = False
 
     item_name_groups = item_groups
+    location_name_groups = location_groups
     item_name_to_id = {name: data.code for name, data in item_table.items()}
     location_name_to_id = all_locations
 
     location_table: typing.Dict[str, int]
 
+    shuffled_region_list: typing.List[int]
+    levels_per_gate: typing.List[int]
     mission_map: typing.Dict[int, int]
     mission_count_map: typing.Dict[int, int]
     emblems_for_cannons_core: int
@@ -78,7 +83,7 @@ class SA2BWorld(World):
 
     def fill_slot_data(self) -> dict:
         return {
-            "ModVersion": 203,
+            "ModVersion": 204,
             "Goal": self.options.goal.value,
             "MusicMap": self.generate_music_data(),
             "VoiceMap": self.generate_voice_data(),
@@ -89,14 +94,20 @@ class SA2BWorld(World):
             "MusicShuffle": self.options.music_shuffle.value,
             "Narrator": self.options.narrator.value,
             "MinigameTrapDifficulty": self.options.minigame_trap_difficulty.value,
+            "BigFishingDifficulty": self.options.big_fishing_difficulty.value,
             "RingLoss": self.options.ring_loss.value,
             "RingLink": self.options.ring_link.value,
+            "TrapLink": self.options.trap_link.value,
             "RequiredRank": self.options.required_rank.value,
+            "MinigameMadnessAmount": self.options.minigame_madness_requirement.value,
+            "LogicDifficulty": self.options.logic_difficulty.value,
             "ChaoKeys": self.options.keysanity.value,
             "Whistlesanity": self.options.whistlesanity.value,
             "GoldBeetles": self.options.beetlesanity.value,
             "OmochaoChecks": self.options.omosanity.value,
             "AnimalChecks": self.options.animalsanity.value,
+            "ItemBoxChecks": self.options.itemboxsanity.value,
+            "BigChecks": self.options.bigsanity.value,
             "KartRaceChecks": self.options.kart_race_checks.value,
             "ChaoStadiumChecks": self.options.chao_stadium_checks.value,
             "ChaoRaceDifficulty": self.options.chao_race_difficulty.value,
@@ -122,6 +133,7 @@ class SA2BWorld(World):
             "GateCosts": self.gate_costs,
             "GateBosses": self.gate_bosses,
             "BossRushMap": self.boss_rush_map,
+            "ActiveTraps": self.output_active_traps(),
             "PlayerNum": self.player,
         }
 
@@ -151,12 +163,42 @@ class SA2BWorld(World):
 
             valid_trap_weights = self.options.exposition_trap_weight.value + \
                                  self.options.reverse_trap_weight.value + \
-                                 self.options.pong_trap_weight.value
+                                 self.options.literature_trap_weight.value + \
+                                 self.options.controller_drift_trap_weight.value + \
+                                 self.options.poison_trap_weight.value + \
+                                 self.options.bee_trap_weight.value + \
+                                 self.options.pong_trap_weight.value + \
+                                 self.options.breakout_trap_weight.value + \
+                                 self.options.fishing_trap_weight.value + \
+                                 self.options.trivia_trap_weight.value + \
+                                 self.options.pokemon_trivia_trap_weight.value + \
+                                 self.options.pokemon_count_trap_weight.value + \
+                                 self.options.number_sequence_trap_weight.value + \
+                                 self.options.light_up_path_trap_weight.value + \
+                                 self.options.pinball_trap_weight.value + \
+                                 self.options.math_quiz_trap_weight.value + \
+                                 self.options.snake_trap_weight.value + \
+                                 self.options.input_sequence_trap_weight.value
 
             if valid_trap_weights == 0:
                 self.options.exposition_trap_weight.value = 4
                 self.options.reverse_trap_weight.value = 4
+                self.options.literature_trap_weight.value = 4
+                self.options.controller_drift_trap_weight.value = 4
+                self.options.poison_trap_weight.value = 4
+                self.options.bee_trap_weight.value = 4
                 self.options.pong_trap_weight.value = 4
+                self.options.breakout_trap_weight.value = 4
+                self.options.fishing_trap_weight.value = 4
+                self.options.trivia_trap_weight.value = 4
+                self.options.pokemon_trivia_trap_weight.value = 4
+                self.options.pokemon_count_trap_weight.value = 4
+                self.options.number_sequence_trap_weight.value = 4
+                self.options.light_up_path_trap_weight.value = 4
+                self.options.pinball_trap_weight.value = 4
+                self.options.math_quiz_trap_weight.value = 4
+                self.options.snake_trap_weight.value = 4
+                self.options.input_sequence_trap_weight.value = 4
 
             if self.options.kart_race_checks.value == 0:
                 self.options.kart_race_checks.value = 2
@@ -164,8 +206,8 @@ class SA2BWorld(World):
             self.gate_bosses = {}
             self.boss_rush_map = {}
         else:
-            self.gate_bosses   = get_gate_bosses(self.multiworld, self)
-            self.boss_rush_map = get_boss_rush_bosses(self.multiworld, self)
+            self.gate_bosses   = get_gate_bosses(self)
+            self.boss_rush_map = get_boss_rush_bosses(self)
 
     def create_regions(self):
         self.mission_map       = get_mission_table(self.multiworld, self, self.player)
@@ -177,7 +219,7 @@ class SA2BWorld(World):
         # Not Generate Basic
         self.black_market_costs = dict()
 
-        if self.options.goal.value in [0, 2, 4, 5, 6]:
+        if self.options.goal.value in [0, 2, 4, 5, 6, 8]:
             self.multiworld.get_location(LocationName.finalhazard, self.player).place_locked_item(self.create_item(ItemName.maria))
         elif self.options.goal.value == 1:
             self.multiworld.get_location(LocationName.green_hill, self.player).place_locked_item(self.create_item(ItemName.maria))
@@ -202,7 +244,7 @@ class SA2BWorld(World):
         if self.options.goal.value != 3:
             # Fill item pool with all required items
             for item in {**upgrades_table}:
-                itempool += [self.create_item(item, False, self.options.goal.value)]
+                itempool += [self.create_item(item, None, self.options.goal.value)]
 
             if self.options.goal.value in [1, 2, 6]:
                 # Some flavor of Chaos Emerald Hunt
@@ -212,6 +254,25 @@ class SA2BWorld(World):
             # Black Market
             itempool += [self.create_item(ItemName.market_token) for _ in range(self.options.black_market_slots.value)]
 
+            if self.options.goal.value in [8]:
+                available_locations: int = total_required_locations - len(itempool) - self.options.number_of_level_gates.value
+
+                while (self.options.minigame_madness_requirement.value * len(minigame_trap_table)) > available_locations:
+                    self.options.minigame_madness_requirement.value -= 1
+
+                while (self.options.minigame_madness_minimum.value * len(minigame_trap_table)) > available_locations:
+                    self.options.minigame_madness_minimum.value -= 1
+
+                traps_to_create: int = max(self.options.minigame_madness_minimum.value, self.options.minigame_madness_requirement.value)
+
+                # Minigame Madness
+                for item in {**minigame_trap_table}:
+                    for i in range(traps_to_create):
+                        classification: ItemClassification = ItemClassification.trap
+                        if i < self.options.minigame_madness_requirement.value:
+                            classification |= ItemClassification.progression
+                        itempool.append(self.create_item(item, classification))
+
             black_market_unlock_mult = 1.0
             if self.options.black_market_unlock_costs.value == 0:
                 black_market_unlock_mult = 0.5
@@ -235,12 +296,12 @@ class SA2BWorld(World):
         elif self.options.level_gate_costs.value == 1:
             gate_cost_mult = 0.8
 
-        shuffled_region_list = list(range(30))
+        self.shuffled_region_list = list(range(30))
         emblem_requirement_list = list()
-        self.multiworld.random.shuffle(shuffled_region_list)
-        levels_per_gate = self.get_levels_per_gate()
+        self.multiworld.random.shuffle(self.shuffled_region_list)
+        self.levels_per_gate = self.get_levels_per_gate()
 
-        check_for_impossible_shuffle(shuffled_region_list, math.ceil(levels_per_gate[0]), self.multiworld)
+        check_for_impossible_shuffle(self.shuffled_region_list, math.ceil(self.levels_per_gate[0]), self.multiworld)
         levels_added_to_gate = 0
         total_levels_added = 0
         current_gate = 0
@@ -250,11 +311,11 @@ class SA2BWorld(World):
         gates = list()
         gates.append(LevelGate(0))
         for i in range(30):
-            gates[current_gate].gate_levels.append(shuffled_region_list[i])
+            gates[current_gate].gate_levels.append(self.shuffled_region_list[i])
             emblem_requirement_list.append(current_gate_emblems)
             levels_added_to_gate += 1
             total_levels_added += 1
-            if levels_added_to_gate >= levels_per_gate[current_gate]:
+            if levels_added_to_gate >= self.levels_per_gate[current_gate]:
                 current_gate += 1
                 if current_gate > self.options.number_of_level_gates.value:
                     current_gate = self.options.number_of_level_gates.value
@@ -265,18 +326,19 @@ class SA2BWorld(World):
                     self.gate_costs[current_gate] = current_gate_emblems
                 levels_added_to_gate = 0
 
-        self.region_emblem_map = dict(zip(shuffled_region_list, emblem_requirement_list))
+        self.region_emblem_map = dict(zip(self.shuffled_region_list, emblem_requirement_list))
 
         first_cannons_core_mission, final_cannons_core_mission = get_first_and_last_cannons_core_missions(self.mission_map, self.mission_count_map)
 
         connect_regions(self.multiworld, self, self.player, gates, self.emblems_for_cannons_core, self.gate_bosses, self.boss_rush_map, first_cannons_core_mission, final_cannons_core_mission)
 
         max_required_emblems = max(max(emblem_requirement_list), self.emblems_for_cannons_core)
+        max_required_emblems = min(int(max_required_emblems * 1.1), total_emblem_count)
         itempool += [self.create_item(ItemName.emblem) for _ in range(max_required_emblems)]
 
         non_required_emblems = (total_emblem_count - max_required_emblems)
         junk_count = math.floor(non_required_emblems * (self.options.junk_fill_percentage.value / 100.0))
-        itempool += [self.create_item(ItemName.emblem, True) for _ in range(non_required_emblems - junk_count)]
+        itempool += [self.create_item(ItemName.emblem, ItemClassification.filler) for _ in range(non_required_emblems - junk_count)]
 
         # Carve Traps out of junk_count
         trap_weights = []
@@ -291,7 +353,22 @@ class SA2BWorld(World):
         trap_weights += ([ItemName.slow_trap] * self.options.slow_trap_weight.value)
         trap_weights += ([ItemName.cutscene_trap] * self.options.cutscene_trap_weight.value)
         trap_weights += ([ItemName.reverse_trap] * self.options.reverse_trap_weight.value)
+        trap_weights += ([ItemName.literature_trap] * self.options.literature_trap_weight.value)
+        trap_weights += ([ItemName.controller_drift_trap] * self.options.controller_drift_trap_weight.value)
+        trap_weights += ([ItemName.poison_trap] * self.options.poison_trap_weight.value)
+        trap_weights += ([ItemName.bee_trap] * self.options.bee_trap_weight.value)
         trap_weights += ([ItemName.pong_trap] * self.options.pong_trap_weight.value)
+        trap_weights += ([ItemName.breakout_trap] * self.options.breakout_trap_weight.value)
+        trap_weights += ([ItemName.fishing_trap] * self.options.fishing_trap_weight.value)
+        trap_weights += ([ItemName.trivia_trap] * self.options.trivia_trap_weight.value)
+        trap_weights += ([ItemName.pokemon_trivia_trap] * self.options.pokemon_trivia_trap_weight.value)
+        trap_weights += ([ItemName.pokemon_count_trap] * self.options.pokemon_count_trap_weight.value)
+        trap_weights += ([ItemName.number_sequence_trap] * self.options.number_sequence_trap_weight.value)
+        trap_weights += ([ItemName.light_up_path_trap] * self.options.light_up_path_trap_weight.value)
+        trap_weights += ([ItemName.pinball_trap] * self.options.pinball_trap_weight.value)
+        trap_weights += ([ItemName.math_quiz_trap] * self.options.math_quiz_trap_weight.value)
+        trap_weights += ([ItemName.snake_trap] * self.options.snake_trap_weight.value)
+        trap_weights += ([ItemName.input_sequence_trap] * self.options.input_sequence_trap_weight.value)
 
         junk_count += extra_junk_count
         trap_count = 0 if (len(trap_weights) == 0) else math.ceil(junk_count * (self.options.trap_fill_percentage.value / 100.0))
@@ -347,11 +424,15 @@ class SA2BWorld(World):
 
 
 
-    def create_item(self, name: str, force_non_progression=False, goal=0) -> Item:
-        data = item_table[name]
+    def create_item(self, name: str, force_classification=None, goal=0) -> Item:
+        data = None
+        if name in event_table:
+            data = event_table[name]
+        else:
+            data = item_table[name]
 
-        if force_non_progression:
-            classification = ItemClassification.filler
+        if force_classification is not None:
+            classification = force_classification
         elif name == ItemName.emblem or \
              name in emeralds_table.keys() or \
              (name == ItemName.knuckles_shovel_claws and goal in [4, 5]):
@@ -380,9 +461,16 @@ class SA2BWorld(World):
         set_rules(self.multiworld, self, self.player, self.gate_bosses, self.boss_rush_map, self.mission_map, self.mission_count_map, self.black_market_costs)
 
     def write_spoiler(self, spoiler_handle: typing.TextIO):
+        print_mission_orders_to_spoiler(self.mission_map,
+                                        self.mission_count_map,
+                                        self.shuffled_region_list,
+                                        self.levels_per_gate,
+                                        self.multiworld.player_name[self.player],
+                                        spoiler_handle)
+
         if self.options.number_of_level_gates.value > 0 or self.options.goal.value in [4, 5, 6]:
             spoiler_handle.write("\n")
-            header_text = "Sonic Adventure 2 Bosses for {}:\n"
+            header_text = "SA2 Bosses for {}:\n"
             header_text = header_text.format(self.multiworld.player_name[self.player])
             spoiler_handle.write(header_text)
 
@@ -435,20 +523,20 @@ class SA2BWorld(World):
                     continue
                 level_region = exit.connected_region
                 for location in level_region.locations:
-                    er_hint_data[location.address] = gate_name
+                    if location.address != None:
+                        er_hint_data[location.address] = gate_name
 
         for i in range(self.options.black_market_slots.value):
             location = self.multiworld.get_location(LocationName.chao_black_market_base + str(i + 1), self.player)
             er_hint_data[location.address] = str(self.black_market_costs[i]) + " " + str(ItemName.market_token)
 
-
         hint_data[self.player] = er_hint_data
 
     @classmethod
     def stage_fill_hook(cls, multiworld: MultiWorld, progitempool, usefulitempool, filleritempool, fill_locations):
         if multiworld.get_game_players("Sonic Adventure 2 Battle"):
             progitempool.sort(
-                key=lambda item: 0 if (item.name != 'Emblem') else 1)
+                key=lambda item: 0 if ("Emblem" in item.name and item.game == "Sonic Adventure 2 Battle") else 1)
 
     def get_levels_per_gate(self) -> list:
         levels_per_gate = list()
@@ -486,6 +574,39 @@ class SA2BWorld(World):
 
         return levels_per_gate
 
+    def output_active_traps(self) -> typing.Dict[int, int]:
+        trap_data = {}
+
+        trap_data[0x30] = self.options.omochao_trap_weight.value
+        trap_data[0x31] = self.options.timestop_trap_weight.value
+        trap_data[0x32] = self.options.confusion_trap_weight.value
+        trap_data[0x33] = self.options.tiny_trap_weight.value
+        trap_data[0x34] = self.options.gravity_trap_weight.value
+        trap_data[0x35] = self.options.exposition_trap_weight.value
+        trap_data[0x37] = self.options.ice_trap_weight.value
+        trap_data[0x38] = self.options.slow_trap_weight.value
+        trap_data[0x39] = self.options.cutscene_trap_weight.value
+        trap_data[0x3A] = self.options.reverse_trap_weight.value
+        trap_data[0x3B] = self.options.literature_trap_weight.value
+        trap_data[0x3C] = self.options.controller_drift_trap_weight.value
+        trap_data[0x3D] = self.options.poison_trap_weight.value
+        trap_data[0x3E] = self.options.bee_trap_weight.value
+
+        trap_data[0x50] = self.options.pong_trap_weight.value
+        trap_data[0x51] = self.options.breakout_trap_weight.value
+        trap_data[0x52] = self.options.fishing_trap_weight.value
+        trap_data[0x53] = self.options.trivia_trap_weight.value
+        trap_data[0x54] = self.options.pokemon_trivia_trap_weight.value
+        trap_data[0x55] = self.options.pokemon_count_trap_weight.value
+        trap_data[0x56] = self.options.number_sequence_trap_weight.value
+        trap_data[0x57] = self.options.light_up_path_trap_weight.value
+        trap_data[0x58] = self.options.pinball_trap_weight.value
+        trap_data[0x59] = self.options.math_quiz_trap_weight.value
+        trap_data[0x5A] = self.options.snake_trap_weight.value
+        trap_data[0x5B] = self.options.input_sequence_trap_weight.value
+
+        return trap_data
+
     def any_chao_locations_active(self) -> bool:
         if self.options.chao_race_difficulty.value > 0 or \
            self.options.chao_karate_difficulty.value > 0 or \
@@ -686,7 +807,6 @@ class SA2BWorld(World):
         exit_choice = self.random.choice(valid_kindergarten_exits)
         exit_room = exit_to_room_map[exit_choice]
         all_exits_copy.remove(exit_choice)
-        multi_rooms_copy.remove(exit_room)
 
         destination = 0x06
         single_rooms_copy.remove(destination)
@@ -723,7 +843,8 @@ class SA2BWorld(World):
 
             er_layout[exit_choice] = destination
 
-            reverse_exit = self.random.choice(room_to_exits_map[destination])
+            possible_reverse_exits = [exit for exit in room_to_exits_map[destination] if exit in all_exits_copy]
+            reverse_exit = self.random.choice(possible_reverse_exits)
 
             er_layout[reverse_exit] = exit_room
 
diff --git a/worlds/sc2/Client.py b/worlds/sc2/Client.py
index 813cf28845..77b13a5acb 100644
--- a/worlds/sc2/Client.py
+++ b/worlds/sc2/Client.py
@@ -1625,6 +1625,6 @@ def get_location_offset(mission_id):
 
 
 def launch():
-    colorama.init()
+    colorama.just_fix_windows_console()
     asyncio.run(main())
     colorama.deinit()
diff --git a/worlds/sc2/docs/en_Starcraft 2.md b/worlds/sc2/docs/en_Starcraft 2.md
index 813fdb5f4a..e860e8a6b6 100644
--- a/worlds/sc2/docs/en_Starcraft 2.md	
+++ b/worlds/sc2/docs/en_Starcraft 2.md	
@@ -1,10 +1,13 @@
 # StarCraft 2
 
 ## Game page in other languages:
+
 * [Français](/games/Starcraft%202/info/fr)
 
 ## What does randomization do to this game?
 
+### Items and locations
+
 The following unlocks are randomized as items:
 1. Your ability to build any non-worker unit.
 2. Unit specific upgrades including some combinations not available in the vanilla campaigns, such as both strain 
@@ -34,18 +37,28 @@ When you receive items, they will immediately become available, even during a mi
 notified via a text box in the top-right corner of the game screen. 
 Item unlocks are also logged in the Archipelago client.
 
+### Mission order
+
+The missions and the order in which they need to be completed, referred to as the mission order, can also be randomized.
+The four StarCraft 2 campaigns can be used to populate the mission order. 
+Note that the evolution missions from Heart of the Swarm are not included in the randomizer.
+The default mission order follows the structure of the selected campaigns but several other options are available, 
+e.g., blitz, grid, etc.
+
 Missions are launched through the StarCraft 2 Archipelago client, through the StarCraft 2 Launcher tab. 
 The between mission segments on the Hyperion, the Leviathan, and the Spear of Adun are not included. 
 Additionally, metaprogression currencies such as credits and Solarite are not used.
+Available missions are in blue; missions where all locations were collected are in white.
+If you move your mouse over a mission, the uncollected locations will be displayed, categorized by type.
+Unavailable missions are in grey; their requirements will also be shown there.
 
 ## What is the goal of this game when randomized?
 
 The goal is to beat the final mission in the mission order. 
-The yaml configuration file controls the mission order (e.g. blitz, grid, etc.), which combination of the four 
-StarCraft 2 campaigns can be used to populate the mission order and how missions are shuffled. 
+The yaml configuration file controls the mission order, which combination of the four StarCraft 2 campaigns can be 
+used, and how missions are shuffled. 
 Since the first two options determine the number of missions in a StarCraft 2 world, they can be used to customize the 
 expected time to complete the world. 
-Note that the evolution missions from Heart of the Swarm are not included in the randomizer.
 
 ## What non-randomized changes are there from vanilla StarCraft 2?
 
@@ -78,9 +91,7 @@ Will overwrite existing files
 * `/game_speed [game_speed]` Overrides the game speed for the world
     * Options: default, slower, slow, normal, fast, faster
 * `/color [faction] [color]` Changes your color for one of your playable factions.
-    * Faction options: raynor, kerrigan, primal, protoss, nova
-    * Color options: white, red, blue, teal, purple, yellow, orange, green, lightpink, violet, lightgrey, darkgreen, 
-    brown, lightgreen, darkgrey, pink, rainbow, random, default
+    * Run without arguments to list all factions and colors that are available.
 * `/option [option_name] [option_value]` Sets an option normally controlled by your yaml after generation.
     * Run without arguments to list all options.
     * Options pertain to automatic cutscene skipping, Kerrigan presence, Spear of Adun presence, starting resource 
@@ -100,6 +111,19 @@ Additionally, upgrades are grouped beneath their corresponding units or building
 A filter parameter can be provided, e.g., `/received Thor`, to limit the number of items shown.
 Every item whose name, race, or group name contains the provided parameter will be shown.
 
+## Particularities in a multiworld
+
+### Collect on goal completion
+
+One of the default options of multiworlds is that once a world has achieved its goal, it collects its items from all 
+other worlds. 
+If you do not want this to happen, you should ask the person generating the multiworld to set the `Collect Permission` 
+option to something else, e.g., manual. 
+If the generation is not done via the website, the person that does the generation should modify the `collect_mode` 
+option in their `host.yaml` file prior to generation. 
+If the multiworld has already been generated, the host can use the command `/option collect_mode [value]` to change 
+this option.
+
 ## Known issues
 
 - StarCraft 2 Archipelago does not support loading a saved game. 
@@ -108,3 +132,7 @@ For this reason, it is recommended to play on a difficulty level lower than what
 To restart a mission, use the StarCraft 2 Client.
 - A crash report is often generated when a mission is closed. 
 This does not affect the game and can be ignored.
+- Currently, the StarCraft 2 client uses the Victory locations to determine which missions have been completed. 
+As a result, the Archipelago collect feature can sometime grant access to missions that are connected to a mission that 
+you did not complete.
+
diff --git a/worlds/sc2/docs/fr_Starcraft 2.md b/worlds/sc2/docs/fr_Starcraft 2.md
index 092835c8e3..190802e91b 100644
--- a/worlds/sc2/docs/fr_Starcraft 2.md	
+++ b/worlds/sc2/docs/fr_Starcraft 2.md	
@@ -2,6 +2,8 @@
 
 ## Quel est l'effet de la *randomization* sur ce jeu ?
 
+### *Items* et *locations*
+
 Les éléments qui suivent sont les *items* qui sont *randomized* et qui doivent être débloqués pour être utilisés dans 
 le jeu:
 1. La capacité de produire des unités, excepté les drones/probes/scv.
@@ -37,21 +39,33 @@ Quand vous recevez un *item*, il devient immédiatement disponible, même pendan
 la boîte de texte situé dans le coin en haut à droite de *StarCraft 2*.
 L'acquisition d'un *item* est aussi indiquée dans le client d'Archipelago.
 
+### *Mission order*
+
+Les missions et l'ordre dans lequel elles doivent être complétées, dénoté *mission order*, peuvent également être 
+*randomized*.
+Les quatre campagnes de *StarCraft 2* peuvent être utilisées pour remplir le *mission order*.
+Notez que les missions d'évolution de *Heart of the Swarm* ne sont pas incluses dans le *randomizer*.
+Par défaut, le *mission order* suit la structure des campagnes sélectionnées, mais plusieurs autres options sont 
+disponibles, comme *blitz*, *grid*, etc.
+
 Les missions peuvent être lancées par le client *StarCraft 2 Archipelago*, via l'interface graphique de l'onglet 
 *StarCraft 2 Launcher*.
 Les segments qui se passent sur l'*Hyperion*, un Léviathan et la *Spear of Adun* ne sont pas inclus.
-De plus, les points de progression tels que les crédits ou la Solarite ne sont pas utilisés dans *StarCraft 2 
+De plus, les points de progression, tels que les crédits ou la Solarite, ne sont pas utilisés dans *StarCraft 2 
 Archipelago*.
+Les missions accessibles ont leur nom en bleu, tandis que celles où toutes les *locations* ont été collectées 
+apparaissent en blanc.
+En plaçant votre souris sur une mission, les *locations* non collectées s’affichent, classées par catégorie.
+Les missions qui ne sont pas accessibles ont leur nom en gris et leurs prérequis seront également affichés à cet endroit.
+
 
 ## Quel est le but de ce jeu quand il est *randomized*?
 
 Le but est de réussir la mission finale du *mission order* (e.g. *blitz*, *grid*, etc.).
-Le fichier de configuration yaml permet de spécifier le *mission order*, lesquelles des quatre campagnes de 
-*StarCraft 2* peuvent être utilisées pour remplir le *mission order* et comment les missions sont distribuées dans le 
-*mission order*. 
+Le fichier de configuration yaml permet de spécifier le *mission order*, quelle combinaison des quatre campagnes de 
+*StarCraft 2* peuvent être utilisée et comment les missions sont distribuées dans le *mission order*. 
 Étant donné que les deux premières options déterminent le nombre de missions dans un monde de *StarCraft 2*, elles 
 peuvent être utilisées pour moduler le temps nécessaire pour terminer le monde. 
-Notez que les missions d'évolution de Heart of the Swarm ne sont pas incluses dans le *randomizer*.
 
 ## Quelles sont les modifications non aléatoires comparativement à la version de base de *StarCraft 2*
 
@@ -89,9 +103,7 @@ Les fichiers existants vont être écrasés.
 * `/game_speed [game_speed]` Remplace la vitesse du jeu pour le monde.  
     * Les options sont *default*, *slower*, *slow*, *normal*, *fast*, and *faster*.
 * `/color [faction] [color]` Remplace la couleur d'une des *factions* qui est jouable. 
-    * Les options de *faction*: raynor, kerrigan, primal, protoss, nova.
-    * Les options de couleur: *white*, *red*, *blue*, *teal*, *purple*, *yellow*, *orange*, *green*, *lightpink*, 
-*violet*, *lightgrey*, *darkgreen*, *brown*, *lightgreen*, *darkgrey*, *pink*, *rainbow*, *random*, *default*.
+    * Si la commande est lancée sans option, la liste des *factions* et des couleurs disponibles sera affichée.
 * `/option [option_name] [option_value]` Permet de changer un option normalement définit dans le *yaml*. 
     * Si la commande est lancée sans option, la liste des options qui sont modifiables va être affichée.
     * Les options qui peuvent être changées avec cette commande incluent sauter les cinématiques  automatiquement, la 
@@ -114,6 +126,19 @@ De plus, les améliorations sont regroupées sous leurs unités/bâtiments corre
 Un paramètre de filtrage peut aussi être fourni, e.g., `/received Thor`, pour limiter le nombre d'*items* affichés.
 Tous les *items* dont le nom, la race ou le nom de groupe contient le paramètre fourni seront affichés.
 
+## Particularités dans un multiworld
+
+### *Collect on goal completion*
+
+L'une des options par défaut des *multiworlds* est qu'une fois qu'un monde a atteint son objectif final, il collecte 
+tous ses *items*, incluant ceux dans les autres mondes.
+Si vous ne souhaitez pas que cela se produise, vous devez demander à la personne générant le *multiworld* de changer 
+l'option *Collect Permission*.
+Si la génération n'est pas effectuée via le site web, la personne qui effectue la génération doit modifier l'option 
+`collect_mode` dans son fichier *host.yaml* avant la génération.
+Si le *multiworld* a déjà été généré, l'hôte peut utiliser la commande `/option collect_mode [valeur]` pour modifier 
+cette option.
+
 ## Problèmes connus
 
 - *StarCraft 2 Archipelago* ne supporte pas le chargement d'une sauvegarde. 
@@ -123,3 +148,7 @@ normalement à l'aise.
 Pour redémarrer une mission, utilisez le client de *StarCraft 2 Archipelago*.
 - Un rapport d'erreur est souvent généré lorsqu'une mission est fermée. 
 Cela n'affecte pas le jeu et peut être ignoré.
+- Actuellement, le client de *StarCraft 2* utilise la *location* associée à la victoire d'une mission pour déterminer 
+si celle-ci a été complétée.
+En conséquence, la fonctionnalité *collect* d'*Archipelago* peut rendre accessible des missions connectées à une 
+mission que vous n'avez pas terminée.
\ No newline at end of file
diff --git a/worlds/sc2/docs/setup_en.md b/worlds/sc2/docs/setup_en.md
index 5b378873f4..4364008b58 100644
--- a/worlds/sc2/docs/setup_en.md
+++ b/worlds/sc2/docs/setup_en.md
@@ -41,6 +41,7 @@ Remember the name you enter in the options page or in the yaml file, you'll need
 Check out [Creating a YAML](/tutorial/Archipelago/setup/en#creating-a-yaml) for more game-agnostic information.
 
 ### Common yaml questions
+
 #### How do I know I set my yaml up correctly?
 
 The simplest way to check is to use the website [validator](/check). 
diff --git a/worlds/sc2/docs/setup_fr.md b/worlds/sc2/docs/setup_fr.md
index d9b754572a..7cdb7225b4 100644
--- a/worlds/sc2/docs/setup_fr.md
+++ b/worlds/sc2/docs/setup_fr.md
@@ -49,6 +49,7 @@ Si vous désirez des informations et/ou instructions générales sur l'utilisati
 veuillez consulter [*Creating a YAML*](/tutorial/Archipelago/setup/en#creating-a-yaml).
 
 ### Questions récurrentes à propos du fichier *yaml*
+
 #### Comment est-ce que je sais que mon *yaml* est bien défini?
 
 La manière la plus simple de valider votre *yaml* est d'utiliser le 
diff --git a/worlds/stardew_valley/__init__.py b/worlds/stardew_valley/__init__.py
index fe69030882..83a1c11c18 100644
--- a/worlds/stardew_valley/__init__.py
+++ b/worlds/stardew_valley/__init__.py
@@ -214,67 +214,67 @@ class StardewValleyWorld(World):
     def setup_victory(self):
         if self.options.goal == Goal.option_community_center:
             self.create_event_location(location_table[GoalName.community_center],
-                                       self.logic.bundle.can_complete_community_center,
+                                       self.logic.goal.can_complete_community_center(),
                                        Event.victory)
         elif self.options.goal == Goal.option_grandpa_evaluation:
             self.create_event_location(location_table[GoalName.grandpa_evaluation],
-                                       self.logic.can_finish_grandpa_evaluation(),
+                                       self.logic.goal.can_finish_grandpa_evaluation(),
                                        Event.victory)
         elif self.options.goal == Goal.option_bottom_of_the_mines:
             self.create_event_location(location_table[GoalName.bottom_of_the_mines],
-                                       True_(),
+                                       self.logic.goal.can_complete_bottom_of_the_mines(),
                                        Event.victory)
         elif self.options.goal == Goal.option_cryptic_note:
             self.create_event_location(location_table[GoalName.cryptic_note],
-                                       self.logic.quest.can_complete_quest("Cryptic Note"),
+                                       self.logic.goal.can_complete_cryptic_note(),
                                        Event.victory)
         elif self.options.goal == Goal.option_master_angler:
             self.create_event_location(location_table[GoalName.master_angler],
-                                       self.logic.fishing.can_catch_every_fish_for_fishsanity(),
+                                       self.logic.goal.can_complete_master_angler(),
                                        Event.victory)
         elif self.options.goal == Goal.option_complete_collection:
             self.create_event_location(location_table[GoalName.complete_museum],
-                                       self.logic.museum.can_complete_museum(),
+                                       self.logic.goal.can_complete_complete_collection(),
                                        Event.victory)
         elif self.options.goal == Goal.option_full_house:
             self.create_event_location(location_table[GoalName.full_house],
-                                       (self.logic.relationship.has_children(2) & self.logic.relationship.can_reproduce()),
+                                       self.logic.goal.can_complete_full_house(),
                                        Event.victory)
         elif self.options.goal == Goal.option_greatest_walnut_hunter:
             self.create_event_location(location_table[GoalName.greatest_walnut_hunter],
-                                       self.logic.walnut.has_walnut(130),
+                                       self.logic.goal.can_complete_greatest_walnut_hunter(),
                                        Event.victory)
         elif self.options.goal == Goal.option_protector_of_the_valley:
             self.create_event_location(location_table[GoalName.protector_of_the_valley],
-                                       self.logic.monster.can_complete_all_monster_slaying_goals(),
+                                       self.logic.goal.can_complete_protector_of_the_valley(),
                                        Event.victory)
         elif self.options.goal == Goal.option_full_shipment:
             self.create_event_location(location_table[GoalName.full_shipment],
-                                       self.logic.shipping.can_ship_everything_in_slot(self.get_all_location_names()),
+                                       self.logic.goal.can_complete_full_shipment(self.get_all_location_names()),
                                        Event.victory)
         elif self.options.goal == Goal.option_gourmet_chef:
             self.create_event_location(location_table[GoalName.gourmet_chef],
-                                       self.logic.cooking.can_cook_everything,
+                                       self.logic.goal.can_complete_gourmet_chef(),
                                        Event.victory)
         elif self.options.goal == Goal.option_craft_master:
             self.create_event_location(location_table[GoalName.craft_master],
-                                       self.logic.crafting.can_craft_everything,
+                                       self.logic.goal.can_complete_craft_master(),
                                        Event.victory)
         elif self.options.goal == Goal.option_legend:
             self.create_event_location(location_table[GoalName.legend],
-                                       self.logic.money.can_have_earned_total(10_000_000),
+                                       self.logic.goal.can_complete_legend(),
                                        Event.victory)
         elif self.options.goal == Goal.option_mystery_of_the_stardrops:
             self.create_event_location(location_table[GoalName.mystery_of_the_stardrops],
-                                       self.logic.has_all_stardrops(),
+                                       self.logic.goal.can_complete_mystery_of_the_stardrop(),
                                        Event.victory)
         elif self.options.goal == Goal.option_allsanity:
             self.create_event_location(location_table[GoalName.allsanity],
-                                       HasProgressionPercent(self.player, 100),
+                                       self.logic.goal.can_complete_allsanity(),
                                        Event.victory)
         elif self.options.goal == Goal.option_perfection:
             self.create_event_location(location_table[GoalName.perfection],
-                                       HasProgressionPercent(self.player, 100),
+                                       self.logic.goal.can_complete_perfection(),
                                        Event.victory)
 
         self.multiworld.completion_condition[self.player] = lambda state: state.has(Event.victory, self.player)
diff --git a/worlds/stardew_valley/data/items.csv b/worlds/stardew_valley/data/items.csv
index 05af275ba4..36e048100c 100644
--- a/worlds/stardew_valley/data/items.csv
+++ b/worlds/stardew_valley/data/items.csv
@@ -928,6 +928,7 @@ id,name,classification,groups,mod_name
 10518,Aurora Vineyard Tablet,progression,,Stardew Valley Expanded
 10519,Scarlett's Job Offer,progression,,Stardew Valley Expanded
 10520,Morgan's Schooling,progression,,Stardew Valley Expanded
+10521,Aurora Vineyard Reclamation,progression,,Stardew Valley Expanded
 10601,Magic Elixir Recipe,progression,"CHEFSANITY,CHEFSANITY_PURCHASE",Magic
 10602,Travel Core Recipe,progression,CRAFTSANITY,Magic
 10603,Haste Elixir Recipe,progression,CRAFTSANITY,Stardew Valley Expanded
diff --git a/worlds/stardew_valley/early_items.py b/worlds/stardew_valley/early_items.py
index 5ad48912a2..1457c5c7c5 100644
--- a/worlds/stardew_valley/early_items.py
+++ b/worlds/stardew_valley/early_items.py
@@ -41,7 +41,7 @@ def setup_early_items(multiworld, options: stardew_options.StardewValleyOptions,
     if fishing is not None and content.features.skill_progression.is_progressive:
         early_forced.append(fishing.level_name)
 
-    if options.quest_locations >= 0:
+    if options.quest_locations.has_story_quests():
         early_candidates.append(Wallet.magnifying_glass)
 
     if options.special_order_locations & stardew_options.SpecialOrderLocations.option_board:
diff --git a/worlds/stardew_valley/items.py b/worlds/stardew_valley/items.py
index 1fbe012e27..dcb37a8f41 100644
--- a/worlds/stardew_valley/items.py
+++ b/worlds/stardew_valley/items.py
@@ -264,7 +264,7 @@ def create_unique_items(item_factory: StardewItemFactory, options: StardewValley
 
 def create_raccoons(item_factory: StardewItemFactory, options: StardewValleyOptions, items: List[Item]):
     number_progressive_raccoons = 9
-    if options.quest_locations < 0:
+    if options.quest_locations.has_no_story_quests():
         number_progressive_raccoons = number_progressive_raccoons - 1
 
     items.extend(item_factory(item) for item in [CommunityUpgrade.raccoon] * number_progressive_raccoons)
@@ -387,7 +387,7 @@ def create_quest_rewards(item_factory: StardewItemFactory, options: StardewValle
 
 
 def create_special_quest_rewards(item_factory: StardewItemFactory, options: StardewValleyOptions, items: List[Item]):
-    if options.quest_locations < 0:
+    if options.quest_locations.has_no_story_quests():
         return
     # items.append(item_factory("Adventurer's Guild")) # Now unlocked always!
     items.append(item_factory(Wallet.club_card))
@@ -698,7 +698,7 @@ def create_quest_rewards_sve(item_factory: StardewItemFactory, options: StardewV
     if not exclude_ginger_island:
         items.extend([item_factory(item) for item in SVEQuestItem.sve_always_quest_items_ginger_island])
 
-    if options.quest_locations < 0:
+    if options.quest_locations.has_no_story_quests():
         return
 
     items.extend([item_factory(item) for item in SVEQuestItem.sve_quest_items])
diff --git a/worlds/stardew_valley/locations.py b/worlds/stardew_valley/locations.py
index df86e08125..c7d787e55d 100644
--- a/worlds/stardew_valley/locations.py
+++ b/worlds/stardew_valley/locations.py
@@ -191,7 +191,7 @@ def extend_cropsanity_locations(randomized_locations: List[LocationData], conten
 
 
 def extend_quests_locations(randomized_locations: List[LocationData], options: StardewValleyOptions, content: StardewContent):
-    if options.quest_locations < 0:
+    if options.quest_locations.has_no_story_quests():
         return
 
     story_quest_locations = locations_by_tag[LocationTags.STORY_QUEST]
@@ -317,7 +317,7 @@ def extend_mandatory_locations(randomized_locations: List[LocationData], options
 
 
 def extend_situational_quest_locations(randomized_locations: List[LocationData], options: StardewValleyOptions):
-    if options.quest_locations < 0:
+    if options.quest_locations.has_no_story_quests():
         return
     if ModNames.distant_lands in options.mods:
         if ModNames.alecto in options.mods:
diff --git a/worlds/stardew_valley/logic/bundle_logic.py b/worlds/stardew_valley/logic/bundle_logic.py
index 98fda1c73c..8ede4de5e7 100644
--- a/worlds/stardew_valley/logic/bundle_logic.py
+++ b/worlds/stardew_valley/logic/bundle_logic.py
@@ -76,7 +76,7 @@ SkillLogicMixin, QuestLogicMixin]]):
                 self.logic.region.can_reach_location("Complete Boiler Room"))
 
     def can_access_raccoon_bundles(self) -> StardewRule:
-        if self.options.quest_locations < 0:
+        if self.options.quest_locations.has_no_story_quests():
             return self.logic.received(CommunityUpgrade.raccoon, 1) & self.logic.quest.can_complete_quest(Quest.giant_stump)
 
         # 1 - Break the tree
diff --git a/worlds/stardew_valley/logic/cooking_logic.py b/worlds/stardew_valley/logic/cooking_logic.py
index 46f3bdc93f..8c8f716afb 100644
--- a/worlds/stardew_valley/logic/cooking_logic.py
+++ b/worlds/stardew_valley/logic/cooking_logic.py
@@ -13,12 +13,9 @@ from .relationship_logic import RelationshipLogicMixin
 from .season_logic import SeasonLogicMixin
 from .skill_logic import SkillLogicMixin
 from ..data.recipe_data import RecipeSource, StarterSource, ShopSource, SkillSource, FriendshipSource, \
-    QueenOfSauceSource, CookingRecipe, ShopFriendshipSource, \
-    all_cooking_recipes_by_name
+    QueenOfSauceSource, CookingRecipe, ShopFriendshipSource
 from ..data.recipe_source import CutsceneSource, ShopTradeSource
-from ..locations import locations_by_tag, LocationTags
 from ..options import Chefsanity
-from ..options import ExcludeGingerIsland
 from ..stardew_rule import StardewRule, True_, False_
 from ..strings.region_names import LogicRegion
 from ..strings.skill_names import Skill
@@ -92,17 +89,3 @@ BuildingLogicMixin, RelationshipLogicMixin, SkillLogicMixin, CookingLogicMixin]]
     @cache_self1
     def received_recipe(self, meal_name: str):
         return self.logic.received(f"{meal_name} Recipe")
-
-    @cached_property
-    def can_cook_everything(self) -> StardewRule:
-        cooksanity_prefix = "Cook "
-        all_recipes_names = []
-        exclude_island = self.options.exclude_ginger_island == ExcludeGingerIsland.option_true
-        for location in locations_by_tag[LocationTags.COOKSANITY]:
-            if exclude_island and LocationTags.GINGER_ISLAND in location.tags:
-                continue
-            if location.mod_name and location.mod_name not in self.options.mods:
-                continue
-            all_recipes_names.append(location.name[len(cooksanity_prefix):])
-        all_recipes = [all_cooking_recipes_by_name[recipe_name] for recipe_name in all_recipes_names]
-        return self.logic.and_(*(self.logic.cooking.can_cook(recipe) for recipe in all_recipes))
diff --git a/worlds/stardew_valley/logic/crafting_logic.py b/worlds/stardew_valley/logic/crafting_logic.py
index 28bf0d2af2..b768a74b92 100644
--- a/worlds/stardew_valley/logic/crafting_logic.py
+++ b/worlds/stardew_valley/logic/crafting_logic.py
@@ -1,4 +1,3 @@
-from functools import cached_property
 from typing import Union
 
 from Utils import cache_self1
@@ -12,11 +11,10 @@ from .relationship_logic import RelationshipLogicMixin
 from .skill_logic import SkillLogicMixin
 from .special_order_logic import SpecialOrderLogicMixin
 from .. import options
-from ..data.craftable_data import CraftingRecipe, all_crafting_recipes_by_name
+from ..data.craftable_data import CraftingRecipe
 from ..data.recipe_source import CutsceneSource, ShopTradeSource, ArchipelagoSource, LogicSource, SpecialOrderSource, \
     FestivalShopSource, QuestSource, StarterSource, ShopSource, SkillSource, MasterySource, FriendshipSource, SkillCraftsanitySource
-from ..locations import locations_by_tag, LocationTags
-from ..options import Craftsanity, SpecialOrderLocations, ExcludeGingerIsland
+from ..options import Craftsanity, SpecialOrderLocations
 from ..stardew_rule import StardewRule, True_, False_
 from ..strings.region_names import Region
 
@@ -48,7 +46,7 @@ SkillLogicMixin, SpecialOrderLogicMixin, CraftingLogicMixin, QuestLogicMixin]]):
             else:
                 return self.logic.crafting.received_recipe(recipe.item)
         if isinstance(recipe.source, QuestSource):
-            if self.options.quest_locations < 0:
+            if self.options.quest_locations.has_no_story_quests():
                 return self.logic.crafting.can_learn_recipe(recipe)
             else:
                 return self.logic.crafting.received_recipe(recipe.item)
@@ -71,7 +69,8 @@ SkillLogicMixin, SpecialOrderLogicMixin, CraftingLogicMixin, QuestLogicMixin]]):
         if isinstance(recipe.source, ShopSource):
             return self.logic.money.can_spend_at(recipe.source.region, recipe.source.price)
         if isinstance(recipe.source, SkillCraftsanitySource):
-            return self.logic.skill.has_level(recipe.source.skill, recipe.source.level) & self.logic.skill.can_earn_level(recipe.source.skill, recipe.source.level)
+            return self.logic.skill.has_level(recipe.source.skill, recipe.source.level) & self.logic.skill.can_earn_level(recipe.source.skill,
+                                                                                                                          recipe.source.level)
         if isinstance(recipe.source, SkillSource):
             return self.logic.skill.has_level(recipe.source.skill, recipe.source.level)
         if isinstance(recipe.source, MasterySource):
@@ -95,23 +94,3 @@ SkillLogicMixin, SpecialOrderLogicMixin, CraftingLogicMixin, QuestLogicMixin]]):
     @cache_self1
     def received_recipe(self, item_name: str):
         return self.logic.received(f"{item_name} Recipe")
-
-    @cached_property
-    def can_craft_everything(self) -> StardewRule:
-        craftsanity_prefix = "Craft "
-        all_recipes_names = []
-        exclude_island = self.options.exclude_ginger_island == ExcludeGingerIsland.option_true
-        exclude_masteries = not self.content.features.skill_progression.are_masteries_shuffled
-        for location in locations_by_tag[LocationTags.CRAFTSANITY]:
-            if not location.name.startswith(craftsanity_prefix):
-                continue
-            if exclude_island and LocationTags.GINGER_ISLAND in location.tags:
-                continue
-            # FIXME Remove when recipes are in content packs
-            if exclude_masteries and LocationTags.REQUIRES_MASTERIES in location.tags:
-                continue
-            if location.mod_name and location.mod_name not in self.options.mods:
-                continue
-            all_recipes_names.append(location.name[len(craftsanity_prefix):])
-        all_recipes = [all_crafting_recipes_by_name[recipe_name] for recipe_name in all_recipes_names]
-        return self.logic.and_(*(self.logic.crafting.can_craft(recipe) for recipe in all_recipes))
diff --git a/worlds/stardew_valley/logic/fishing_logic.py b/worlds/stardew_valley/logic/fishing_logic.py
index 63798a92fe..1bb4cccea6 100644
--- a/worlds/stardew_valley/logic/fishing_logic.py
+++ b/worlds/stardew_valley/logic/fishing_logic.py
@@ -29,7 +29,7 @@ class FishingLogicMixin(BaseLogicMixin):
 
 
 class FishingLogic(BaseLogic[Union[HasLogicMixin, FishingLogicMixin, ReceivedLogicMixin, RegionLogicMixin, SeasonLogicMixin, ToolLogicMixin,
-                                   SkillLogicMixin]]):
+SkillLogicMixin]]):
     def can_fish_in_freshwater(self) -> StardewRule:
         return self.logic.skill.can_fish() & self.logic.region.can_reach_any((Region.forest, Region.town, Region.mountain))
 
@@ -97,19 +97,5 @@ class FishingLogic(BaseLogic[Union[HasLogicMixin, FishingLogicMixin, ReceivedLog
 
         return self.logic.and_(*rules)
 
-    def can_catch_every_fish_for_fishsanity(self) -> StardewRule:
-        if not self.content.features.fishsanity.is_enabled:
-            return self.can_catch_every_fish()
-
-        rules = [self.has_max_fishing()]
-
-        rules.extend(
-            self.logic.fishing.can_catch_fish_for_fishsanity(fish)
-            for fish in self.content.fishes.values()
-            if self.content.features.fishsanity.is_included(fish)
-        )
-
-        return self.logic.and_(*rules)
-
     def has_specific_bait(self, fish: FishItem) -> StardewRule:
         return self.can_catch_fish(fish) & self.logic.has(Machine.bait_maker)
diff --git a/worlds/stardew_valley/logic/goal_logic.py b/worlds/stardew_valley/logic/goal_logic.py
new file mode 100644
index 0000000000..0ad3eb4f37
--- /dev/null
+++ b/worlds/stardew_valley/logic/goal_logic.py
@@ -0,0 +1,173 @@
+import typing
+
+from .base_logic import BaseLogic, BaseLogicMixin
+from ..data.craftable_data import all_crafting_recipes_by_name
+from ..data.recipe_data import all_cooking_recipes_by_name
+from ..locations import LocationTags, locations_by_tag
+from ..mods.mod_data import ModNames
+from ..options import options
+from ..stardew_rule import StardewRule
+from ..strings.building_names import Building
+from ..strings.quest_names import Quest
+from ..strings.season_names import Season
+from ..strings.wallet_item_names import Wallet
+
+if typing.TYPE_CHECKING:
+    from .logic import StardewLogic
+else:
+    StardewLogic = object
+
+
+class GoalLogicMixin(BaseLogicMixin):
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.goal = GoalLogic(*args, **kwargs)
+
+
+class GoalLogic(BaseLogic[StardewLogic]):
+
+    def can_complete_community_center(self) -> StardewRule:
+        return self.logic.bundle.can_complete_community_center
+
+    def can_finish_grandpa_evaluation(self) -> StardewRule:
+        # https://stardewvalleywiki.com/Grandpa
+        rules_worth_a_point = [
+            self.logic.money.can_have_earned_total(50_000),
+            self.logic.money.can_have_earned_total(100_000),
+            self.logic.money.can_have_earned_total(200_000),
+            self.logic.money.can_have_earned_total(300_000),
+            self.logic.money.can_have_earned_total(500_000),
+            self.logic.money.can_have_earned_total(1_000_000),  # first point
+            self.logic.money.can_have_earned_total(1_000_000),  # second point
+            self.logic.skill.has_total_level(30),
+            self.logic.skill.has_total_level(50),
+            self.logic.museum.can_complete_museum(),
+            # Catching every fish not expected
+            # Shipping every item not expected
+            self.logic.relationship.can_get_married() & self.logic.building.has_house(2),
+            self.logic.relationship.has_hearts_with_n(5, 8),  # 5 Friends
+            self.logic.relationship.has_hearts_with_n(10, 8),  # 10 friends
+            self.logic.pet.has_pet_hearts(5),  # Max Pet
+            self.logic.bundle.can_complete_community_center,  # 1 point for Community Center Completion
+            self.logic.bundle.can_complete_community_center,  # Ceremony first point
+            self.logic.bundle.can_complete_community_center,  # Ceremony second point
+            self.logic.received(Wallet.skull_key),
+            self.logic.wallet.has_rusty_key(),
+        ]
+        return self.logic.count(12, *rules_worth_a_point)
+
+    def can_complete_bottom_of_the_mines(self) -> StardewRule:
+        # The location is in the bottom of the mines region, so no actual rule is required
+        return self.logic.true_
+
+    def can_complete_cryptic_note(self) -> StardewRule:
+        return self.logic.quest.can_complete_quest(Quest.cryptic_note)
+
+    def can_complete_master_angler(self) -> StardewRule:
+        if not self.content.features.fishsanity.is_enabled:
+            return self.logic.fishing.can_catch_every_fish()
+
+        rules = [self.logic.fishing.has_max_fishing()]
+
+        rules.extend(
+            self.logic.fishing.can_catch_fish_for_fishsanity(fish)
+            for fish in self.content.fishes.values()
+            if self.content.features.fishsanity.is_included(fish)
+        )
+
+        return self.logic.and_(*rules)
+
+    def can_complete_complete_collection(self) -> StardewRule:
+        return self.logic.museum.can_complete_museum()
+
+    def can_complete_full_house(self) -> StardewRule:
+        return self.logic.relationship.has_children(2) & self.logic.relationship.can_reproduce()
+
+    def can_complete_greatest_walnut_hunter(self) -> StardewRule:
+        return self.logic.walnut.has_walnut(130)
+
+    def can_complete_protector_of_the_valley(self) -> StardewRule:
+        return self.logic.monster.can_complete_all_monster_slaying_goals()
+
+    def can_complete_full_shipment(self, all_location_names_in_slot: list[str]) -> StardewRule:
+        if self.options.shipsanity == options.Shipsanity.option_none:
+            return self.logic.shipping.can_ship_everything()
+
+        rules = [self.logic.building.has_building(Building.shipping_bin)]
+
+        for shipsanity_location in locations_by_tag[LocationTags.SHIPSANITY]:
+            if shipsanity_location.name not in all_location_names_in_slot:
+                continue
+            rules.append(self.logic.region.can_reach_location(shipsanity_location.name))
+        return self.logic.and_(*rules)
+
+    def can_complete_gourmet_chef(self) -> StardewRule:
+        cooksanity_prefix = "Cook "
+        all_recipes_names = []
+        exclude_island = self.options.exclude_ginger_island == options.ExcludeGingerIsland.option_true
+        for location in locations_by_tag[LocationTags.COOKSANITY]:
+            if exclude_island and LocationTags.GINGER_ISLAND in location.tags:
+                continue
+            if location.mod_name and location.mod_name not in self.options.mods:
+                continue
+            all_recipes_names.append(location.name[len(cooksanity_prefix):])
+        all_recipes = [all_cooking_recipes_by_name[recipe_name] for recipe_name in all_recipes_names]
+        return self.logic.and_(*(self.logic.cooking.can_cook(recipe) for recipe in all_recipes))
+
+    def can_complete_craft_master(self) -> StardewRule:
+        craftsanity_prefix = "Craft "
+        all_recipes_names = []
+        exclude_island = self.options.exclude_ginger_island == options.ExcludeGingerIsland.option_true
+        exclude_masteries = not self.content.features.skill_progression.are_masteries_shuffled
+        for location in locations_by_tag[LocationTags.CRAFTSANITY]:
+            if not location.name.startswith(craftsanity_prefix):
+                continue
+            if exclude_island and LocationTags.GINGER_ISLAND in location.tags:
+                continue
+            # FIXME Remove when recipes are in content packs
+            if exclude_masteries and LocationTags.REQUIRES_MASTERIES in location.tags:
+                continue
+            if location.mod_name and location.mod_name not in self.options.mods:
+                continue
+            all_recipes_names.append(location.name[len(craftsanity_prefix):])
+        all_recipes = [all_crafting_recipes_by_name[recipe_name] for recipe_name in all_recipes_names]
+        return self.logic.and_(*(self.logic.crafting.can_craft(recipe) for recipe in all_recipes))
+
+    def can_complete_legend(self) -> StardewRule:
+        return self.logic.money.can_have_earned_total(10_000_000)
+
+    def can_complete_mystery_of_the_stardrop(self) -> StardewRule:
+        other_rules = []
+        number_of_stardrops_to_receive = 0
+        number_of_stardrops_to_receive += 1  # The Mines level 100
+        number_of_stardrops_to_receive += 1  # Old Master Cannoli
+        number_of_stardrops_to_receive += 1  # Museum Stardrop
+        number_of_stardrops_to_receive += 1  # Krobus Stardrop
+
+        # Master Angler Stardrop
+        if self.content.features.fishsanity.is_enabled:
+            number_of_stardrops_to_receive += 1
+        else:
+            other_rules.append(self.logic.fishing.can_catch_every_fish())
+
+        if self.options.festival_locations == options.FestivalLocations.option_disabled:  # Fair Stardrop
+            other_rules.append(self.logic.season.has(Season.fall))
+        else:
+            number_of_stardrops_to_receive += 1
+
+        # Spouse Stardrop
+        if self.content.features.friendsanity.is_enabled:
+            number_of_stardrops_to_receive += 1
+        else:
+            other_rules.append(self.logic.relationship.has_hearts_with_any_bachelor(13))
+
+        if ModNames.deepwoods in self.options.mods:  # Petting the Unicorn
+            number_of_stardrops_to_receive += 1
+
+        return self.logic.received("Stardrop", number_of_stardrops_to_receive) & self.logic.and_(*other_rules, allow_empty=True)
+
+    def can_complete_allsanity(self) -> StardewRule:
+        return self.logic.has_progress_percent(100)
+
+    def can_complete_perfection(self) -> StardewRule:
+        return self.logic.has_progress_percent(100)
diff --git a/worlds/stardew_valley/logic/has_logic.py b/worlds/stardew_valley/logic/has_logic.py
index 4331780dc0..5d4b700e3b 100644
--- a/worlds/stardew_valley/logic/has_logic.py
+++ b/worlds/stardew_valley/logic/has_logic.py
@@ -1,5 +1,5 @@
 from .base_logic import BaseLogic
-from ..stardew_rule import StardewRule, And, Or, Has, Count, true_, false_
+from ..stardew_rule import StardewRule, And, Or, Has, Count, true_, false_, HasProgressionPercent
 
 
 class HasLogicMixin(BaseLogic[None]):
@@ -23,6 +23,12 @@ class HasLogicMixin(BaseLogic[None]):
     def has_n(self, *items: str, count: int):
         return self.count(count, *(self.has(item) for item in items))
 
+    def has_progress_percent(self, percent: int):
+        assert percent >= 0, "Can't have a negative progress percent"
+        assert percent <= 100, "Can't have a progress percent over 100"
+
+        return HasProgressionPercent(self.player, percent)
+
     @staticmethod
     def count(count: int, *rules: StardewRule) -> StardewRule:
         assert rules, "Can't create a Count conditions without rules"
@@ -47,8 +53,14 @@ class HasLogicMixin(BaseLogic[None]):
         return Count(rules, count)
 
     @staticmethod
-    def and_(*rules: StardewRule) -> StardewRule:
-        assert rules, "Can't create a And conditions without rules"
+    def and_(*rules: StardewRule, allow_empty: bool = False) -> StardewRule:
+        """
+        :param rules: The rules to combine
+        :param allow_empty: If True, return true_ when no rules are given. Otherwise, raise an error.
+        """
+        if not rules:
+            assert allow_empty, "Can't create a And conditions without rules"
+            return true_
 
         if len(rules) == 1:
             return rules[0]
@@ -56,8 +68,14 @@ class HasLogicMixin(BaseLogic[None]):
         return And(*rules)
 
     @staticmethod
-    def or_(*rules: StardewRule) -> StardewRule:
-        assert rules, "Can't create a Or conditions without rules"
+    def or_(*rules: StardewRule, allow_empty: bool = False) -> StardewRule:
+        """
+          :param rules: The rules to combine
+          :param allow_empty: If True, return false_ when no rules are given. Otherwise, raise an error.
+          """
+        if not rules:
+            assert allow_empty, "Can't create a Or conditions without rules"
+            return false_
 
         if len(rules) == 1:
             return rules[0]
diff --git a/worlds/stardew_valley/logic/logic.py b/worlds/stardew_valley/logic/logic.py
index 34f609c0e2..dd95165417 100644
--- a/worlds/stardew_valley/logic/logic.py
+++ b/worlds/stardew_valley/logic/logic.py
@@ -19,6 +19,7 @@ from .farming_logic import FarmingLogicMixin
 from .festival_logic import FestivalLogicMixin
 from .fishing_logic import FishingLogicMixin
 from .gift_logic import GiftLogicMixin
+from .goal_logic import GoalLogicMixin
 from .grind_logic import GrindLogicMixin
 from .harvesting_logic import HarvestingLogicMixin
 from .has_logic import HasLogicMixin
@@ -50,8 +51,7 @@ from ..data.museum_data import all_museum_items
 from ..data.recipe_data import all_cooking_recipes
 from ..mods.logic.magic_logic import MagicLogicMixin
 from ..mods.logic.mod_logic import ModLogicMixin
-from ..mods.mod_data import ModNames
-from ..options import ExcludeGingerIsland, FestivalLocations, StardewValleyOptions
+from ..options import ExcludeGingerIsland, StardewValleyOptions
 from ..stardew_rule import False_, True_, StardewRule
 from ..strings.animal_names import Animal
 from ..strings.animal_product_names import AnimalProduct
@@ -93,7 +93,7 @@ class StardewLogic(ReceivedLogicMixin, HasLogicMixin, RegionLogicMixin, Travelin
                    CombatLogicMixin, MagicLogicMixin, MonsterLogicMixin, ToolLogicMixin, PetLogicMixin, QualityLogicMixin,
                    SkillLogicMixin, FarmingLogicMixin, BundleLogicMixin, FishingLogicMixin, MineLogicMixin, CookingLogicMixin, AbilityLogicMixin,
                    SpecialOrderLogicMixin, QuestLogicMixin, CraftingLogicMixin, ModLogicMixin, HarvestingLogicMixin, SourceLogicMixin,
-                   RequirementLogicMixin, BookLogicMixin, GrindLogicMixin, FestivalLogicMixin, WalnutLogicMixin):
+                   RequirementLogicMixin, BookLogicMixin, GrindLogicMixin, FestivalLogicMixin, WalnutLogicMixin, GoalLogicMixin):
     player: int
     options: StardewValleyOptions
     content: StardewContent
@@ -375,71 +375,11 @@ class StardewLogic(ReceivedLogicMixin, HasLogicMixin, RegionLogicMixin, Travelin
     def can_smelt(self, item: str) -> StardewRule:
         return self.has(Machine.furnace) & self.has(item)
 
-    def can_finish_grandpa_evaluation(self) -> StardewRule:
-        # https://stardewvalleywiki.com/Grandpa
-        rules_worth_a_point = [
-            self.money.can_have_earned_total(50000),  # 50 000g
-            self.money.can_have_earned_total(100000),  # 100 000g
-            self.money.can_have_earned_total(200000),  # 200 000g
-            self.money.can_have_earned_total(300000),  # 300 000g
-            self.money.can_have_earned_total(500000),  # 500 000g
-            self.money.can_have_earned_total(1000000),  # 1 000 000g first point
-            self.money.can_have_earned_total(1000000),  # 1 000 000g second point
-            self.skill.has_total_level(30),  # Total Skills: 30
-            self.skill.has_total_level(50),  # Total Skills: 50
-            self.museum.can_complete_museum(),  # Completing the museum for a point
-            # Catching every fish not expected
-            # Shipping every item not expected
-            self.relationship.can_get_married() & self.building.has_house(2),
-            self.relationship.has_hearts_with_n(5, 8),  # 5 Friends
-            self.relationship.has_hearts_with_n(10, 8),  # 10 friends
-            self.pet.has_pet_hearts(5),  # Max Pet
-            self.bundle.can_complete_community_center,  # Community Center Completion
-            self.bundle.can_complete_community_center,  # CC Ceremony first point
-            self.bundle.can_complete_community_center,  # CC Ceremony second point
-            self.received(Wallet.skull_key),  # Skull Key obtained
-            self.wallet.has_rusty_key(),  # Rusty key obtained
-        ]
-        return self.count(12, *rules_worth_a_point)
-
     def has_island_trader(self) -> StardewRule:
         if self.options.exclude_ginger_island == ExcludeGingerIsland.option_true:
             return False_()
         return self.region.can_reach(Region.island_trader)
 
-    def has_all_stardrops(self) -> StardewRule:
-        other_rules = []
-        number_of_stardrops_to_receive = 0
-        number_of_stardrops_to_receive += 1  # The Mines level 100
-        number_of_stardrops_to_receive += 1  # Old Master Cannoli
-        number_of_stardrops_to_receive += 1  # Museum Stardrop
-        number_of_stardrops_to_receive += 1  # Krobus Stardrop
-
-        # Master Angler Stardrop
-        if self.content.features.fishsanity.is_enabled:
-            number_of_stardrops_to_receive += 1
-        else:
-            other_rules.append(self.fishing.can_catch_every_fish())
-
-        if self.options.festival_locations == FestivalLocations.option_disabled:  # Fair Stardrop
-            other_rules.append(self.season.has(Season.fall))
-        else:
-            number_of_stardrops_to_receive += 1
-
-        # Spouse Stardrop
-        if self.content.features.friendsanity.is_enabled:
-            number_of_stardrops_to_receive += 1
-        else:
-            other_rules.append(self.relationship.has_hearts_with_any_bachelor(13))
-
-        if ModNames.deepwoods in self.options.mods:  # Petting the Unicorn
-            number_of_stardrops_to_receive += 1
-
-        if not other_rules:
-            return self.received("Stardrop", number_of_stardrops_to_receive)
-
-        return self.received("Stardrop", number_of_stardrops_to_receive) & self.logic.and_(*other_rules)
-
     def has_abandoned_jojamart(self) -> StardewRule:
         return self.received(CommunityUpgrade.movie_theater, 1)
 
diff --git a/worlds/stardew_valley/logic/quest_logic.py b/worlds/stardew_valley/logic/quest_logic.py
index 42f401b960..8779848fed 100644
--- a/worlds/stardew_valley/logic/quest_logic.py
+++ b/worlds/stardew_valley/logic/quest_logic.py
@@ -118,25 +118,24 @@ class QuestLogic(BaseLogic[Union[HasLogicMixin, ReceivedLogicMixin, MoneyLogicMi
         return Has(quest, self.registry.quest_rules, "quest")
 
     def has_club_card(self) -> StardewRule:
-        if self.options.quest_locations < 0:
-            return self.logic.quest.can_complete_quest(Quest.the_mysterious_qi)
-        return self.logic.received(Wallet.club_card)
+        if self.options.quest_locations.has_story_quests():
+            return self.logic.received(Wallet.club_card)
+        return self.logic.quest.can_complete_quest(Quest.the_mysterious_qi)
 
     def has_magnifying_glass(self) -> StardewRule:
-        if self.options.quest_locations < 0:
-            return self.logic.quest.can_complete_quest(Quest.a_winter_mystery)
-        return self.logic.received(Wallet.magnifying_glass)
+        if self.options.quest_locations.has_story_quests():
+            return self.logic.received(Wallet.magnifying_glass)
+        return self.logic.quest.can_complete_quest(Quest.a_winter_mystery)
 
     def has_dark_talisman(self) -> StardewRule:
-        if self.options.quest_locations < 0:
-            return self.logic.quest.can_complete_quest(Quest.dark_talisman)
-        return self.logic.received(Wallet.dark_talisman)
+        if self.options.quest_locations.has_story_quests():
+            return self.logic.received(Wallet.dark_talisman)
+        return self.logic.quest.can_complete_quest(Quest.dark_talisman)
 
     def has_raccoon_shop(self) -> StardewRule:
-        if self.options.quest_locations < 0:
-            return self.logic.received(CommunityUpgrade.raccoon, 2) & self.logic.quest.can_complete_quest(Quest.giant_stump)
-
-        # 1 - Break the tree
-        # 2 - Build the house, which summons the bundle racoon. This one is done manually if quests are turned off
-        # 3 - Raccoon's wife opens the shop
-        return self.logic.received(CommunityUpgrade.raccoon, 3)
+        if self.options.quest_locations.has_story_quests():
+            # 1 - Break the tree
+            # 2 - Build the house, which summons the bundle racoon. This one is done manually if quests are turned off
+            # 3 - Raccoon's wife opens the shop
+            return self.logic.received(CommunityUpgrade.raccoon, 3)
+        return self.logic.received(CommunityUpgrade.raccoon, 2) & self.logic.quest.can_complete_quest(Quest.giant_stump)
diff --git a/worlds/stardew_valley/logic/relationship_logic.py b/worlds/stardew_valley/logic/relationship_logic.py
index 61e63a90c8..b74bdc5645 100644
--- a/worlds/stardew_valley/logic/relationship_logic.py
+++ b/worlds/stardew_valley/logic/relationship_logic.py
@@ -1,4 +1,5 @@
 import math
+import typing
 from typing import Union
 
 from Utils import cache_self1
@@ -14,13 +15,18 @@ from ..content.feature import friendsanity
 from ..data.villagers_data import Villager
 from ..stardew_rule import StardewRule, True_, false_, true_
 from ..strings.ap_names.mods.mod_items import SVEQuestItem
-from ..strings.crop_names import Fruit
 from ..strings.generic_names import Generic
 from ..strings.gift_names import Gift
+from ..strings.quest_names import ModQuest
 from ..strings.region_names import Region
 from ..strings.season_names import Season
 from ..strings.villager_names import NPC, ModNPC
 
+if typing.TYPE_CHECKING:
+    from ..mods.logic.mod_logic import ModLogicMixin
+else:
+    ModLogicMixin = object
+
 possible_kids = ("Cute Baby", "Ugly Baby")
 
 
@@ -38,7 +44,7 @@ class RelationshipLogicMixin(BaseLogicMixin):
 
 
 class RelationshipLogic(BaseLogic[Union[RelationshipLogicMixin, BuildingLogicMixin, SeasonLogicMixin, TimeLogicMixin, GiftLogicMixin, RegionLogicMixin,
-ReceivedLogicMixin, HasLogicMixin]]):
+ReceivedLogicMixin, HasLogicMixin, ModLogicMixin]]):
 
     def can_date(self, npc: str) -> StardewRule:
         return self.logic.relationship.has_hearts(npc, 8) & self.logic.has(Gift.bouquet)
@@ -141,7 +147,7 @@ ReceivedLogicMixin, HasLogicMixin]]):
             rules.append(self.logic.region.can_reach(Region.volcano_floor_10))
 
         elif npc == ModNPC.apples:
-            rules.append(self.logic.has(Fruit.starfruit))
+            rules.append(self.logic.mod.quest.has_completed_aurora_vineyard_bundle())
 
         elif npc == ModNPC.scarlett:
             scarlett_job = self.logic.received(SVEQuestItem.scarlett_job_offer)
diff --git a/worlds/stardew_valley/logic/shipping_logic.py b/worlds/stardew_valley/logic/shipping_logic.py
index e9f2258172..d509cc4167 100644
--- a/worlds/stardew_valley/logic/shipping_logic.py
+++ b/worlds/stardew_valley/logic/shipping_logic.py
@@ -1,5 +1,5 @@
 from functools import cached_property
-from typing import Union, List
+from typing import Union
 
 from Utils import cache_self1
 from .base_logic import BaseLogic, BaseLogicMixin
@@ -8,7 +8,7 @@ from .has_logic import HasLogicMixin
 from .received_logic import ReceivedLogicMixin
 from .region_logic import RegionLogicMixin
 from ..locations import LocationTags, locations_by_tag
-from ..options import ExcludeGingerIsland, Shipsanity
+from ..options import ExcludeGingerIsland
 from ..options import SpecialOrderLocations
 from ..stardew_rule import StardewRule
 from ..strings.building_names import Building
@@ -45,15 +45,3 @@ class ShippingLogic(BaseLogic[Union[ReceivedLogicMixin, ShippingLogicMixin, Buil
                 continue
             all_items_to_ship.append(location.name[len(shipsanity_prefix):])
         return self.logic.building.has_building(Building.shipping_bin) & self.logic.has_all(*all_items_to_ship)
-
-    def can_ship_everything_in_slot(self, all_location_names_in_slot: List[str]) -> StardewRule:
-        if self.options.shipsanity == Shipsanity.option_none:
-            return self.logic.shipping.can_ship_everything()
-
-        rules = [self.logic.building.has_building(Building.shipping_bin)]
-
-        for shipsanity_location in locations_by_tag[LocationTags.SHIPSANITY]:
-            if shipsanity_location.name not in all_location_names_in_slot:
-                continue
-            rules.append(self.logic.region.can_reach_location(shipsanity_location.name))
-        return self.logic.and_(*rules)
diff --git a/worlds/stardew_valley/mods/logic/quests_logic.py b/worlds/stardew_valley/mods/logic/quests_logic.py
index 2ff7452394..ef96982661 100644
--- a/worlds/stardew_valley/mods/logic/quests_logic.py
+++ b/worlds/stardew_valley/mods/logic/quests_logic.py
@@ -12,6 +12,7 @@ from ...logic.season_logic import SeasonLogicMixin
 from ...logic.time_logic import TimeLogicMixin
 from ...stardew_rule import StardewRule
 from ...strings.animal_product_names import AnimalProduct
+from ...strings.ap_names.mods.mod_items import SVEQuestItem
 from ...strings.artisan_good_names import ArtisanGood
 from ...strings.crop_names import Fruit, SVEFruit, SVEVegetable, Vegetable
 from ...strings.fertilizer_names import Fertilizer
@@ -83,7 +84,8 @@ TimeLogicMixin, SeasonLogicMixin, RelationshipLogicMixin, MonsterLogicMixin]]):
                                    self.logic.region.can_reach(SVERegion.grandpas_shed),
             ModQuest.MarlonsBoat: self.logic.has_all(*(Loot.void_essence, Loot.solar_essence, Loot.slime, Loot.bat_wing, Loot.bug_meat)) &
                                   self.logic.relationship.can_meet(ModNPC.lance) & self.logic.region.can_reach(SVERegion.guild_summit),
-            ModQuest.AuroraVineyard: self.logic.has(Fruit.starfruit) & self.logic.region.can_reach(SVERegion.aurora_vineyard),
+            ModQuest.AuroraVineyard: self.logic.region.can_reach(SVERegion.aurora_vineyard) & self.logic.received(SVEQuestItem.aurora_vineyard_tablet) &
+                                     self.logic.has(Fruit.starfruit) & self.logic.region.can_reach(Region.forest),
             ModQuest.MonsterCrops: self.logic.has_all(*(SVEVegetable.monster_mushroom, SVEFruit.slime_berry, SVEFruit.monster_fruit, SVEVegetable.void_root)),
             ModQuest.VoidSoul: self.logic.has(ModLoot.void_soul) & self.logic.region.can_reach(Region.farm) &
                                self.logic.season.has_any_not_winter() & self.logic.region.can_reach(SVERegion.badlands_entrance) &
@@ -91,6 +93,12 @@ TimeLogicMixin, SeasonLogicMixin, RelationshipLogicMixin, MonsterLogicMixin]]):
                                self.logic.monster.can_kill_any((Monster.shadow_brute, Monster.shadow_shaman, Monster.shadow_sniper)),
         }
 
+    def has_completed_aurora_vineyard_bundle(self):
+        if self.options.quest_locations.has_story_quests():
+            return self.logic.received(SVEQuestItem.aurora_vineyard_reclamation)
+        return self.logic.quest.can_complete_quest(ModQuest.AuroraVineyard)
+
+
     def _get_distant_lands_quest_rules(self):
         if ModNames.distant_lands not in self.options.mods:
             return {}
diff --git a/worlds/stardew_valley/mods/logic/sve_logic.py b/worlds/stardew_valley/mods/logic/sve_logic.py
index fc093554d8..faca8d332d 100644
--- a/worlds/stardew_valley/mods/logic/sve_logic.py
+++ b/worlds/stardew_valley/mods/logic/sve_logic.py
@@ -41,24 +41,24 @@ class SVELogic(BaseLogic[Union[HasLogicMixin, ReceivedLogicMixin, QuestLogicMixi
         return self.logic.or_(*(self.logic.received(rune) for rune in rune_list))
 
     def has_iridium_bomb(self):
-        if self.options.quest_locations < 0:
-            return self.logic.quest.can_complete_quest(ModQuest.RailroadBoulder)
-        return self.logic.received(SVEQuestItem.iridium_bomb)
+        if self.options.quest_locations.has_story_quests():
+            return self.logic.received(SVEQuestItem.iridium_bomb)
+        return self.logic.quest.can_complete_quest(ModQuest.RailroadBoulder)
 
     def has_marlon_boat(self):
-        if self.options.quest_locations < 0:
-            return self.logic.quest.can_complete_quest(ModQuest.MarlonsBoat)
-        return self.logic.received(SVEQuestItem.marlon_boat_paddle)
+        if self.options.quest_locations.has_story_quests():
+            return self.logic.received(SVEQuestItem.marlon_boat_paddle)
+        return self.logic.quest.can_complete_quest(ModQuest.MarlonsBoat)
 
     def has_grandpa_shed_repaired(self):
-        if self.options.quest_locations < 0:
-            return self.logic.quest.can_complete_quest(ModQuest.GrandpasShed)
-        return self.logic.received(SVEQuestItem.grandpa_shed)
+        if self.options.quest_locations.has_story_quests():
+            return self.logic.received(SVEQuestItem.grandpa_shed)
+        return self.logic.quest.can_complete_quest(ModQuest.GrandpasShed)
 
     def has_bear_knowledge(self):
-        if self.options.quest_locations < 0:
-            return self.logic.quest.can_complete_quest(Quest.strange_note)
-        return self.logic.received(Wallet.bears_knowledge)
+        if self.options.quest_locations.has_story_quests():
+            return self.logic.received(Wallet.bears_knowledge)
+        return self.logic.quest.can_complete_quest(Quest.strange_note)
 
     def can_buy_bear_recipe(self):
         access_rule = (self.logic.quest.can_complete_quest(Quest.strange_note) & self.logic.tool.has_tool(Tool.axe, ToolMaterial.basic) &
diff --git a/worlds/stardew_valley/options/options.py b/worlds/stardew_valley/options/options.py
index 5cfdfcf9c7..bc76c617b3 100644
--- a/worlds/stardew_valley/options/options.py
+++ b/worlds/stardew_valley/options/options.py
@@ -384,6 +384,12 @@ class QuestLocations(NamedRange):
         "maximum": 56,
     }
 
+    def has_story_quests(self) -> bool:
+        return self.value >= 0
+
+    def has_no_story_quests(self) -> bool:
+        return not self.has_story_quests()
+
 
 class Fishsanity(Choice):
     """Locations for catching each fish the first time?
diff --git a/worlds/stardew_valley/rules.py b/worlds/stardew_valley/rules.py
index 01acc7b822..dc63018697 100644
--- a/worlds/stardew_valley/rules.py
+++ b/worlds/stardew_valley/rules.py
@@ -149,7 +149,7 @@ def set_bundle_rules(bundle_rooms: List[BundleRoom], logic: StardewLogic, multiw
             bundle_rules = logic.bundle.can_complete_bundle(bundle)
             if bundle_room.name == CCRoom.raccoon_requests:
                 num = int(bundle.name[-1])
-                extra_raccoons = 1 if world_options.quest_locations >= 0 else 0
+                extra_raccoons = 1 if world_options.quest_locations.has_story_quests() else 0
                 extra_raccoons = extra_raccoons + num
                 bundle_rules = logic.received(CommunityUpgrade.raccoon, extra_raccoons) & bundle_rules
                 if num > 1:
@@ -505,7 +505,7 @@ def set_cropsanity_rules(logic: StardewLogic, multiworld, player, world_content:
 
 
 def set_story_quests_rules(all_location_names: Set[str], logic: StardewLogic, multiworld, player, world_options: StardewValleyOptions):
-    if world_options.quest_locations < 0:
+    if world_options.quest_locations.has_no_story_quests():
         return
     for quest in locations.locations_by_tag[LocationTags.STORY_QUEST]:
         if quest.name in all_location_names and (quest.mod_name is None or quest.mod_name in world_options.mods):
@@ -540,9 +540,9 @@ slay_monsters = "Slay Monsters"
 
 
 def set_help_wanted_quests_rules(logic: StardewLogic, multiworld, player, world_options: StardewValleyOptions):
-    help_wanted_number = world_options.quest_locations.value
-    if help_wanted_number < 0:
+    if world_options.quest_locations.has_no_story_quests():
         return
+    help_wanted_number = world_options.quest_locations.value
     for i in range(0, help_wanted_number):
         set_number = i // 7
         month_rule = logic.time.has_lived_months(set_number)
@@ -973,6 +973,7 @@ def set_sve_rules(logic: StardewLogic, multiworld: MultiWorld, player: int, worl
     set_entrance_rule(multiworld, player, SVEEntrance.use_bear_shop, (logic.mod.sve.can_buy_bear_recipe()))
     set_entrance_rule(multiworld, player, SVEEntrance.railroad_to_grampleton_station, logic.received(SVEQuestItem.scarlett_job_offer))
     set_entrance_rule(multiworld, player, SVEEntrance.museum_to_gunther_bedroom, logic.relationship.has_hearts(ModNPC.gunther, 2))
+    set_entrance_rule(multiworld, player, SVEEntrance.to_aurora_basement, logic.mod.quest.has_completed_aurora_vineyard_bundle())
     logic.mod.sve.initialize_rules()
     for location in logic.registry.sve_location_rules:
         MultiWorldRules.set_rule(multiworld.get_location(location, player),
diff --git a/worlds/stardew_valley/strings/ap_names/mods/mod_items.py b/worlds/stardew_valley/strings/ap_names/mods/mod_items.py
index 58371aebe7..d87a81f5e5 100644
--- a/worlds/stardew_valley/strings/ap_names/mods/mod_items.py
+++ b/worlds/stardew_valley/strings/ap_names/mods/mod_items.py
@@ -19,6 +19,12 @@ class SkillLevel:
 
 class SVEQuestItem:
     aurora_vineyard_tablet = "Aurora Vineyard Tablet"
+    """Triggers the apparition of the bundle tablet in the Aurora Vineyard, so you can do the Aurora Vineyard quest.
+    This aim to break dependencies on completing the Community Center.
+    """
+    aurora_vineyard_reclamation = "Aurora Vineyard Reclamation"
+    """Triggers the unlock of the Aurora Vineyard basement, so you can meet Apples.
+    """
     iridium_bomb = "Iridium Bomb"
     void_soul = "Void Spirit Peace Agreement"
     kittyfish_spell = "Kittyfish Spell"
@@ -29,10 +35,10 @@ class SVEQuestItem:
     fable_reef_portal = "Fable Reef Portal"
     grandpa_shed = "Grandpa's Shed"
 
-    sve_always_quest_items: List[str] = [kittyfish_spell, scarlett_job_offer, morgan_schooling]
-    sve_always_quest_items_ginger_island: List[str] = [fable_reef_portal]
-    sve_quest_items: List[str] = [aurora_vineyard_tablet, iridium_bomb, void_soul, grandpa_shed]
-    sve_quest_items_ginger_island: List[str] = [marlon_boat_paddle]
+    sve_always_quest_items: list[str] = [kittyfish_spell, scarlett_job_offer, morgan_schooling, aurora_vineyard_tablet, ]
+    sve_always_quest_items_ginger_island: list[str] = [fable_reef_portal, ]
+    sve_quest_items: list[str] = [iridium_bomb, void_soul, grandpa_shed, aurora_vineyard_reclamation, ]
+    sve_quest_items_ginger_island: list[str] = [marlon_boat_paddle, ]
 
 
 class SVELocation:
@@ -53,4 +59,3 @@ class SVERunes:
     nexus_wizard = "Nexus: Wizard Runes"
 
     nexus_items: List[str] = [nexus_farm, nexus_wizard, nexus_spring, nexus_aurora, nexus_guild, nexus_junimo, nexus_outpost]
-
diff --git a/worlds/stardew_valley/test/mods/TestMods.py b/worlds/stardew_valley/test/mods/TestMods.py
index 1dd2ab4902..dc958652e1 100644
--- a/worlds/stardew_valley/test/mods/TestMods.py
+++ b/worlds/stardew_valley/test/mods/TestMods.py
@@ -1,10 +1,9 @@
 import random
 
-from BaseClasses import get_seed
+from BaseClasses import get_seed, ItemClassification
 from .. import SVTestBase, SVTestCase, allsanity_mods_6_x_x, fill_dataclass_with_default
 from ..assertion import ModAssertMixin, WorldAssertMixin
-from ... import items, Group, ItemClassification, create_content
-from ... import options
+from ... import options, items, Group, create_content
 from ...mods.mod_data import ModNames
 from ...options import SkillProgression, Walnutsanity
 from ...options.options import all_mods
@@ -188,3 +187,17 @@ class TestModEntranceRando(SVTestCase):
 
                 self.assertEqual(len(set(randomized_connections.values())), len(randomized_connections.values()),
                                  f"Connections are duplicated in randomization.")
+
+
+class TestVanillaLogicAlternativeWhenQuestsAreNotRandomized(WorldAssertMixin, SVTestBase):
+    """We often forget to add an alternative rule that works when quests are not randomized. When this happens, some
+    Location are not reachable because they depend on items that are only added to the pool when quests are randomized.
+    """
+    options = allsanity_mods_6_x_x() | {
+        options.QuestLocations.internal_name: options.QuestLocations.special_range_names["none"],
+        options.Goal.internal_name: options.Goal.option_perfection,
+    }
+
+    def test_given_no_quest_all_mods_when_generate_then_can_reach_everything(self):
+        self.collect_everything()
+        self.assert_can_reach_everything(self.multiworld)
diff --git a/worlds/stardew_valley/test/mods/TestSVE.py b/worlds/stardew_valley/test/mods/TestSVE.py
new file mode 100644
index 0000000000..ca63dcb351
--- /dev/null
+++ b/worlds/stardew_valley/test/mods/TestSVE.py
@@ -0,0 +1,29 @@
+from .. import SVTestBase
+from ... import options
+from ...mods.mod_data import ModNames
+from ...strings.ap_names.mods.mod_items import SVEQuestItem
+from ...strings.quest_names import ModQuest
+from ...strings.region_names import SVERegion
+
+
+class TestAuroraVineyard(SVTestBase):
+    options = {
+        options.Cropsanity.internal_name: options.Cropsanity.option_enabled,
+        options.Mods.internal_name: frozenset({ModNames.sve})
+    }
+
+    def test_need_tablet_to_do_quest(self):
+        self.collect("Starfruit Seeds")
+        self.collect("Bus Repair")
+        self.collect("Shipping Bin")
+        self.collect("Summer")
+        location_name = ModQuest.AuroraVineyard
+        self.assert_cannot_reach_location(location_name, self.multiworld.state)
+        self.collect(SVEQuestItem.aurora_vineyard_tablet)
+        self.assert_can_reach_location(location_name, self.multiworld.state)
+
+    def test_need_reclamation_to_go_downstairs(self):
+        region_name = SVERegion.aurora_vineyard_basement
+        self.assert_cannot_reach_region(region_name, self.multiworld.state)
+        self.collect(SVEQuestItem.aurora_vineyard_reclamation, 1)
+        self.assert_can_reach_region(region_name, self.multiworld.state)
diff --git a/worlds/tww/Items.py b/worlds/tww/Items.py
new file mode 100644
index 0000000000..1e310bf231
--- /dev/null
+++ b/worlds/tww/Items.py
@@ -0,0 +1,373 @@
+from collections.abc import Iterable
+from typing import TYPE_CHECKING, NamedTuple, Optional
+
+from BaseClasses import Item
+from BaseClasses import ItemClassification as IC
+from worlds.AutoWorld import World
+
+if TYPE_CHECKING:
+    from .randomizers.Dungeons import Dungeon
+
+
+def item_factory(items: str | Iterable[str], world: World) -> Item | list[Item]:
+    """
+    Create items based on their names.
+    Depending on the input, this function can return a single item or a list of items.
+
+    :param items: The name or names of the items to create.
+    :param world: The game world.
+    :raises KeyError: If an unknown item name is provided.
+    :return: A single item or a list of items.
+    """
+    ret: list[Item] = []
+    singleton = False
+    if isinstance(items, str):
+        items = [items]
+        singleton = True
+    for item in items:
+        if item in ITEM_TABLE:
+            ret.append(world.create_item(item))
+        else:
+            raise KeyError(f"Unknown item {item}")
+
+    return ret[0] if singleton else ret
+
+
+class TWWItemData(NamedTuple):
+    """
+    This class represents the data for an item in The Wind Waker.
+
+    :param type: The type of the item (e.g., "Item", "Dungeon Item").
+    :param classification: The item's classification (progression, useful, filler).
+    :param code: The unique code identifier for the item.
+    :param quantity: The number of this item available.
+    :param item_id: The ID used to represent the item in-game.
+    """
+
+    type: str
+    classification: IC
+    code: Optional[int]
+    quantity: int
+    item_id: Optional[int]
+
+
+class TWWItem(Item):
+    """
+    This class represents an item in The Wind Waker.
+
+    :param name: The item's name.
+    :param player: The ID of the player who owns the item.
+    :param data: The data associated with this item.
+    :param classification: Optional classification to override the default.
+    """
+
+    game: str = "The Wind Waker"
+    type: Optional[str]
+    dungeon: Optional["Dungeon"] = None
+
+    def __init__(self, name: str, player: int, data: TWWItemData, classification: Optional[IC] = None) -> None:
+        super().__init__(
+            name,
+            data.classification if classification is None else classification,
+            None if data.code is None else TWWItem.get_apid(data.code),
+            player,
+        )
+
+        self.type = data.type
+        self.item_id = data.item_id
+
+    @staticmethod
+    def get_apid(code: int) -> int:
+        """
+        Compute the Archipelago ID for the given item code.
+
+        :param code: The unique code for the item.
+        :return: The computed Archipelago ID.
+        """
+        base_id: int = 2322432
+        return base_id + code
+
+    @property
+    def dungeon_item(self) -> Optional[str]:
+        """
+        Determine if the item is a dungeon item and, if so, returns its type.
+
+        :return: The type of dungeon item, or `None` if it is not a dungeon item.
+        """
+        if self.type in ("Small Key", "Big Key", "Map", "Compass"):
+            return self.type
+        return None
+
+
+ITEM_TABLE: dict[str, TWWItemData] = {
+    "Telescope":                 TWWItemData("Item",      IC.useful,                       0,  1, 0x20),
+  # "Boat's Sail":               TWWItemData("Item",      IC.progression,                  1,  1, 0x78),  # noqa: E131
+    "Wind Waker":                TWWItemData("Item",      IC.progression,                  2,  1, 0x22),
+    "Grappling Hook":            TWWItemData("Item",      IC.progression,                  3,  1, 0x25),
+    "Spoils Bag":                TWWItemData("Item",      IC.progression,                  4,  1, 0x24),
+    "Boomerang":                 TWWItemData("Item",      IC.progression,                  5,  1, 0x2D),
+    "Deku Leaf":                 TWWItemData("Item",      IC.progression,                  6,  1, 0x34),
+    "Tingle Tuner":              TWWItemData("Item",      IC.progression,                  7,  1, 0x21),
+    "Iron Boots":                TWWItemData("Item",      IC.progression,                  8,  1, 0x29),
+    "Magic Armor":               TWWItemData("Item",      IC.progression,                  9,  1, 0x2A),
+    "Bait Bag":                  TWWItemData("Item",      IC.progression,                 10,  1, 0x2C),
+    "Bombs":                     TWWItemData("Item",      IC.progression,                 11,  1, 0x31),
+    "Delivery Bag":              TWWItemData("Item",      IC.progression,                 12,  1, 0x30),
+    "Hookshot":                  TWWItemData("Item",      IC.progression,                 13,  1, 0x2F),
+    "Skull Hammer":              TWWItemData("Item",      IC.progression,                 14,  1, 0x33),
+    "Power Bracelets":           TWWItemData("Item",      IC.progression,                 15,  1, 0x28),
+
+    "Hero's Charm":              TWWItemData("Item",      IC.useful,                      16,  1, 0x43),
+    "Hurricane Spin":            TWWItemData("Item",      IC.useful,                      17,  1, 0xAA),
+    "Dragon Tingle Statue":      TWWItemData("Item",      IC.progression,                 18,  1, 0xA3),
+    "Forbidden Tingle Statue":   TWWItemData("Item",      IC.progression,                 19,  1, 0xA4),
+    "Goddess Tingle Statue":     TWWItemData("Item",      IC.progression,                 20,  1, 0xA5),
+    "Earth Tingle Statue":       TWWItemData("Item",      IC.progression,                 21,  1, 0xA6),
+    "Wind Tingle Statue":        TWWItemData("Item",      IC.progression,                 22,  1, 0xA7),
+
+    "Wind's Requiem":            TWWItemData("Item",      IC.progression,                 23,  1, 0x6D),
+    "Ballad of Gales":           TWWItemData("Item",      IC.progression,                 24,  1, 0x6E),
+    "Command Melody":            TWWItemData("Item",      IC.progression,                 25,  1, 0x6F),
+    "Earth God's Lyric":         TWWItemData("Item",      IC.progression,                 26,  1, 0x70),
+    "Wind God's Aria":           TWWItemData("Item",      IC.progression,                 27,  1, 0x71),
+    "Song of Passing":           TWWItemData("Item",      IC.progression,                 28,  1, 0x72),
+
+    "Triforce Shard 1":          TWWItemData("Item",      IC.progression,                 29,  1, 0x61),
+    "Triforce Shard 2":          TWWItemData("Item",      IC.progression,                 30,  1, 0x62),
+    "Triforce Shard 3":          TWWItemData("Item",      IC.progression,                 31,  1, 0x63),
+    "Triforce Shard 4":          TWWItemData("Item",      IC.progression,                 32,  1, 0x64),
+    "Triforce Shard 5":          TWWItemData("Item",      IC.progression,                 33,  1, 0x65),
+    "Triforce Shard 6":          TWWItemData("Item",      IC.progression,                 34,  1, 0x66),
+    "Triforce Shard 7":          TWWItemData("Item",      IC.progression,                 35,  1, 0x67),
+    "Triforce Shard 8":          TWWItemData("Item",      IC.progression,                 36,  1, 0x68),
+
+    "Skull Necklace":            TWWItemData("Item",      IC.filler,                      37,  9, 0x45),
+    "Boko Baba Seed":            TWWItemData("Item",      IC.filler,                      38,  1, 0x46),
+    "Golden Feather":            TWWItemData("Item",      IC.filler,                      39,  9, 0x47),
+    "Knight's Crest":            TWWItemData("Item",      IC.filler,                      40,  3, 0x48),
+    "Red Chu Jelly":             TWWItemData("Item",      IC.filler,                      41,  1, 0x49),
+    "Green Chu Jelly":           TWWItemData("Item",      IC.filler,                      42,  1, 0x4A),
+    "Joy Pendant":               TWWItemData("Item",      IC.filler,                      43, 20, 0x1F),
+    "All-Purpose Bait":          TWWItemData("Item",      IC.filler,                      44,  1, 0x82),
+    "Hyoi Pear":                 TWWItemData("Item",      IC.filler,                      45,  4, 0x83),
+
+    "Note to Mom":               TWWItemData("Item",      IC.progression,                 46,  1, 0x99),
+    "Maggie's Letter":           TWWItemData("Item",      IC.progression,                 47,  1, 0x9A),
+    "Moblin's Letter":           TWWItemData("Item",      IC.progression,                 48,  1, 0x9B),
+    "Cabana Deed":               TWWItemData("Item",      IC.progression,                 49,  1, 0x9C),
+    "Fill-Up Coupon":            TWWItemData("Item",      IC.useful,                      50,  1, 0x9E),
+
+    "Nayru's Pearl":             TWWItemData("Item",      IC.progression,                 51,  1, 0x69),
+    "Din's Pearl":               TWWItemData("Item",      IC.progression,                 52,  1, 0x6A),
+    "Farore's Pearl":            TWWItemData("Item",      IC.progression,                 53,  1, 0x6B),
+
+    "Progressive Sword":         TWWItemData("Item",      IC.progression,                 54,  4, 0x38),
+    "Progressive Shield":        TWWItemData("Item",      IC.progression,                 55,  2, 0x3B),
+    "Progressive Picto Box":     TWWItemData("Item",      IC.progression,                 56,  2, 0x23),
+    "Progressive Bow":           TWWItemData("Item",      IC.progression,                 57,  3, 0x27),
+    "Progressive Magic Meter":   TWWItemData("Item",      IC.progression,                 58,  2, 0xB1),
+    "Quiver Capacity Upgrade":   TWWItemData("Item",      IC.progression,                 59,  2, 0xAF),
+    "Bomb Bag Capacity Upgrade": TWWItemData("Item",      IC.useful,                      60,  2, 0xAD),
+    "Wallet Capacity Upgrade":   TWWItemData("Item",      IC.progression,                 61,  2, 0xAB),
+    "Empty Bottle":              TWWItemData("Item",      IC.progression,                 62,  4, 0x50),
+
+    "Triforce Chart 1":          TWWItemData("Item",      IC.progression_skip_balancing,  63,  1, 0xFE),
+    "Triforce Chart 2":          TWWItemData("Item",      IC.progression_skip_balancing,  64,  1, 0xFD),
+    "Triforce Chart 3":          TWWItemData("Item",      IC.progression_skip_balancing,  65,  1, 0xFC),
+    "Triforce Chart 4":          TWWItemData("Item",      IC.progression_skip_balancing,  66,  1, 0xFB),
+    "Triforce Chart 5":          TWWItemData("Item",      IC.progression_skip_balancing,  67,  1, 0xFA),
+    "Triforce Chart 6":          TWWItemData("Item",      IC.progression_skip_balancing,  68,  1, 0xF9),
+    "Triforce Chart 7":          TWWItemData("Item",      IC.progression_skip_balancing,  69,  1, 0xF8),
+    "Triforce Chart 8":          TWWItemData("Item",      IC.progression_skip_balancing,  70,  1, 0xF7),
+    "Treasure Chart 1":          TWWItemData("Item",      IC.progression_skip_balancing,  71,  1, 0xE7),
+    "Treasure Chart 2":          TWWItemData("Item",      IC.progression_skip_balancing,  72,  1, 0xEE),
+    "Treasure Chart 3":          TWWItemData("Item",      IC.progression_skip_balancing,  73,  1, 0xE0),
+    "Treasure Chart 4":          TWWItemData("Item",      IC.progression_skip_balancing,  74,  1, 0xE1),
+    "Treasure Chart 5":          TWWItemData("Item",      IC.progression_skip_balancing,  75,  1, 0xF2),
+    "Treasure Chart 6":          TWWItemData("Item",      IC.progression_skip_balancing,  76,  1, 0xEA),
+    "Treasure Chart 7":          TWWItemData("Item",      IC.progression_skip_balancing,  77,  1, 0xCC),
+    "Treasure Chart 8":          TWWItemData("Item",      IC.progression_skip_balancing,  78,  1, 0xD4),
+    "Treasure Chart 9":          TWWItemData("Item",      IC.progression_skip_balancing,  79,  1, 0xDA),
+    "Treasure Chart 10":         TWWItemData("Item",      IC.progression_skip_balancing,  80,  1, 0xDE),
+    "Treasure Chart 11":         TWWItemData("Item",      IC.progression_skip_balancing,  81,  1, 0xF6),
+    "Treasure Chart 12":         TWWItemData("Item",      IC.progression_skip_balancing,  82,  1, 0xE9),
+    "Treasure Chart 13":         TWWItemData("Item",      IC.progression_skip_balancing,  83,  1, 0xCF),
+    "Treasure Chart 14":         TWWItemData("Item",      IC.progression_skip_balancing,  84,  1, 0xDD),
+    "Treasure Chart 15":         TWWItemData("Item",      IC.progression_skip_balancing,  85,  1, 0xF5),
+    "Treasure Chart 16":         TWWItemData("Item",      IC.progression_skip_balancing,  86,  1, 0xE3),
+    "Treasure Chart 17":         TWWItemData("Item",      IC.progression_skip_balancing,  87,  1, 0xD7),
+    "Treasure Chart 18":         TWWItemData("Item",      IC.progression_skip_balancing,  88,  1, 0xE4),
+    "Treasure Chart 19":         TWWItemData("Item",      IC.progression_skip_balancing,  89,  1, 0xD1),
+    "Treasure Chart 20":         TWWItemData("Item",      IC.progression_skip_balancing,  90,  1, 0xF3),
+    "Treasure Chart 21":         TWWItemData("Item",      IC.progression_skip_balancing,  91,  1, 0xCE),
+    "Treasure Chart 22":         TWWItemData("Item",      IC.progression_skip_balancing,  92,  1, 0xD9),
+    "Treasure Chart 23":         TWWItemData("Item",      IC.progression_skip_balancing,  93,  1, 0xF1),
+    "Treasure Chart 24":         TWWItemData("Item",      IC.progression_skip_balancing,  94,  1, 0xEB),
+    "Treasure Chart 25":         TWWItemData("Item",      IC.progression_skip_balancing,  95,  1, 0xD6),
+    "Treasure Chart 26":         TWWItemData("Item",      IC.progression_skip_balancing,  96,  1, 0xD3),
+    "Treasure Chart 27":         TWWItemData("Item",      IC.progression_skip_balancing,  97,  1, 0xCD),
+    "Treasure Chart 28":         TWWItemData("Item",      IC.progression_skip_balancing,  98,  1, 0xE2),
+    "Treasure Chart 29":         TWWItemData("Item",      IC.progression_skip_balancing,  99,  1, 0xE6),
+    "Treasure Chart 30":         TWWItemData("Item",      IC.progression_skip_balancing, 100,  1, 0xF4),
+    "Treasure Chart 31":         TWWItemData("Item",      IC.progression_skip_balancing, 101,  1, 0xF0),
+    "Treasure Chart 32":         TWWItemData("Item",      IC.progression_skip_balancing, 102,  1, 0xD0),
+    "Treasure Chart 33":         TWWItemData("Item",      IC.progression_skip_balancing, 103,  1, 0xEF),
+    "Treasure Chart 34":         TWWItemData("Item",      IC.progression_skip_balancing, 104,  1, 0xE5),
+    "Treasure Chart 35":         TWWItemData("Item",      IC.progression_skip_balancing, 105,  1, 0xE8),
+    "Treasure Chart 36":         TWWItemData("Item",      IC.progression_skip_balancing, 106,  1, 0xD8),
+    "Treasure Chart 37":         TWWItemData("Item",      IC.progression_skip_balancing, 107,  1, 0xD5),
+    "Treasure Chart 38":         TWWItemData("Item",      IC.progression_skip_balancing, 108,  1, 0xED),
+    "Treasure Chart 39":         TWWItemData("Item",      IC.progression_skip_balancing, 109,  1, 0xEC),
+    "Treasure Chart 40":         TWWItemData("Item",      IC.progression_skip_balancing, 110,  1, 0xDF),
+    "Treasure Chart 41":         TWWItemData("Item",      IC.progression_skip_balancing, 111,  1, 0xD2),
+
+    "Tingle's Chart":            TWWItemData("Item",      IC.filler,                     112,  1, 0xDC),
+    "Ghost Ship Chart":          TWWItemData("Item",      IC.progression,                113,  1, 0xDB),
+    "Octo Chart":                TWWItemData("Item",      IC.filler,                     114,  1, 0xCA),
+    "Great Fairy Chart":         TWWItemData("Item",      IC.filler,                     115,  1, 0xC9),
+    "Secret Cave Chart":         TWWItemData("Item",      IC.filler,                     116,  1, 0xC6),
+    "Light Ring Chart":          TWWItemData("Item",      IC.filler,                     117,  1, 0xC5),
+    "Platform Chart":            TWWItemData("Item",      IC.filler,                     118,  1, 0xC4),
+    "Beedle's Chart":            TWWItemData("Item",      IC.filler,                     119,  1, 0xC3),
+    "Submarine Chart":           TWWItemData("Item",      IC.filler,                     120,  1, 0xC2),
+
+    "Green Rupee":               TWWItemData("Item",      IC.filler,                     121,  1, 0x01),
+    "Blue Rupee":                TWWItemData("Item",      IC.filler,                     122,  2, 0x02),
+    "Yellow Rupee":              TWWItemData("Item",      IC.filler,                     123,  3, 0x03),
+    "Red Rupee":                 TWWItemData("Item",      IC.filler,                     124,  8, 0x04),
+    "Purple Rupee":              TWWItemData("Item",      IC.filler,                     125, 10, 0x05),
+    "Orange Rupee":              TWWItemData("Item",      IC.useful,                     126, 15, 0x06),
+    "Silver Rupee":              TWWItemData("Item",      IC.useful,                     127, 20, 0x0F),
+    "Rainbow Rupee":             TWWItemData("Item",      IC.useful,                     128,  1, 0xB8),
+
+    "Piece of Heart":            TWWItemData("Item",      IC.useful,                     129, 44, 0x07),
+    "Heart Container":           TWWItemData("Item",      IC.useful,                     130,  6, 0x08),
+
+    "DRC Big Key":               TWWItemData("Big Key",   IC.progression,                131,  1, 0x14),
+    "DRC Small Key":             TWWItemData("Small Key", IC.progression,                132,  4, 0x13),
+    "FW Big Key":                TWWItemData("Big Key",   IC.progression,                133,  1, 0x40),
+    "FW Small Key":              TWWItemData("Small Key", IC.progression,                134,  1, 0x1D),
+    "TotG Big Key":              TWWItemData("Big Key",   IC.progression,                135,  1, 0x5C),
+    "TotG Small Key":            TWWItemData("Small Key", IC.progression,                136,  2, 0x5B),
+    "ET Big Key":                TWWItemData("Big Key",   IC.progression,                138,  1, 0x74),
+    "ET Small Key":              TWWItemData("Small Key", IC.progression,                139,  3, 0x73),
+    "WT Big Key":                TWWItemData("Big Key",   IC.progression,                140,  1, 0x81),
+    "WT Small Key":              TWWItemData("Small Key", IC.progression,                141,  2, 0x77),
+    "DRC Dungeon Map":           TWWItemData("Map",       IC.filler,                     142,  1, 0x1B),
+    "DRC Compass":               TWWItemData("Compass",   IC.filler,                     143,  1, 0x1C),
+    "FW Dungeon Map":            TWWItemData("Map",       IC.filler,                     144,  1, 0x41),
+    "FW Compass":                TWWItemData("Compass",   IC.filler,                     145,  1, 0x5A),
+    "TotG Dungeon Map":          TWWItemData("Map",       IC.filler,                     146,  1, 0x5D),
+    "TotG Compass":              TWWItemData("Compass",   IC.filler,                     147,  1, 0x5E),
+    "FF Dungeon Map":            TWWItemData("Map",       IC.filler,                     148,  1, 0x5F),
+    "FF Compass":                TWWItemData("Compass",   IC.filler,                     149,  1, 0x60),
+    "ET Dungeon Map":            TWWItemData("Map",       IC.filler,                     150,  1, 0x75),
+    "ET Compass":                TWWItemData("Compass",   IC.filler,                     151,  1, 0x76),
+    "WT Dungeon Map":            TWWItemData("Map",       IC.filler,                     152,  1, 0x84),
+    "WT Compass":                TWWItemData("Compass",   IC.filler,                     153,  1, 0x85),
+
+    "Victory":                   TWWItemData("Event",     IC.progression,               None,  1, None),
+}
+
+ISLAND_NUMBER_TO_CHART_NAME = {
+    1: "Treasure Chart 25",
+    2: "Treasure Chart 7",
+    3: "Treasure Chart 24",
+    4: "Triforce Chart 2",
+    5: "Treasure Chart 11",
+    6: "Triforce Chart 7",
+    7: "Treasure Chart 13",
+    8: "Treasure Chart 41",
+    9: "Treasure Chart 29",
+    10: "Treasure Chart 22",
+    11: "Treasure Chart 18",
+    12: "Treasure Chart 30",
+    13: "Treasure Chart 39",
+    14: "Treasure Chart 19",
+    15: "Treasure Chart 8",
+    16: "Treasure Chart 2",
+    17: "Treasure Chart 10",
+    18: "Treasure Chart 26",
+    19: "Treasure Chart 3",
+    20: "Treasure Chart 37",
+    21: "Treasure Chart 27",
+    22: "Treasure Chart 38",
+    23: "Triforce Chart 1",
+    24: "Treasure Chart 21",
+    25: "Treasure Chart 6",
+    26: "Treasure Chart 14",
+    27: "Treasure Chart 34",
+    28: "Treasure Chart 5",
+    29: "Treasure Chart 28",
+    30: "Treasure Chart 35",
+    31: "Triforce Chart 3",
+    32: "Triforce Chart 6",
+    33: "Treasure Chart 1",
+    34: "Treasure Chart 20",
+    35: "Treasure Chart 36",
+    36: "Treasure Chart 23",
+    37: "Treasure Chart 12",
+    38: "Treasure Chart 16",
+    39: "Treasure Chart 4",
+    40: "Treasure Chart 17",
+    41: "Treasure Chart 31",
+    42: "Triforce Chart 5",
+    43: "Treasure Chart 9",
+    44: "Triforce Chart 4",
+    45: "Treasure Chart 40",
+    46: "Triforce Chart 8",
+    47: "Treasure Chart 15",
+    48: "Treasure Chart 32",
+    49: "Treasure Chart 33",
+}
+
+
+LOOKUP_ID_TO_NAME: dict[int, str] = {
+    TWWItem.get_apid(data.code): item for item, data in ITEM_TABLE.items() if data.code is not None
+}
+
+item_name_groups = {
+    "Songs": {
+        "Wind's Requiem",
+        "Ballad of Gales",
+        "Command Melody",
+        "Earth God's Lyric",
+        "Wind God's Aria",
+        "Song of Passing",
+    },
+    "Mail": {
+        "Note to Mom",
+        "Maggie's Letter",
+        "Moblin's Letter",
+    },
+    "Special Charts": {
+        "Tingle's Chart",
+        "Ghost Ship Chart",
+        "Octo Chart",
+        "Great Fairy Chart",
+        "Secret Cave Chart",
+        "Light Ring Chart",
+        "Platform Chart",
+        "Beedle's Chart",
+        "Submarine Chart",
+    },
+}
+# generic groups, (Name, substring)
+_simple_groups = {
+    ("Tingle Statues", "Tingle Statue"),
+    ("Shards", "Shard"),
+    ("Pearls", "Pearl"),
+    ("Triforce Charts", "Triforce Chart"),
+    ("Treasure Charts", "Treasure Chart"),
+    ("Small Keys", "Small Key"),
+    ("Big Keys", "Big Key"),
+    ("Rupees", "Rupee"),
+    ("Dungeon Items", "Compass"),
+    ("Dungeon Items", "Map"),
+}
+for basename, substring in _simple_groups:
+    if basename not in item_name_groups:
+        item_name_groups[basename] = set()
+    for itemname in ITEM_TABLE:
+        if substring in itemname:
+            item_name_groups[basename].add(itemname)
diff --git a/worlds/tww/Locations.py b/worlds/tww/Locations.py
new file mode 100644
index 0000000000..477b91ee54
--- /dev/null
+++ b/worlds/tww/Locations.py
@@ -0,0 +1,1272 @@
+from enum import Enum, Flag, auto
+from typing import TYPE_CHECKING, NamedTuple, Optional
+
+from BaseClasses import Location, Region
+
+if TYPE_CHECKING:
+    from .randomizers.Dungeons import Dungeon
+
+
+class TWWFlag(Flag):
+    """
+    This class represents flags used for categorizing game locations.
+    Flags are used to group locations by their specific gameplay or logic attributes.
+    """
+
+    ALWAYS = auto()
+    DUNGEON = auto()
+    TNGL_CT = auto()
+    DG_SCRT = auto()
+    PZL_CVE = auto()
+    CBT_CVE = auto()
+    SAVAGE = auto()
+    GRT_FRY = auto()
+    SHRT_SQ = auto()
+    LONG_SQ = auto()
+    SPOILS = auto()
+    MINIGME = auto()
+    SPLOOSH = auto()
+    FREE_GF = auto()
+    MAILBOX = auto()
+    PLTFRMS = auto()
+    SUBMRIN = auto()
+    EYE_RFS = auto()
+    BG_OCTO = auto()
+    TRI_CHT = auto()
+    TRE_CHT = auto()
+    XPENSVE = auto()
+    ISLND_P = auto()
+    MISCELL = auto()
+    BOSS = auto()
+    OTHER = auto()
+
+
+class TWWLocationType(Enum):
+    """
+    This class defines constants for various types of locations in The Wind Waker.
+    """
+
+    CHART = auto()
+    BOCTO = auto()
+    CHEST = auto()
+    SWTCH = auto()
+    PCKUP = auto()
+    EVENT = auto()
+    SPECL = auto()
+
+
+class TWWLocationData(NamedTuple):
+    """
+    This class represents the data for a location in The Wind Waker.
+
+    :param code: The unique code identifier for the location.
+    :param flags: The flags that categorize the location.
+    :param region: The name of the region where the location resides.
+    :param stage_id: The ID of the stage where the location resides.
+    :param type: The type of the location.
+    :param bit: The bit in memory that is associated with the location. This is combined with other location data to
+    determine where in memory to determine whether the location has been checked. If the location is a special type,
+    this bit is ignored.
+    :param address: For certain location types, this variable contains the address of the byte with the check bit for
+    that location. Defaults to `None`.
+    """
+
+    code: Optional[int]
+    flags: TWWFlag
+    region: str
+    stage_id: int
+    type: TWWLocationType
+    bit: int
+    address: Optional[int] = None
+
+
+class TWWLocation(Location):
+    """
+    This class represents a location in The Wind Waker.
+
+    :param player: The ID of the player whose world the location is in.
+    :param name: The name of the location.
+    :param parent: The location's parent region.
+    :param data: The data associated with this location.
+    """
+
+    game: str = "The Wind Waker"
+    dungeon: Optional["Dungeon"] = None
+
+    def __init__(self, player: int, name: str, parent: Region, data: TWWLocationData):
+        address = None if data.code is None else TWWLocation.get_apid(data.code)
+        super().__init__(player, name, address=address, parent=parent)
+
+        self.code = data.code
+        self.flags = data.flags
+        self.region = data.region
+        self.stage_id = data.stage_id
+        self.type = data.type
+        self.bit = data.bit
+        self.address = self.address
+
+    @staticmethod
+    def get_apid(code: int) -> int:
+        """
+        Compute the Archipelago ID for the given location code.
+
+        :param code: The unique code for the location.
+        :return: The computed Archipelago ID.
+        """
+        base_id: int = 2326528
+        return base_id + code
+
+
+DUNGEON_NAMES = [
+    "Dragon Roost Cavern",
+    "Forbidden Woods",
+    "Tower of the Gods",
+    "Forsaken Fortress",
+    "Earth Temple",
+    "Wind Temple",
+]
+
+LOCATION_TABLE: dict[str, TWWLocationData] = {
+    # Outset Island
+    "Outset Island - Underneath Link's House": TWWLocationData(
+        0, TWWFlag.MISCELL, "The Great Sea", 0xB, TWWLocationType.CHEST, 5
+    ),
+    "Outset Island - Mesa the Grasscutter's House": TWWLocationData(
+        1, TWWFlag.MISCELL, "The Great Sea", 0xB, TWWLocationType.CHEST, 4
+    ),
+    "Outset Island - Orca - Give 10 Knight's Crests": TWWLocationData(
+        2, TWWFlag.SPOILS, "The Great Sea", 0xB, TWWLocationType.EVENT, 5, 0x803C5237
+    ),
+    # "Outset Island - Orca - Hit 500 Times": TWWLocationData(
+    #     3, TWWFlag.OTHER, "The Great Sea"
+    # ),
+    "Outset Island - Great Fairy": TWWLocationData(
+        4, TWWFlag.GRT_FRY, "The Great Sea", 0xC, TWWLocationType.EVENT, 4, 0x803C525C
+    ),
+    "Outset Island - Jabun's Cave": TWWLocationData(
+        5, TWWFlag.ISLND_P, "The Great Sea", 0xB, TWWLocationType.CHEST, 6
+    ),
+    "Outset Island - Dig up Black Soil": TWWLocationData(
+        6, TWWFlag.ISLND_P, "The Great Sea", 0x0, TWWLocationType.PCKUP, 2
+    ),
+    "Outset Island - Savage Labyrinth - Floor 30": TWWLocationData(
+        7, TWWFlag.SAVAGE, "Savage Labyrinth", 0xD, TWWLocationType.CHEST, 11
+    ),
+    "Outset Island - Savage Labyrinth - Floor 50": TWWLocationData(
+        8, TWWFlag.SAVAGE, "Savage Labyrinth", 0xD, TWWLocationType.CHEST, 12
+    ),
+
+    # Windfall Island
+    "Windfall Island - Jail - Tingle - First Gift": TWWLocationData(
+        9, TWWFlag.FREE_GF, "The Great Sea", 0xB, TWWLocationType.SWTCH, 53
+    ),
+    "Windfall Island - Jail - Tingle - Second Gift": TWWLocationData(
+        10, TWWFlag.FREE_GF, "The Great Sea", 0xB, TWWLocationType.SWTCH, 54
+    ),
+    "Windfall Island - Jail - Maze Chest": TWWLocationData(
+        11, TWWFlag.ISLND_P, "The Great Sea", 0xB, TWWLocationType.CHEST, 0
+    ),
+    "Windfall Island - Chu Jelly Juice Shop - Give 15 Green Chu Jelly": TWWLocationData(
+        12, TWWFlag.SPOILS, "The Great Sea", 0xB, TWWLocationType.EVENT, 2, 0x803C5239
+    ),
+    "Windfall Island - Chu Jelly Juice Shop - Give 15 Blue Chu Jelly": TWWLocationData(
+        13, TWWFlag.SPOILS | TWWFlag.LONG_SQ, "The Great Sea", 0xB, TWWLocationType.EVENT, 1, 0x803C5239
+    ),
+    "Windfall Island - Ivan - Catch Killer Bees": TWWLocationData(
+        14, TWWFlag.SHRT_SQ, "The Great Sea", 0x0, TWWLocationType.EVENT, 6, 0x803C523F
+    ),
+    "Windfall Island - Mrs. Marie - Catch Killer Bees": TWWLocationData(
+        15, TWWFlag.SHRT_SQ, "The Great Sea", 0xB, TWWLocationType.EVENT, 7, 0x803C524B
+    ),
+    "Windfall Island - Mrs. Marie - Give 1 Joy Pendant": TWWLocationData(
+        16, TWWFlag.SPOILS, "The Great Sea", 0xB, TWWLocationType.EVENT, 0, 0x803C52EC
+    ),
+    "Windfall Island - Mrs. Marie - Give 21 Joy Pendants": TWWLocationData(
+        17, TWWFlag.SPOILS, "The Great Sea", 0xB, TWWLocationType.EVENT, 3, 0x803C5248
+    ),
+    "Windfall Island - Mrs. Marie - Give 40 Joy Pendants": TWWLocationData(
+        18, TWWFlag.SPOILS, "The Great Sea", 0xB, TWWLocationType.EVENT, 2, 0x803C5248
+    ),
+    "Windfall Island - Lenzo's House - Left Chest": TWWLocationData(
+        19, TWWFlag.SHRT_SQ, "The Great Sea", 0xB, TWWLocationType.CHEST, 1
+    ),
+    "Windfall Island - Lenzo's House - Right Chest": TWWLocationData(
+        20, TWWFlag.SHRT_SQ, "The Great Sea", 0xB, TWWLocationType.CHEST, 2
+    ),
+    "Windfall Island - Lenzo's House - Become Lenzo's Assistant": TWWLocationData(
+        21, TWWFlag.LONG_SQ, "The Great Sea", 0xB, TWWLocationType.SPECL, 0, 0x803C52F0
+    ),
+    "Windfall Island - Lenzo's House - Bring Forest Firefly": TWWLocationData(
+        22, TWWFlag.LONG_SQ, "The Great Sea", 0xB, TWWLocationType.EVENT, 5, 0x803C5295
+    ),
+    "Windfall Island - House of Wealth Chest": TWWLocationData(
+        23, TWWFlag.MISCELL, "The Great Sea", 0xB, TWWLocationType.CHEST, 3
+    ),
+    "Windfall Island - Maggie's Father - Give 20 Skull Necklaces": TWWLocationData(
+        24, TWWFlag.SPOILS, "The Great Sea", 0xB, TWWLocationType.EVENT, 4, 0x803C52F1
+    ),
+    "Windfall Island - Maggie - Free Item": TWWLocationData(
+        25, TWWFlag.FREE_GF, "The Great Sea", 0xB, TWWLocationType.EVENT, 0, 0x803C5296
+    ),
+    "Windfall Island - Maggie - Delivery Reward": TWWLocationData(
+        # TODO: Where is the flag for this location. Using a temporary workaround for now.
+        26, TWWFlag.SHRT_SQ, "The Great Sea", 0xB, TWWLocationType.SPECL, 0
+    ),
+    "Windfall Island - Cafe Bar - Postman": TWWLocationData(
+        27, TWWFlag.SHRT_SQ, "The Great Sea", 0xB, TWWLocationType.EVENT, 1, 0x803C5296
+    ),
+    "Windfall Island - Kreeb - Light Up Lighthouse": TWWLocationData(
+        28, TWWFlag.SHRT_SQ, "The Great Sea", 0x0, TWWLocationType.EVENT, 5, 0x803C5247
+    ),
+    "Windfall Island - Transparent Chest": TWWLocationData(
+        29, TWWFlag.SHRT_SQ, "The Great Sea", 0x0, TWWLocationType.CHEST, 10
+    ),
+    "Windfall Island - Tott - Teach Rhythm": TWWLocationData(
+        30, TWWFlag.FREE_GF, "The Great Sea", 0x0, TWWLocationType.EVENT, 6, 0x803C5238
+    ),
+    "Windfall Island - Pirate Ship": TWWLocationData(
+        31, TWWFlag.MINIGME, "The Great Sea", 0xD, TWWLocationType.CHEST, 5
+    ),
+    "Windfall Island - 5 Rupee Auction": TWWLocationData(
+        32, TWWFlag.XPENSVE | TWWFlag.MINIGME, "The Great Sea", 0xB, TWWLocationType.EVENT, 7, 0x803C523C
+    ),
+    "Windfall Island - 40 Rupee Auction": TWWLocationData(
+        33, TWWFlag.XPENSVE | TWWFlag.MINIGME, "The Great Sea", 0xB, TWWLocationType.EVENT, 0, 0x803C523B
+    ),
+    "Windfall Island - 60 Rupee Auction": TWWLocationData(
+        34, TWWFlag.XPENSVE | TWWFlag.MINIGME, "The Great Sea", 0xB, TWWLocationType.EVENT, 6, 0x803C523C
+    ),
+    "Windfall Island - 80 Rupee Auction": TWWLocationData(
+        35, TWWFlag.XPENSVE | TWWFlag.MINIGME, "The Great Sea", 0xB, TWWLocationType.EVENT, 5, 0x803C523C
+    ),
+    "Windfall Island - Zunari - Stock Exotic Flower in Zunari's Shop": TWWLocationData(
+        36, TWWFlag.SHRT_SQ, "The Great Sea", 0x0, TWWLocationType.EVENT, 6, 0x803C5295
+    ),
+    "Windfall Island - Sam - Decorate the Town": TWWLocationData(
+        37, TWWFlag.LONG_SQ, "The Great Sea", 0x0, TWWLocationType.EVENT, 4, 0x803C5247
+    ),
+    # "Windfall Island - Kane - Place Shop Guru Statue on Gate": TWWLocationData(
+    #     38, TWWFlag.OTHER, "The Great Sea", 0x0, TWWLocationType.EVENT, 4, 0x803C5250
+    # ),
+    # "Windfall Island - Kane - Place Postman Statue on Gate": TWWLocationData(
+    #     39, TWWFlag.OTHER, "The Great Sea", 0x0, TWWLocationType.EVENT, 3, 0x803C5250
+    # ),
+    # "Windfall Island - Kane - Place Six Flags on Gate": TWWLocationData(
+    #     40, TWWFlag.OTHER, "The Great Sea", 0x0, TWWLocationType.EVENT, 2, 0x803C5250
+    # ),
+    # "Windfall Island - Kane - Place Six Idols on Gate": TWWLocationData(
+    #     41, TWWFlag.OTHER, "The Great Sea", 0x0, TWWLocationType.EVENT, 1, 0x803C5250
+    # ),
+    "Windfall Island - Mila - Follow the Thief": TWWLocationData(
+        42, TWWFlag.SHRT_SQ, "The Great Sea", 0x0, TWWLocationType.EVENT, 3, 0x803C523A
+    ),
+    "Windfall Island - Battlesquid - First Prize": TWWLocationData(
+        43, TWWFlag.SPLOOSH, "The Great Sea", 0xB, TWWLocationType.EVENT, 0, 0x803C532A
+    ),
+    "Windfall Island - Battlesquid - Second Prize": TWWLocationData(
+        44, TWWFlag.SPLOOSH, "The Great Sea", 0xB, TWWLocationType.EVENT, 1, 0x803C532A
+    ),
+    "Windfall Island - Battlesquid - Under 20 Shots Prize": TWWLocationData(
+        45, TWWFlag.SPLOOSH, "The Great Sea", 0xB, TWWLocationType.EVENT, 0, 0x803C532B
+    ),
+    "Windfall Island - Pompie and Vera - Secret Meeting Photo": TWWLocationData(
+        46, TWWFlag.SHRT_SQ, "The Great Sea", 0x0, TWWLocationType.EVENT, 2, 0x803C5295
+    ),
+    "Windfall Island - Kamo - Full Moon Photo": TWWLocationData(
+        47, TWWFlag.LONG_SQ, "The Great Sea", 0x0, TWWLocationType.EVENT, 4, 0x803C5295
+    ),
+    "Windfall Island - Minenco - Miss Windfall Photo": TWWLocationData(
+        48, TWWFlag.SHRT_SQ, "The Great Sea", 0x0, TWWLocationType.EVENT, 3, 0x803C5295
+    ),
+    "Windfall Island - Linda and Anton": TWWLocationData(
+        49, TWWFlag.LONG_SQ, "The Great Sea", 0xB, TWWLocationType.EVENT, 7, 0x803C524E
+    ),
+
+    # Dragon Roost Island
+    "Dragon Roost Island - Wind Shrine": TWWLocationData(
+        50, TWWFlag.MISCELL, "The Great Sea", 0x0, TWWLocationType.EVENT, 3, 0x803C5253
+    ),
+    "Dragon Roost Island - Rito Aerie - Give Hoskit 20 Golden Feathers": TWWLocationData(
+        51, TWWFlag.SPOILS, "The Great Sea", 0xB, TWWLocationType.EVENT, 7, 0x803C524D
+    ),
+    "Dragon Roost Island - Chest on Top of Boulder": TWWLocationData(
+        52, TWWFlag.ISLND_P, "The Great Sea", 0x0, TWWLocationType.CHEST, 8
+    ),
+    "Dragon Roost Island - Fly Across Platforms Around Island": TWWLocationData(
+        53, TWWFlag.ISLND_P, "The Great Sea", 0x0, TWWLocationType.CHEST, 9
+    ),
+    "Dragon Roost Island - Rito Aerie - Mail Sorting": TWWLocationData(
+        54, TWWFlag.MINIGME, "The Great Sea", 0xB, TWWLocationType.EVENT, 0, 0x803C5253
+    ),
+    "Dragon Roost Island - Secret Cave": TWWLocationData(
+        55, TWWFlag.CBT_CVE, "Dragon Roost Island Secret Cave", 0xD, TWWLocationType.CHEST, 0
+    ),
+
+    # Dragon Roost Cavern
+    "Dragon Roost Cavern - First Room": TWWLocationData(
+        56, TWWFlag.DUNGEON, "Dragon Roost Cavern", 0x3, TWWLocationType.CHEST, 0
+    ),
+    "Dragon Roost Cavern - Alcove With Water Jugs": TWWLocationData(
+        57, TWWFlag.DUNGEON, "Dragon Roost Cavern", 0x3, TWWLocationType.CHEST, 2
+    ),
+    "Dragon Roost Cavern - Water Jug on Upper Shelf": TWWLocationData(
+        58, TWWFlag.DUNGEON | TWWFlag.DG_SCRT, "Dragon Roost Cavern", 0x3, TWWLocationType.PCKUP, 1
+    ),
+    "Dragon Roost Cavern - Boarded Up Chest": TWWLocationData(
+        59, TWWFlag.DUNGEON, "Dragon Roost Cavern", 0x3, TWWLocationType.CHEST, 1
+    ),
+    "Dragon Roost Cavern - Chest Across Lava Pit": TWWLocationData(
+        60, TWWFlag.DUNGEON, "Dragon Roost Cavern", 0x3, TWWLocationType.CHEST, 13
+    ),
+    "Dragon Roost Cavern - Rat Room": TWWLocationData(
+        61, TWWFlag.DUNGEON, "Dragon Roost Cavern", 0x3, TWWLocationType.CHEST, 14
+    ),
+    "Dragon Roost Cavern - Rat Room Boarded Up Chest": TWWLocationData(
+        62, TWWFlag.DUNGEON, "Dragon Roost Cavern", 0x3, TWWLocationType.CHEST, 3
+    ),
+    "Dragon Roost Cavern - Bird's Nest": TWWLocationData(
+        63, TWWFlag.DUNGEON, "Dragon Roost Cavern", 0x3, TWWLocationType.PCKUP, 3
+    ),
+    "Dragon Roost Cavern - Dark Room": TWWLocationData(
+        64, TWWFlag.DUNGEON, "Dragon Roost Cavern", 0x3, TWWLocationType.CHEST, 4
+    ),
+    "Dragon Roost Cavern - Tingle Chest in Hub Room": TWWLocationData(
+        65, TWWFlag.TNGL_CT | TWWFlag.DUNGEON, "Dragon Roost Cavern", 0x3, TWWLocationType.CHEST, 16
+    ),
+    "Dragon Roost Cavern - Pot on Upper Shelf in Pot Room": TWWLocationData(
+        66, TWWFlag.DUNGEON | TWWFlag.DG_SCRT, "Dragon Roost Cavern", 0x3, TWWLocationType.PCKUP, 0
+    ),
+    "Dragon Roost Cavern - Pot Room Chest": TWWLocationData(
+        67, TWWFlag.DUNGEON, "Dragon Roost Cavern", 0x3, TWWLocationType.CHEST, 6
+    ),
+    "Dragon Roost Cavern - Miniboss": TWWLocationData(
+        68, TWWFlag.DUNGEON, "Dragon Roost Cavern", 0x3, TWWLocationType.CHEST, 17
+    ),
+    "Dragon Roost Cavern - Under Rope Bridge": TWWLocationData(
+        69, TWWFlag.DUNGEON, "Dragon Roost Cavern", 0x3, TWWLocationType.CHEST, 7
+    ),
+    "Dragon Roost Cavern - Tingle Statue Chest": TWWLocationData(
+        70, TWWFlag.TNGL_CT | TWWFlag.DUNGEON, "Dragon Roost Cavern", 0x3, TWWLocationType.CHEST, 15
+    ),
+    "Dragon Roost Cavern - Big Key Chest": TWWLocationData(
+        71, TWWFlag.DUNGEON, "Dragon Roost Cavern", 0x3, TWWLocationType.CHEST, 12
+    ),
+    "Dragon Roost Cavern - Boss Stairs Right Chest": TWWLocationData(
+        72, TWWFlag.DUNGEON, "Dragon Roost Cavern", 0x3, TWWLocationType.CHEST, 11
+    ),
+    "Dragon Roost Cavern - Boss Stairs Left Chest": TWWLocationData(
+        73, TWWFlag.DUNGEON, "Dragon Roost Cavern", 0x3, TWWLocationType.CHEST, 10
+    ),
+    "Dragon Roost Cavern - Boss Stairs Right Pot": TWWLocationData(
+        74, TWWFlag.DUNGEON | TWWFlag.DG_SCRT, "Dragon Roost Cavern", 0x3, TWWLocationType.PCKUP, 6
+    ),
+    "Dragon Roost Cavern - Gohma Heart Container": TWWLocationData(
+        75, TWWFlag.DUNGEON | TWWFlag.BOSS, "Gohma Boss Arena", 0x3, TWWLocationType.PCKUP, 21
+    ),
+
+    # Forest Haven
+    "Forest Haven - On Tree Branch": TWWLocationData(
+        76, TWWFlag.ISLND_P, "The Great Sea", 0xB, TWWLocationType.PCKUP, 2
+    ),
+    "Forest Haven - Small Island Chest": TWWLocationData(
+        77, TWWFlag.ISLND_P, "The Great Sea", 0x0, TWWLocationType.CHEST, 7
+    ),
+
+    # Forbidden Woods
+    "Forbidden Woods - First Room": TWWLocationData(
+        78, TWWFlag.DUNGEON, "Forbidden Woods", 0x4, TWWLocationType.CHEST, 0
+    ),
+    "Forbidden Woods - Inside Hollow Tree's Mouth": TWWLocationData(
+        79, TWWFlag.DUNGEON, "Forbidden Woods", 0x4, TWWLocationType.CHEST, 1
+    ),
+    "Forbidden Woods - Climb to Top Using Boko Baba Bulbs": TWWLocationData(
+        80, TWWFlag.DUNGEON, "Forbidden Woods", 0x4, TWWLocationType.CHEST, 2
+    ),
+    "Forbidden Woods - Pot High Above Hollow Tree": TWWLocationData(
+        81, TWWFlag.DUNGEON | TWWFlag.DG_SCRT, "Forbidden Woods", 0x4, TWWLocationType.PCKUP, 1
+    ),
+    "Forbidden Woods - Hole in Tree": TWWLocationData(
+        82, TWWFlag.DUNGEON, "Forbidden Woods", 0x4, TWWLocationType.CHEST, 6
+    ),
+    "Forbidden Woods - Morth Pit": TWWLocationData(
+        83, TWWFlag.DUNGEON, "Forbidden Woods", 0x4, TWWLocationType.CHEST, 8
+    ),
+    "Forbidden Woods - Vine Maze Left Chest": TWWLocationData(
+        84, TWWFlag.DUNGEON, "Forbidden Woods", 0x4, TWWLocationType.CHEST, 7
+    ),
+    "Forbidden Woods - Vine Maze Right Chest": TWWLocationData(
+        85, TWWFlag.DUNGEON, "Forbidden Woods", 0x4, TWWLocationType.CHEST, 5
+    ),
+    "Forbidden Woods - Highest Pot in Vine Maze": TWWLocationData(
+        86, TWWFlag.DUNGEON | TWWFlag.DG_SCRT, "Forbidden Woods", 0x4, TWWLocationType.PCKUP, 22
+    ),
+    "Forbidden Woods - Tall Room Before Miniboss": TWWLocationData(
+        87, TWWFlag.DUNGEON, "Forbidden Woods", 0x4, TWWLocationType.CHEST, 12
+    ),
+    "Forbidden Woods - Mothula Miniboss Room": TWWLocationData(
+        88, TWWFlag.DUNGEON, "Forbidden Woods Miniboss Arena", 0x4, TWWLocationType.CHEST, 10
+    ),
+    "Forbidden Woods - Past Seeds Hanging by Vines": TWWLocationData(
+        89, TWWFlag.DUNGEON, "Forbidden Woods", 0x4, TWWLocationType.CHEST, 3
+    ),
+    "Forbidden Woods - Chest Across Red Hanging Flower": TWWLocationData(
+        90, TWWFlag.DUNGEON, "Forbidden Woods", 0x4, TWWLocationType.CHEST, 11
+    ),
+    "Forbidden Woods - Tingle Statue Chest": TWWLocationData(
+        91, TWWFlag.TNGL_CT | TWWFlag.DUNGEON, "Forbidden Woods", 0x4, TWWLocationType.CHEST, 15
+    ),
+    "Forbidden Woods - Chest in Locked Tree Trunk": TWWLocationData(
+        92, TWWFlag.DUNGEON, "Forbidden Woods", 0x4, TWWLocationType.CHEST, 9
+    ),
+    "Forbidden Woods - Big Key Chest": TWWLocationData(
+        93, TWWFlag.DUNGEON, "Forbidden Woods", 0x4, TWWLocationType.CHEST, 4
+    ),
+    "Forbidden Woods - Double Mothula Room": TWWLocationData(
+        94, TWWFlag.DUNGEON, "Forbidden Woods", 0x4, TWWLocationType.CHEST, 14
+    ),
+    "Forbidden Woods - Kalle Demos Heart Container": TWWLocationData(
+        95, TWWFlag.DUNGEON | TWWFlag.BOSS, "Kalle Demos Boss Arena", 0x4, TWWLocationType.PCKUP, 21
+    ),
+
+    # Greatfish Isle
+    "Greatfish Isle - Hidden Chest": TWWLocationData(
+        96, TWWFlag.ISLND_P, "The Great Sea", 0x0, TWWLocationType.CHEST, 6
+    ),
+
+    # Tower of the Gods
+    "Tower of the Gods - Chest Behind Bombable Walls": TWWLocationData(
+        97, TWWFlag.DUNGEON, "Tower of the Gods", 0x5, TWWLocationType.CHEST, 2
+    ),
+    "Tower of the Gods - Pot Behind Bombable Walls": TWWLocationData(
+        98, TWWFlag.DUNGEON | TWWFlag.DG_SCRT, "Tower of the Gods", 0x5, TWWLocationType.PCKUP, 0
+    ),
+    "Tower of the Gods - Hop Across Floating Boxes": TWWLocationData(
+        99, TWWFlag.DUNGEON, "Tower of the Gods", 0x5, TWWLocationType.CHEST, 1
+    ),
+    "Tower of the Gods - Light Two Torches": TWWLocationData(
+        100, TWWFlag.DUNGEON, "Tower of the Gods", 0x5, TWWLocationType.CHEST, 10
+    ),
+    "Tower of the Gods - Skulls Room Chest": TWWLocationData(
+        101, TWWFlag.DUNGEON, "Tower of the Gods", 0x5, TWWLocationType.CHEST, 3
+    ),
+    "Tower of the Gods - Shoot Eye Above Skulls Room Chest": TWWLocationData(
+        102, TWWFlag.DUNGEON, "Tower of the Gods", 0x5, TWWLocationType.CHEST, 9
+    ),
+    "Tower of the Gods - Tingle Statue Chest": TWWLocationData(
+        103, TWWFlag.TNGL_CT | TWWFlag.DUNGEON, "Tower of the Gods", 0x5, TWWLocationType.CHEST, 15
+    ),
+    "Tower of the Gods - First Chest Guarded by Armos Knights": TWWLocationData(
+        104, TWWFlag.DUNGEON, "Tower of the Gods", 0x5, TWWLocationType.CHEST, 6
+    ),
+    "Tower of the Gods - Stone Tablet": TWWLocationData(
+        105, TWWFlag.DUNGEON, "Tower of the Gods", 0x5, TWWLocationType.EVENT, 4, 0x803C5251
+    ),
+    "Tower of the Gods - Darknut Miniboss Room": TWWLocationData(
+        106, TWWFlag.DUNGEON, "Tower of the Gods Miniboss Arena", 0x5, TWWLocationType.CHEST, 5
+    ),
+    "Tower of the Gods - Second Chest Guarded by Armos Knights": TWWLocationData(
+        107, TWWFlag.DUNGEON, "Tower of the Gods", 0x5, TWWLocationType.CHEST, 8
+    ),
+    "Tower of the Gods - Floating Platforms Room": TWWLocationData(
+        108, TWWFlag.DUNGEON, "Tower of the Gods", 0x5, TWWLocationType.CHEST, 4
+    ),
+    "Tower of the Gods - Top of Floating Platforms Room": TWWLocationData(
+        109, TWWFlag.DUNGEON, "Tower of the Gods", 0x5, TWWLocationType.CHEST, 11
+    ),
+    "Tower of the Gods - Eastern Pot in Big Key Chest Room": TWWLocationData(
+        110, TWWFlag.DUNGEON | TWWFlag.DG_SCRT, "Tower of the Gods", 0x5, TWWLocationType.PCKUP, 1
+    ),
+    "Tower of the Gods - Big Key Chest": TWWLocationData(
+        111, TWWFlag.DUNGEON, "Tower of the Gods", 0x5, TWWLocationType.CHEST, 0
+    ),
+    "Tower of the Gods - Gohdan Heart Container": TWWLocationData(
+        112, TWWFlag.DUNGEON | TWWFlag.BOSS, "Gohdan Boss Arena", 0x5, TWWLocationType.PCKUP, 21
+    ),
+
+    # Hyrule
+    "Hyrule - Master Sword Chamber": TWWLocationData(
+        113, TWWFlag.DUNGEON, "Master Sword Chamber", 0x9, TWWLocationType.CHEST, 0
+    ),
+
+    # Forsaken Fortress
+    "Forsaken Fortress - Phantom Ganon": TWWLocationData(
+        114, TWWFlag.DUNGEON, "The Great Sea", 0x0, TWWLocationType.CHEST, 16
+    ),
+    "Forsaken Fortress - Chest Outside Upper Jail Cell": TWWLocationData(
+        115, TWWFlag.DUNGEON, "The Great Sea", 0x2, TWWLocationType.CHEST, 0
+    ),
+    "Forsaken Fortress - Chest Inside Lower Jail Cell": TWWLocationData(
+        116, TWWFlag.DUNGEON, "The Great Sea", 0x2, TWWLocationType.CHEST, 3
+    ),
+    "Forsaken Fortress - Chest Guarded By Bokoblin": TWWLocationData(
+        117, TWWFlag.DUNGEON, "The Great Sea", 0x2, TWWLocationType.CHEST, 2
+    ),
+    "Forsaken Fortress - Chest on Bed": TWWLocationData(
+        118, TWWFlag.DUNGEON, "The Great Sea", 0x2, TWWLocationType.CHEST, 1
+    ),
+    "Forsaken Fortress - Helmaroc King Heart Container": TWWLocationData(
+        119, TWWFlag.DUNGEON | TWWFlag.BOSS, "Helmaroc King Boss Arena", 0x2, TWWLocationType.PCKUP, 21
+    ),
+
+    # Mother and Child Isles
+    "Mother and Child Isles - Inside Mother Isle": TWWLocationData(
+        120, TWWFlag.MISCELL, "The Great Sea", 0x0, TWWLocationType.CHEST, 28
+    ),
+
+    # Fire Mountain
+    "Fire Mountain - Cave - Chest": TWWLocationData(
+        121, TWWFlag.PZL_CVE | TWWFlag.CBT_CVE, "Fire Mountain Secret Cave", 0xC, TWWLocationType.CHEST, 0
+    ),
+    "Fire Mountain - Lookout Platform Chest": TWWLocationData(
+        122, TWWFlag.PLTFRMS, "The Great Sea", 0x1, TWWLocationType.CHEST, 1
+    ),
+    "Fire Mountain - Lookout Platform - Destroy the Cannons": TWWLocationData(
+        123, TWWFlag.PLTFRMS, "The Great Sea", 0x1, TWWLocationType.CHEST, 0
+    ),
+    "Fire Mountain - Big Octo": TWWLocationData(
+        124, TWWFlag.BG_OCTO, "The Great Sea", 0x0, TWWLocationType.BOCTO, 0, 0x803C51F0
+    ),
+
+    # Ice Ring Isle
+    "Ice Ring Isle - Frozen Chest": TWWLocationData(
+        125, TWWFlag.ISLND_P, "The Great Sea", 0x0, TWWLocationType.CHEST, 18
+    ),
+    "Ice Ring Isle - Cave - Chest": TWWLocationData(
+        126, TWWFlag.PZL_CVE, "Ice Ring Isle Secret Cave", 0xC, TWWLocationType.CHEST, 1
+    ),
+    "Ice Ring Isle - Inner Cave - Chest": TWWLocationData(
+        127, TWWFlag.PZL_CVE | TWWFlag.CBT_CVE, "Ice Ring Isle Inner Cave", 0xC, TWWLocationType.CHEST, 21
+    ),
+
+    # Headstone Island
+    "Headstone Island - Top of the Island": TWWLocationData(
+        128, TWWFlag.ISLND_P, "The Great Sea", 0x0, TWWLocationType.PCKUP, 8
+    ),
+    "Headstone Island - Submarine": TWWLocationData(
+        129, TWWFlag.SUBMRIN, "The Great Sea", 0xA, TWWLocationType.CHEST, 4
+    ),
+
+    # Earth Temple
+    "Earth Temple - Transparent Chest In Warp Pot Room": TWWLocationData(
+        130, TWWFlag.DUNGEON, "Earth Temple", 0x6, TWWLocationType.CHEST, 0
+    ),
+    "Earth Temple - Behind Curtain In Warp Pot Room": TWWLocationData(
+        131, TWWFlag.DUNGEON | TWWFlag.DG_SCRT, "Earth Temple", 0x6, TWWLocationType.PCKUP, 0
+    ),
+    "Earth Temple - Transparent Chest in First Crypt": TWWLocationData(
+        132, TWWFlag.DUNGEON, "Earth Temple", 0x6, TWWLocationType.CHEST, 1
+    ),
+    "Earth Temple - Chest Behind Destructible Walls": TWWLocationData(
+        133, TWWFlag.DUNGEON, "Earth Temple", 0x6, TWWLocationType.CHEST, 12
+    ),
+    "Earth Temple - Chest In Three Blocks Room": TWWLocationData(
+        134, TWWFlag.DUNGEON, "Earth Temple", 0x6, TWWLocationType.CHEST, 2
+    ),
+    "Earth Temple - Chest Behind Statues": TWWLocationData(
+        135, TWWFlag.DUNGEON, "Earth Temple", 0x6, TWWLocationType.CHEST, 3
+    ),
+    "Earth Temple - Casket in Second Crypt": TWWLocationData(
+        136, TWWFlag.DUNGEON, "Earth Temple", 0x6, TWWLocationType.PCKUP, 14
+    ),
+    "Earth Temple - Stalfos Miniboss Room": TWWLocationData(
+        137, TWWFlag.DUNGEON, "Earth Temple Miniboss Arena", 0x6, TWWLocationType.CHEST, 7
+    ),
+    "Earth Temple - Tingle Statue Chest": TWWLocationData(
+        138, TWWFlag.TNGL_CT | TWWFlag.DUNGEON, "Earth Temple", 0x6, TWWLocationType.CHEST, 15
+    ),
+    "Earth Temple - End of Foggy Room With Floormasters": TWWLocationData(
+        139, TWWFlag.DUNGEON, "Earth Temple", 0x6, TWWLocationType.CHEST, 4
+    ),
+    "Earth Temple - Kill All Floormasters in Foggy Room": TWWLocationData(
+        140, TWWFlag.DUNGEON, "Earth Temple", 0x6, TWWLocationType.CHEST, 11
+    ),
+    "Earth Temple - Behind Curtain Next to Hammer Button": TWWLocationData(
+        141, TWWFlag.DUNGEON | TWWFlag.DG_SCRT, "Earth Temple", 0x6, TWWLocationType.PCKUP, 1
+    ),
+    "Earth Temple - Chest in Third Crypt": TWWLocationData(
+        142, TWWFlag.DUNGEON, "Earth Temple", 0x6, TWWLocationType.CHEST, 5
+    ),
+    "Earth Temple - Many Mirrors Room Right Chest": TWWLocationData(
+        143, TWWFlag.DUNGEON, "Earth Temple", 0x6, TWWLocationType.CHEST, 9
+    ),
+    "Earth Temple - Many Mirrors Room Left Chest": TWWLocationData(
+        144, TWWFlag.DUNGEON, "Earth Temple", 0x6, TWWLocationType.CHEST, 10
+    ),
+    "Earth Temple - Stalfos Crypt Room": TWWLocationData(
+        145, TWWFlag.DUNGEON, "Earth Temple", 0x6, TWWLocationType.CHEST, 14
+    ),
+    "Earth Temple - Big Key Chest": TWWLocationData(
+        146, TWWFlag.DUNGEON, "Earth Temple", 0x6, TWWLocationType.CHEST, 6
+    ),
+    "Earth Temple - Jalhalla Heart Container": TWWLocationData(
+        147, TWWFlag.DUNGEON | TWWFlag.BOSS, "Jalhalla Boss Arena", 0x6, TWWLocationType.PCKUP, 21
+    ),
+
+    # Wind Temple
+    "Wind Temple - Chest Between Two Dirt Patches": TWWLocationData(
+        148, TWWFlag.DUNGEON, "Wind Temple", 0x7, TWWLocationType.CHEST, 0
+    ),
+    "Wind Temple - Behind Stone Head in Hidden Upper Room": TWWLocationData(
+        149, TWWFlag.DUNGEON | TWWFlag.DG_SCRT, "Wind Temple", 0x7, TWWLocationType.PCKUP, 0
+    ),
+    "Wind Temple - Tingle Statue Chest": TWWLocationData(
+        150, TWWFlag.TNGL_CT | TWWFlag.DUNGEON, "Wind Temple", 0x7, TWWLocationType.CHEST, 15
+    ),
+    "Wind Temple - Chest Behind Stone Head": TWWLocationData(
+        151, TWWFlag.DUNGEON, "Wind Temple", 0x7, TWWLocationType.CHEST, 3
+    ),
+    "Wind Temple - Chest in Left Alcove": TWWLocationData(
+        152, TWWFlag.DUNGEON, "Wind Temple", 0x7, TWWLocationType.CHEST, 7
+    ),
+    "Wind Temple - Big Key Chest": TWWLocationData(
+        153, TWWFlag.DUNGEON, "Wind Temple", 0x7, TWWLocationType.CHEST, 8
+    ),
+    "Wind Temple - Chest In Many Cyclones Room": TWWLocationData(
+        154, TWWFlag.DUNGEON, "Wind Temple", 0x7, TWWLocationType.CHEST, 11
+    ),
+    "Wind Temple - Behind Stone Head in Many Cyclones Room": TWWLocationData(
+        155, TWWFlag.DUNGEON | TWWFlag.DG_SCRT, "Wind Temple", 0x7, TWWLocationType.PCKUP, 1
+    ),
+    "Wind Temple - Chest In Middle Of Hub Room": TWWLocationData(
+        156, TWWFlag.DUNGEON, "Wind Temple", 0x7, TWWLocationType.CHEST, 13
+    ),
+    "Wind Temple - Spike Wall Room - First Chest": TWWLocationData(
+        157, TWWFlag.DUNGEON, "Wind Temple", 0x7, TWWLocationType.CHEST, 9
+    ),
+    "Wind Temple - Spike Wall Room - Destroy All Cracked Floors": TWWLocationData(
+        158, TWWFlag.DUNGEON, "Wind Temple", 0x7, TWWLocationType.CHEST, 10
+    ),
+    "Wind Temple - Wizzrobe Miniboss Room": TWWLocationData(
+        159, TWWFlag.DUNGEON, "Wind Temple Miniboss Arena", 0x7, TWWLocationType.CHEST, 5
+    ),
+    "Wind Temple - Chest at Top of Hub Room": TWWLocationData(
+        160, TWWFlag.DUNGEON, "Wind Temple", 0x7, TWWLocationType.CHEST, 2
+    ),
+    "Wind Temple - Chest Behind Seven Armos": TWWLocationData(
+        161, TWWFlag.DUNGEON, "Wind Temple", 0x7, TWWLocationType.CHEST, 4
+    ),
+    "Wind Temple - Kill All Enemies in Tall Basement Room": TWWLocationData(
+        162, TWWFlag.DUNGEON, "Wind Temple", 0x7, TWWLocationType.CHEST, 12
+    ),
+    "Wind Temple - Molgera Heart Container": TWWLocationData(
+        163, TWWFlag.DUNGEON | TWWFlag.BOSS, "Molgera Boss Arena", 0x7, TWWLocationType.PCKUP, 21
+    ),
+
+    # Ganon's Tower
+    "Ganon's Tower - Maze Chest": TWWLocationData(
+        164, TWWFlag.DUNGEON, "The Great Sea", 0x8, TWWLocationType.CHEST, 0
+    ),
+
+    # Mailbox
+    "Mailbox - Letter from Hoskit's Girlfriend": TWWLocationData(
+        165, TWWFlag.MAILBOX | TWWFlag.SPOILS, "The Great Sea", 0x0, TWWLocationType.SPECL, 0, 0x803C52DA
+    ),
+    "Mailbox - Letter from Baito's Mother": TWWLocationData(
+        166, TWWFlag.MAILBOX, "The Great Sea", 0x0, TWWLocationType.SPECL, 0, 0x803C52D8
+    ),
+    "Mailbox - Letter from Baito": TWWLocationData(
+        167, TWWFlag.MAILBOX | TWWFlag.DUNGEON, "The Great Sea", 0x0, TWWLocationType.EVENT, 0, 0x803C52A8
+    ),
+    "Mailbox - Letter from Komali's Father": TWWLocationData(
+        168, TWWFlag.MAILBOX, "The Great Sea", 0x0, TWWLocationType.EVENT, 0, 0x803C52E1
+    ),
+    "Mailbox - Letter Advertising Bombs in Beedle's Shop": TWWLocationData(
+        169, TWWFlag.MAILBOX, "The Great Sea", 0x0, TWWLocationType.EVENT, 0, 0x803C52A9
+    ),
+    "Mailbox - Letter Advertising Rock Spire Shop Ship": TWWLocationData(
+        170, TWWFlag.MAILBOX, "The Great Sea", 0x0, TWWLocationType.EVENT, 0, 0x803C52A6
+    ),
+    # "Mailbox - Beedle's Silver Membership Reward": TWWLocationData(
+    #     171, TWWFlag.OTHER, "The Great Sea"
+    # ),
+    # "Mailbox - Beedle's Gold Membership Reward": TWWLocationData(
+    #     172, TWWFlag.OTHER, "The Great Sea"
+    # ),
+    "Mailbox - Letter from Orca": TWWLocationData(
+        173, TWWFlag.MAILBOX | TWWFlag.DUNGEON, "The Great Sea", 0x0, TWWLocationType.EVENT, 0, 0x803C52A7
+    ),
+    "Mailbox - Letter from Grandma": TWWLocationData(
+        174, TWWFlag.MAILBOX, "The Great Sea", 0x0, TWWLocationType.SPECL, 0, 0x803C52C9
+    ),
+    "Mailbox - Letter from Aryll": TWWLocationData(
+        175, TWWFlag.MAILBOX | TWWFlag.DUNGEON, "The Great Sea", 0x0, TWWLocationType.EVENT, 0, 0x803C52B7
+    ),
+    "Mailbox - Letter from Tingle": TWWLocationData(
+        176,
+        TWWFlag.MAILBOX | TWWFlag.DUNGEON | TWWFlag.XPENSVE, "The Great Sea", 0x0, TWWLocationType.EVENT, 0, 0x803C52DE
+    ),
+
+    # The Great Sea
+    "The Great Sea - Beedle's Shop Ship - 20 Rupee Item": TWWLocationData(
+        177, TWWFlag.MISCELL, "The Great Sea",  0xA, TWWLocationType.EVENT, 1, 0x803C5295
+    ),
+    "The Great Sea - Salvage Corp Gift": TWWLocationData(
+        178, TWWFlag.FREE_GF, "The Great Sea", 0x0, TWWLocationType.EVENT, 7, 0x803C5295
+    ),
+    "The Great Sea - Cyclos": TWWLocationData(
+        179, TWWFlag.MISCELL, "The Great Sea", 0x0, TWWLocationType.EVENT, 4, 0x803C5253
+    ),
+    "The Great Sea - Goron Trading Reward": TWWLocationData(
+        180, TWWFlag.LONG_SQ | TWWFlag.XPENSVE, "The Great Sea", 0x0, TWWLocationType.EVENT, 2, 0x803C526A
+    ),
+    "The Great Sea - Withered Trees": TWWLocationData(
+        181, TWWFlag.LONG_SQ, "The Great Sea", 0x0, TWWLocationType.EVENT, 5, 0x803C525A
+    ),
+    "The Great Sea - Ghost Ship": TWWLocationData(
+        182, TWWFlag.MISCELL, "The Great Sea", 0xA, TWWLocationType.CHEST, 23
+    ),
+
+    # Private Oasis
+    "Private Oasis - Chest at Top of Waterfall": TWWLocationData(
+        183, TWWFlag.ISLND_P, "The Great Sea", 0x0, TWWLocationType.CHEST, 19
+    ),
+    "Private Oasis - Cabana Labyrinth - Lower Floor Chest": TWWLocationData(
+        184, TWWFlag.PZL_CVE, "Cabana Labyrinth", 0xC, TWWLocationType.CHEST, 22
+    ),
+    "Private Oasis - Cabana Labyrinth - Upper Floor Chest": TWWLocationData(
+        185, TWWFlag.PZL_CVE, "Cabana Labyrinth", 0xC, TWWLocationType.CHEST, 17
+    ),
+    "Private Oasis - Big Octo": TWWLocationData(
+        186, TWWFlag.BG_OCTO, "The Great Sea", 0x0, TWWLocationType.BOCTO, 0, 0x803C520A
+    ),
+
+    # Spectacle Island
+    "Spectacle Island - Barrel Shooting - First Prize": TWWLocationData(
+        187, TWWFlag.MINIGME, "The Great Sea", 0x0, TWWLocationType.EVENT, 0, 0x803C52E3
+    ),
+    "Spectacle Island - Barrel Shooting - Second Prize": TWWLocationData(
+        188, TWWFlag.MINIGME, "The Great Sea", 0x0, TWWLocationType.EVENT, 1, 0x803C52E3
+    ),
+
+    # Needle Rock Isle
+    "Needle Rock Isle - Chest": TWWLocationData(
+        189, TWWFlag.ISLND_P, "The Great Sea", 0x0, TWWLocationType.CHEST, 3
+    ),
+    "Needle Rock Isle - Cave": TWWLocationData(
+        190, TWWFlag.PZL_CVE, "Needle Rock Isle Secret Cave", 0xD, TWWLocationType.CHEST, 9
+    ),
+    "Needle Rock Isle - Golden Gunboat": TWWLocationData(
+        191, TWWFlag.BG_OCTO, "The Great Sea", 0x0, TWWLocationType.BOCTO, 2, 0x803C5202
+    ),
+
+    # Angular Isles
+    "Angular Isles - Peak": TWWLocationData(
+        192, TWWFlag.ISLND_P, "The Great Sea", 0x0, TWWLocationType.CHEST, 0
+    ),
+    "Angular Isles - Cave": TWWLocationData(
+        193, TWWFlag.PZL_CVE, "Angular Isles Secret Cave", 0xD, TWWLocationType.CHEST, 6
+    ),
+
+    # Boating Course
+    "Boating Course - Raft": TWWLocationData(
+        194, TWWFlag.PLTFRMS, "The Great Sea", 0x0, TWWLocationType.CHEST, 21
+    ),
+    "Boating Course - Cave": TWWLocationData(
+        195, TWWFlag.PZL_CVE | TWWFlag.CBT_CVE, "Boating Course Secret Cave", 0xD, TWWLocationType.CHEST, 15
+    ),
+
+    # Stone Watcher Island
+    "Stone Watcher Island - Cave": TWWLocationData(
+        196, TWWFlag.CBT_CVE, "Stone Watcher Island Secret Cave", 0xC, TWWLocationType.CHEST, 10
+    ),
+    "Stone Watcher Island - Lookout Platform Chest": TWWLocationData(
+        197, TWWFlag.PLTFRMS, "The Great Sea", 0x1, TWWLocationType.CHEST, 18
+    ),
+    "Stone Watcher Island - Lookout Platform - Destroy the Cannons": TWWLocationData(
+        198, TWWFlag.PLTFRMS, "The Great Sea", 0x0, TWWLocationType.CHEST, 20
+    ),
+
+    # Islet of Steel
+    "Islet of Steel - Interior": TWWLocationData(
+        199, TWWFlag.MISCELL, "The Great Sea", 0xC, TWWLocationType.CHEST, 4
+    ),
+    "Islet of Steel - Lookout Platform - Defeat the Enemies": TWWLocationData(
+        200, TWWFlag.PLTFRMS, "The Great Sea", 0x1, TWWLocationType.CHEST, 16
+    ),
+
+    # Overlook Island
+    "Overlook Island - Cave": TWWLocationData(
+        201, TWWFlag.CBT_CVE, "Overlook Island Secret Cave", 0xC, TWWLocationType.CHEST, 11
+    ),
+
+    # Bird's Peak Rock
+    "Bird's Peak Rock - Cave": TWWLocationData(
+        202, TWWFlag.PZL_CVE, "Bird's Peak Rock Secret Cave", 0xC, TWWLocationType.CHEST, 16
+    ),
+
+    # Pawprint Isle
+    "Pawprint Isle - Chuchu Cave - Chest": TWWLocationData(
+        203, TWWFlag.PZL_CVE, "Pawprint Isle Chuchu Cave", 0xC, TWWLocationType.CHEST, 26
+    ),
+    "Pawprint Isle - Chuchu Cave - Behind Left Boulder": TWWLocationData(
+        204, TWWFlag.PZL_CVE, "Pawprint Isle Chuchu Cave", 0xC, TWWLocationType.CHEST, 24
+    ),
+    "Pawprint Isle - Chuchu Cave - Behind Right Boulder": TWWLocationData(
+        205, TWWFlag.PZL_CVE, "Pawprint Isle Chuchu Cave", 0xC, TWWLocationType.CHEST, 25
+    ),
+    "Pawprint Isle - Chuchu Cave - Scale the Wall": TWWLocationData(
+        206, TWWFlag.PZL_CVE, "Pawprint Isle Chuchu Cave", 0xC, TWWLocationType.CHEST, 2
+    ),
+    "Pawprint Isle - Wizzrobe Cave": TWWLocationData(
+        207, TWWFlag.CBT_CVE, "Pawprint Isle Wizzrobe Cave", 0xD, TWWLocationType.CHEST, 2
+    ),
+    "Pawprint Isle - Lookout Platform - Defeat the Enemies": TWWLocationData(
+        208, TWWFlag.PLTFRMS, "The Great Sea", 0x1, TWWLocationType.CHEST, 5
+    ),
+
+    # Thorned Fairy Island
+    "Thorned Fairy Island - Great Fairy": TWWLocationData(
+        209, TWWFlag.GRT_FRY, "Thorned Fairy Fountain", 0xC, TWWLocationType.EVENT, 0, 0x803C525C
+    ),
+    "Thorned Fairy Island - Northeastern Lookout Platform - Destroy the Cannons": TWWLocationData(
+        210, TWWFlag.PLTFRMS, "The Great Sea", 0x1, TWWLocationType.CHEST, 14
+    ),
+    "Thorned Fairy Island - Southwestern Lookout Platform - Defeat the Enemies": TWWLocationData(
+        211, TWWFlag.PLTFRMS, "The Great Sea", 0x1, TWWLocationType.CHEST, 15
+    ),
+
+    # Eastern Fairy Island
+    "Eastern Fairy Island - Great Fairy": TWWLocationData(
+        212, TWWFlag.GRT_FRY, "Eastern Fairy Fountain", 0xC, TWWLocationType.EVENT, 3, 0x803C525C
+    ),
+    "Eastern Fairy Island - Lookout Platform - Defeat the Cannons and Enemies": TWWLocationData(
+        213, TWWFlag.PLTFRMS, "The Great Sea", 0x1, TWWLocationType.CHEST, 10
+    ),
+
+    # Western Fairy Island
+    "Western Fairy Island - Great Fairy": TWWLocationData(
+        214, TWWFlag.GRT_FRY, "Western Fairy Fountain", 0xC, TWWLocationType.EVENT, 1, 0x803C525C
+    ),
+    "Western Fairy Island - Lookout Platform": TWWLocationData(
+        215, TWWFlag.PLTFRMS, "The Great Sea", 0x1, TWWLocationType.CHEST, 6
+    ),
+
+    # Southern Fairy Island
+    "Southern Fairy Island - Great Fairy": TWWLocationData(
+        216, TWWFlag.GRT_FRY, "Southern Fairy Fountain", 0xC, TWWLocationType.EVENT, 2, 0x803C525C
+    ),
+    "Southern Fairy Island - Lookout Platform - Destroy the Northwest Cannons": TWWLocationData(
+        217, TWWFlag.PLTFRMS, "The Great Sea", 0x0, TWWLocationType.CHEST, 23
+    ),
+    "Southern Fairy Island - Lookout Platform - Destroy the Southeast Cannons": TWWLocationData(
+        218, TWWFlag.PLTFRMS, "The Great Sea", 0x1, TWWLocationType.CHEST, 17
+    ),
+
+    # Northern Fairy Island
+    "Northern Fairy Island - Great Fairy": TWWLocationData(
+        219, TWWFlag.GRT_FRY, "Northern Fairy Fountain", 0xC, TWWLocationType.EVENT, 5, 0x803C525C
+    ),
+    "Northern Fairy Island - Submarine": TWWLocationData(
+        220, TWWFlag.SUBMRIN, "The Great Sea", 0xA, TWWLocationType.CHEST, 6
+    ),
+
+    # Tingle Island
+    "Tingle Island - Ankle - Reward for All Tingle Statues": TWWLocationData(
+        221, TWWFlag.MISCELL, "The Great Sea", 0x0, TWWLocationType.SPECL, 0
+    ),
+    "Tingle Island - Big Octo": TWWLocationData(
+        222, TWWFlag.BG_OCTO, "The Great Sea", 0x0, TWWLocationType.BOCTO, 0, 0x803C51EA
+    ),
+
+    # Diamond Steppe Island
+    "Diamond Steppe Island - Warp Maze Cave - First Chest": TWWLocationData(
+        223, TWWFlag.PZL_CVE, "Diamond Steppe Island Warp Maze Cave", 0xC, TWWLocationType.CHEST, 23
+    ),
+    "Diamond Steppe Island - Warp Maze Cave - Second Chest": TWWLocationData(
+        224, TWWFlag.PZL_CVE, "Diamond Steppe Island Warp Maze Cave", 0xC, TWWLocationType.CHEST, 3
+    ),
+    "Diamond Steppe Island - Big Octo": TWWLocationData(
+        225, TWWFlag.BG_OCTO, "The Great Sea", 0x0, TWWLocationType.BOCTO, 0, 0x803C5210
+    ),
+
+    # Bomb Island
+    "Bomb Island - Cave": TWWLocationData(
+        226, TWWFlag.PZL_CVE, "Bomb Island Secret Cave", 0xC, TWWLocationType.CHEST, 5
+    ),
+    "Bomb Island - Lookout Platform - Defeat the Enemies": TWWLocationData(
+        227, TWWFlag.PLTFRMS, "The Great Sea", 0x1, TWWLocationType.CHEST, 3
+    ),
+    "Bomb Island - Submarine": TWWLocationData(
+        228, TWWFlag.SUBMRIN, "The Great Sea", 0xA, TWWLocationType.CHEST, 2
+    ),
+
+    # Rock Spire Isle
+    "Rock Spire Isle - Cave": TWWLocationData(
+        229, TWWFlag.CBT_CVE, "Rock Spire Isle Secret Cave", 0xC, TWWLocationType.CHEST, 8
+    ),
+    "Rock Spire Isle - Beedle's Special Shop Ship - 500 Rupee Item": TWWLocationData(
+        230, TWWFlag.XPENSVE, "The Great Sea", 0xA, TWWLocationType.EVENT, 5, 0x803C524C
+    ),
+    "Rock Spire Isle - Beedle's Special Shop Ship - 950 Rupee Item": TWWLocationData(
+        231, TWWFlag.XPENSVE, "The Great Sea", 0xA, TWWLocationType.EVENT, 4, 0x803C524C
+    ),
+    "Rock Spire Isle - Beedle's Special Shop Ship - 900 Rupee Item": TWWLocationData(
+        232, TWWFlag.XPENSVE, "The Great Sea", 0xA, TWWLocationType.EVENT, 3, 0x803C524C
+    ),
+    "Rock Spire Isle - Western Lookout Platform - Destroy the Cannons": TWWLocationData(
+        233, TWWFlag.PLTFRMS, "The Great Sea", 0x1, TWWLocationType.CHEST, 23
+    ),
+    "Rock Spire Isle - Eastern Lookout Platform - Destroy the Cannons": TWWLocationData(
+        234, TWWFlag.PLTFRMS, "The Great Sea", 0x1, TWWLocationType.CHEST, 24
+    ),
+    "Rock Spire Isle - Center Lookout Platform": TWWLocationData(
+        235, TWWFlag.PLTFRMS, "The Great Sea", 0x1, TWWLocationType.CHEST, 25
+    ),
+    "Rock Spire Isle - Southeast Gunboat": TWWLocationData(
+        236, TWWFlag.BG_OCTO, "The Great Sea", 0x0, TWWLocationType.BOCTO, 0, 0x803C51E8
+    ),
+
+    # Shark Island
+    "Shark Island - Cave": TWWLocationData(
+        237, TWWFlag.CBT_CVE, "Shark Island Secret Cave", 0xD, TWWLocationType.CHEST, 22
+    ),
+
+    # Cliff Plateau Isles
+    "Cliff Plateau Isles - Cave": TWWLocationData(
+        238, TWWFlag.PZL_CVE, "Cliff Plateau Isles Secret Cave", 0xC, TWWLocationType.CHEST, 7
+    ),
+    "Cliff Plateau Isles - Highest Isle": TWWLocationData(
+        239, TWWFlag.PZL_CVE, "Cliff Plateau Isles Inner Cave", 0x0, TWWLocationType.CHEST, 1
+    ),
+    "Cliff Plateau Isles - Lookout Platform": TWWLocationData(
+        240, TWWFlag.PLTFRMS, "The Great Sea", 0x1, TWWLocationType.CHEST, 19
+    ),
+
+    # Crescent Moon Island
+    "Crescent Moon Island - Chest": TWWLocationData(
+        241, TWWFlag.MISCELL, "The Great Sea", 0x0, TWWLocationType.CHEST, 4
+    ),
+    "Crescent Moon Island - Submarine": TWWLocationData(
+        242, TWWFlag.SUBMRIN, "The Great Sea", 0xA, TWWLocationType.CHEST, 7
+    ),
+
+    # Horseshoe Island
+    "Horseshoe Island - Play Golf": TWWLocationData(
+        243, TWWFlag.ISLND_P, "The Great Sea", 0x0, TWWLocationType.CHEST, 5
+    ),
+    "Horseshoe Island - Cave": TWWLocationData(
+        244, TWWFlag.CBT_CVE, "Horseshoe Island Secret Cave", 0xD, TWWLocationType.CHEST, 1
+    ),
+    "Horseshoe Island - Northwestern Lookout Platform": TWWLocationData(
+        245, TWWFlag.PLTFRMS, "The Great Sea", 0x1, TWWLocationType.CHEST, 26
+    ),
+    "Horseshoe Island - Southeastern Lookout Platform": TWWLocationData(
+        246, TWWFlag.PLTFRMS, "The Great Sea", 0x1, TWWLocationType.CHEST, 27
+    ),
+
+    # Flight Control Platform
+    "Flight Control Platform - Bird-Man Contest - First Prize": TWWLocationData(
+        247, TWWFlag.MINIGME, "The Great Sea", 0x0, TWWLocationType.EVENT, 6, 0x803C5257
+    ),
+    "Flight Control Platform - Submarine": TWWLocationData(
+        248, TWWFlag.SUBMRIN, "The Great Sea", 0xA, TWWLocationType.CHEST, 3
+    ),
+
+    # Star Island
+    "Star Island - Cave": TWWLocationData(
+        249, TWWFlag.CBT_CVE, "Star Island Secret Cave", 0xC, TWWLocationType.CHEST, 6
+    ),
+    "Star Island - Lookout Platform": TWWLocationData(
+        250, TWWFlag.PLTFRMS, "The Great Sea", 0x1, TWWLocationType.CHEST, 4
+    ),
+
+    # Star Belt Archipelago
+    "Star Belt Archipelago - Lookout Platform": TWWLocationData(
+        251, TWWFlag.PLTFRMS, "The Great Sea", 0x1, TWWLocationType.CHEST, 11
+    ),
+
+    # Five-Star Isles
+    "Five-Star Isles - Lookout Platform - Destroy the Cannons": TWWLocationData(
+        252, TWWFlag.PLTFRMS, "The Great Sea", 0x1, TWWLocationType.CHEST, 2
+    ),
+    "Five-Star Isles - Raft": TWWLocationData(
+        253, TWWFlag.PLTFRMS, "The Great Sea", 0x0, TWWLocationType.CHEST, 2
+    ),
+    "Five-Star Isles - Submarine": TWWLocationData(
+        254, TWWFlag.SUBMRIN, "The Great Sea", 0xA, TWWLocationType.CHEST, 1
+    ),
+
+    # Seven-Star Isles
+    "Seven-Star Isles - Center Lookout Platform": TWWLocationData(
+        255, TWWFlag.PLTFRMS, "The Great Sea", 0x1, TWWLocationType.CHEST, 8
+    ),
+    "Seven-Star Isles - Northern Lookout Platform": TWWLocationData(
+        256, TWWFlag.PLTFRMS, "The Great Sea", 0x1, TWWLocationType.CHEST, 7
+    ),
+    "Seven-Star Isles - Southern Lookout Platform": TWWLocationData(
+        257, TWWFlag.PLTFRMS, "The Great Sea", 0x0, TWWLocationType.CHEST, 22
+    ),
+    "Seven-Star Isles - Big Octo": TWWLocationData(
+        258, TWWFlag.BG_OCTO, "The Great Sea", 0x0, TWWLocationType.BOCTO, 0, 0x803C51D4
+    ),
+
+    # Cyclops Reef
+    "Cyclops Reef - Destroy the Cannons and Gunboats": TWWLocationData(
+        259, TWWFlag.EYE_RFS, "The Great Sea", 0x0, TWWLocationType.CHEST, 11
+    ),
+    "Cyclops Reef - Lookout Platform - Defeat the Enemies": TWWLocationData(
+        260, TWWFlag.PLTFRMS, "The Great Sea", 0x1, TWWLocationType.CHEST, 12
+    ),
+
+    # Two-Eye Reef
+    "Two-Eye Reef - Destroy the Cannons and Gunboats": TWWLocationData(
+        261, TWWFlag.EYE_RFS, "The Great Sea", 0x0, TWWLocationType.CHEST, 13
+    ),
+    "Two-Eye Reef - Lookout Platform": TWWLocationData(
+        262, TWWFlag.PLTFRMS, "The Great Sea", 0x1, TWWLocationType.CHEST, 21
+    ),
+    "Two-Eye Reef - Big Octo Great Fairy": TWWLocationData(
+        263, TWWFlag.BG_OCTO | TWWFlag.GRT_FRY, "The Great Sea", 0x0, TWWLocationType.SWTCH, 52
+    ),
+
+    # Three-Eye Reef
+    "Three-Eye Reef - Destroy the Cannons and Gunboats": TWWLocationData(
+        264, TWWFlag.EYE_RFS, "The Great Sea", 0x0, TWWLocationType.CHEST, 12
+    ),
+
+    # Four-Eye Reef
+    "Four-Eye Reef - Destroy the Cannons and Gunboats": TWWLocationData(
+        265, TWWFlag.EYE_RFS, "The Great Sea", 0x0, TWWLocationType.CHEST, 14
+    ),
+
+    # Five-Eye Reef
+    "Five-Eye Reef - Destroy the Cannons": TWWLocationData(
+        266, TWWFlag.EYE_RFS, "The Great Sea", 0x0, TWWLocationType.CHEST, 15
+    ),
+    "Five-Eye Reef - Lookout Platform": TWWLocationData(
+        267, TWWFlag.PLTFRMS, "The Great Sea", 0x1, TWWLocationType.CHEST, 20
+    ),
+
+    # Six-Eye Reef
+    "Six-Eye Reef - Destroy the Cannons and Gunboats": TWWLocationData(
+        268, TWWFlag.EYE_RFS, "The Great Sea", 0x0, TWWLocationType.CHEST, 17
+    ),
+    "Six-Eye Reef - Lookout Platform - Destroy the Cannons": TWWLocationData(
+        269, TWWFlag.PLTFRMS, "The Great Sea", 0x1, TWWLocationType.CHEST, 13
+    ),
+    "Six-Eye Reef - Submarine": TWWLocationData(
+        270, TWWFlag.SUBMRIN, "The Great Sea", 0xA, TWWLocationType.CHEST, 0
+    ),
+
+    # Sunken Treasure
+    "Forsaken Fortress Sector - Sunken Treasure": TWWLocationData(
+        271, TWWFlag.TRE_CHT, "The Great Sea", 0x0, TWWLocationType.CHART, 8
+    ),
+    "Star Island - Sunken Treasure": TWWLocationData(
+        272, TWWFlag.TRE_CHT, "The Great Sea", 0x0, TWWLocationType.CHART, 18
+    ),
+    "Northern Fairy Island - Sunken Treasure": TWWLocationData(
+        273, TWWFlag.TRE_CHT, "The Great Sea", 0x0, TWWLocationType.CHART, 51
+    ),
+    "Gale Isle - Sunken Treasure": TWWLocationData(
+        274, TWWFlag.TRI_CHT, "The Great Sea", 0x0, TWWLocationType.CHART, 33
+    ),
+    "Crescent Moon Island - Sunken Treasure": TWWLocationData(
+        275, TWWFlag.TRE_CHT, "The Great Sea", 0x0, TWWLocationType.CHART, 40
+    ),
+    "Seven-Star Isles - Sunken Treasure": TWWLocationData(
+        276, TWWFlag.TRI_CHT, "The Great Sea", 0x0, TWWLocationType.CHART, 38
+    ),
+    "Overlook Island - Sunken Treasure": TWWLocationData(
+        277, TWWFlag.TRE_CHT, "The Great Sea", 0x0, TWWLocationType.CHART, 15
+    ),
+    "Four-Eye Reef - Sunken Treasure": TWWLocationData(
+        278, TWWFlag.TRE_CHT, "The Great Sea", 0x0, TWWLocationType.CHART, 12
+    ),
+    "Mother and Child Isles - Sunken Treasure": TWWLocationData(
+        279, TWWFlag.TRE_CHT, "The Great Sea", 0x0, TWWLocationType.CHART, 56
+    ),
+    "Spectacle Island - Sunken Treasure": TWWLocationData(
+        280, TWWFlag.TRE_CHT, "The Great Sea", 0x0, TWWLocationType.CHART, 5
+    ),
+    "Windfall Island - Sunken Treasure": TWWLocationData(
+        281, TWWFlag.TRE_CHT, "The Great Sea", 0x0, TWWLocationType.CHART, 58
+    ),
+    "Pawprint Isle - Sunken Treasure": TWWLocationData(
+        282, TWWFlag.TRE_CHT, "The Great Sea", 0x0, TWWLocationType.CHART, 42
+    ),
+    "Dragon Roost Island - Sunken Treasure": TWWLocationData(
+        283, TWWFlag.TRE_CHT, "The Great Sea", 0x0, TWWLocationType.CHART, 50
+    ),
+    "Flight Control Platform - Sunken Treasure": TWWLocationData(
+        284, TWWFlag.TRE_CHT, "The Great Sea", 0x0, TWWLocationType.CHART, 13
+    ),
+    "Western Fairy Island - Sunken Treasure": TWWLocationData(
+        285, TWWFlag.TRE_CHT, "The Great Sea", 0x0, TWWLocationType.CHART, 10
+    ),
+    "Rock Spire Isle - Sunken Treasure": TWWLocationData(
+        286, TWWFlag.TRE_CHT, "The Great Sea", 0x0, TWWLocationType.CHART, 48
+    ),
+    "Tingle Island - Sunken Treasure": TWWLocationData(
+        287, TWWFlag.TRE_CHT, "The Great Sea", 0x0, TWWLocationType.CHART, 0
+    ),
+    "Northern Triangle Island - Sunken Treasure": TWWLocationData(
+        288, TWWFlag.TRE_CHT, "The Great Sea", 0x0, TWWLocationType.CHART, 11
+    ),
+    "Eastern Fairy Island - Sunken Treasure": TWWLocationData(
+        289, TWWFlag.TRE_CHT, "The Great Sea", 0x0, TWWLocationType.CHART, 62
+    ),
+    "Fire Mountain - Sunken Treasure": TWWLocationData(
+        290, TWWFlag.TRE_CHT, "The Great Sea", 0x0, TWWLocationType.CHART, 9
+    ),
+    "Star Belt Archipelago - Sunken Treasure": TWWLocationData(
+        291, TWWFlag.TRE_CHT, "The Great Sea", 0x0, TWWLocationType.CHART, 17
+    ),
+    "Three-Eye Reef - Sunken Treasure": TWWLocationData(
+        292, TWWFlag.TRE_CHT, "The Great Sea", 0x0, TWWLocationType.CHART, 49
+    ),
+    "Greatfish Isle - Sunken Treasure": TWWLocationData(
+        293, TWWFlag.TRI_CHT, "The Great Sea", 0x0, TWWLocationType.CHART, 32
+    ),
+    "Cyclops Reef - Sunken Treasure": TWWLocationData(
+        294, TWWFlag.TRE_CHT, "The Great Sea", 0x0, TWWLocationType.CHART, 16
+    ),
+    "Six-Eye Reef - Sunken Treasure": TWWLocationData(
+        295, TWWFlag.TRE_CHT, "The Great Sea", 0x0, TWWLocationType.CHART, 52
+    ),
+    "Tower of the Gods Sector - Sunken Treasure": TWWLocationData(
+        296, TWWFlag.TRE_CHT, "The Great Sea", 0x0, TWWLocationType.CHART, 1
+    ),
+    "Eastern Triangle Island - Sunken Treasure": TWWLocationData(
+        297, TWWFlag.TRE_CHT, "The Great Sea", 0x0, TWWLocationType.CHART, 57
+    ),
+    "Thorned Fairy Island - Sunken Treasure": TWWLocationData(
+        298, TWWFlag.TRE_CHT, "The Great Sea", 0x0, TWWLocationType.CHART, 44
+    ),
+    "Needle Rock Isle - Sunken Treasure": TWWLocationData(
+        299, TWWFlag.TRE_CHT, "The Great Sea", 0x0, TWWLocationType.CHART, 60
+    ),
+    "Islet of Steel - Sunken Treasure": TWWLocationData(
+        300, TWWFlag.TRE_CHT, "The Great Sea", 0x0, TWWLocationType.CHART, 54
+    ),
+    "Stone Watcher Island - Sunken Treasure": TWWLocationData(
+        301, TWWFlag.TRI_CHT, "The Great Sea", 0x0, TWWLocationType.CHART, 34
+    ),
+    "Southern Triangle Island - Sunken Treasure": TWWLocationData(
+        302, TWWFlag.TRI_CHT, "The Great Sea", 0x0, TWWLocationType.CHART, 37
+    ),
+    "Private Oasis - Sunken Treasure": TWWLocationData(
+        303, TWWFlag.TRE_CHT, "The Great Sea", 0x0, TWWLocationType.CHART, 55
+    ),
+    "Bomb Island - Sunken Treasure": TWWLocationData(
+        304, TWWFlag.TRE_CHT, "The Great Sea", 0x0, TWWLocationType.CHART, 43
+    ),
+    "Bird's Peak Rock - Sunken Treasure": TWWLocationData(
+        305, TWWFlag.TRE_CHT, "The Great Sea", 0x0, TWWLocationType.CHART, 6
+    ),
+    "Diamond Steppe Island - Sunken Treasure": TWWLocationData(
+        306, TWWFlag.TRE_CHT, "The Great Sea", 0x0, TWWLocationType.CHART, 45
+    ),
+    "Five-Eye Reef - Sunken Treasure": TWWLocationData(
+        307, TWWFlag.TRE_CHT, "The Great Sea", 0x0, TWWLocationType.CHART, 53
+    ),
+    "Shark Island - Sunken Treasure": TWWLocationData(
+        308, TWWFlag.TRE_CHT, "The Great Sea", 0x0, TWWLocationType.CHART, 59
+    ),
+    "Southern Fairy Island - Sunken Treasure": TWWLocationData(
+        309, TWWFlag.TRE_CHT, "The Great Sea", 0x0, TWWLocationType.CHART, 61
+    ),
+    "Ice Ring Isle - Sunken Treasure": TWWLocationData(
+        310, TWWFlag.TRE_CHT, "The Great Sea", 0x0, TWWLocationType.CHART, 7
+    ),
+    "Forest Haven - Sunken Treasure": TWWLocationData(
+        311, TWWFlag.TRE_CHT, "The Great Sea", 0x0, TWWLocationType.CHART, 46
+    ),
+    "Cliff Plateau Isles - Sunken Treasure": TWWLocationData(
+        312, TWWFlag.TRI_CHT, "The Great Sea", 0x0, TWWLocationType.CHART, 36
+    ),
+    "Horseshoe Island - Sunken Treasure": TWWLocationData(
+        313, TWWFlag.TRE_CHT, "The Great Sea", 0x0, TWWLocationType.CHART, 4
+    ),
+    "Outset Island - Sunken Treasure": TWWLocationData(
+        314, TWWFlag.TRI_CHT, "The Great Sea", 0x0, TWWLocationType.CHART, 35
+    ),
+    "Headstone Island - Sunken Treasure": TWWLocationData(
+        315, TWWFlag.TRE_CHT, "The Great Sea", 0x0, TWWLocationType.CHART, 63
+    ),
+    "Two-Eye Reef - Sunken Treasure": TWWLocationData(
+        316, TWWFlag.TRI_CHT, "The Great Sea", 0x0, TWWLocationType.CHART, 39
+    ),
+    "Angular Isles - Sunken Treasure": TWWLocationData(
+        317, TWWFlag.TRE_CHT, "The Great Sea", 0x0, TWWLocationType.CHART, 41
+    ),
+    "Boating Course - Sunken Treasure": TWWLocationData(
+        318, TWWFlag.TRE_CHT, "The Great Sea", 0x0, TWWLocationType.CHART, 14
+    ),
+    "Five-Star Isles - Sunken Treasure": TWWLocationData(
+        319, TWWFlag.TRE_CHT, "The Great Sea", 0x0, TWWLocationType.CHART, 47
+    ),
+
+    # Defeat Ganondorf
+    "Defeat Ganondorf": TWWLocationData(
+        None, TWWFlag.ALWAYS, "The Great Sea", 0x8, TWWLocationType.SWTCH, 64
+    ),
+}
+
+
+ISLAND_NAME_TO_SALVAGE_BIT: dict[str, int] = {
+    "Forsaken Fortress Sector": 8,
+    "Star Island": 18,
+    "Northern Fairy Island": 51,
+    "Gale Isle": 33,
+    "Crescent Moon Island": 40,
+    "Seven-Star Isles": 38,
+    "Overlook Island": 15,
+    "Four-Eye Reef": 12,
+    "Mother and Child Isles": 56,
+    "Spectacle Island": 5,
+    "Windfall Island": 58,
+    "Pawprint Isle": 42,
+    "Dragon Roost Island": 50,
+    "Flight Control Platform": 13,
+    "Western Fairy Island": 10,
+    "Rock Spire Isle": 48,
+    "Tingle Island": 0,
+    "Northern Triangle Island": 11,
+    "Eastern Fairy Island": 62,
+    "Fire Mountain": 9,
+    "Star Belt Archipelago": 17,
+    "Three-Eye Reef": 49,
+    "Greatfish Isle": 32,
+    "Cyclops Reef": 16,
+    "Six-Eye Reef": 52,
+    "Tower of the Gods Sector": 1,
+    "Eastern Triangle Island": 57,
+    "Thorned Fairy Island": 44,
+    "Needle Rock Isle": 60,
+    "Islet of Steel": 54,
+    "Stone Watcher Island": 34,
+    "Southern Triangle Island": 37,
+    "Private Oasis": 55,
+    "Bomb Island": 43,
+    "Bird's Peak Rock": 6,
+    "Diamond Steppe Island": 45,
+    "Five-Eye Reef": 53,
+    "Shark Island": 59,
+    "Southern Fairy Island": 61,
+    "Ice Ring Isle": 7,
+    "Forest Haven": 46,
+    "Cliff Plateau Isles": 36,
+    "Horseshoe Island": 4,
+    "Outset Island": 35,
+    "Headstone Island": 63,
+    "Two-Eye Reef": 39,
+    "Angular Isles": 41,
+    "Boating Course": 14,
+    "Five-Star Isles": 47,
+}
+
+
+def split_location_name_by_zone(location_name: str) -> tuple[str, str]:
+    """
+    Split a location name into its zone name and specific name.
+
+    :param location_name: The full name of the location.
+    :return: A tuple containing the zone and specific name.
+    """
+    if " - " in location_name:
+        zone_name, specific_location_name = location_name.split(" - ", 1)
+    else:
+        zone_name = specific_location_name = location_name
+
+    return zone_name, specific_location_name
diff --git a/worlds/tww/Macros.py b/worlds/tww/Macros.py
new file mode 100644
index 0000000000..5ed405ed1d
--- /dev/null
+++ b/worlds/tww/Macros.py
@@ -0,0 +1,1114 @@
+from BaseClasses import CollectionState
+
+
+def can_play_winds_requiem(state: CollectionState, player: int) -> bool:
+    return state.has_all(["Wind Waker", "Wind's Requiem"], player)
+
+
+def can_play_ballad_of_gales(state: CollectionState, player: int) -> bool:
+    return state.has_all(["Wind Waker", "Ballad of Gales"], player)
+
+
+def can_play_command_melody(state: CollectionState, player: int) -> bool:
+    return state.has_all(["Wind Waker", "Command Melody"], player)
+
+
+def can_play_earth_gods_lyric(state: CollectionState, player: int) -> bool:
+    return state.has_all(["Wind Waker", "Earth God's Lyric"], player)
+
+
+def can_play_wind_gods_aria(state: CollectionState, player: int) -> bool:
+    return state.has_all(["Wind Waker", "Wind God's Aria"], player)
+
+
+def can_play_song_of_passing(state: CollectionState, player: int) -> bool:
+    return state.has_all(["Wind Waker", "Song of Passing"], player)
+
+
+def can_fan_with_deku_leaf(state: CollectionState, player: int) -> bool:
+    return state.has("Deku Leaf", player)
+
+
+def can_fly_with_deku_leaf_indoors(state: CollectionState, player: int) -> bool:
+    return state.has("Deku Leaf", player) and has_magic_meter(state, player)
+
+
+def can_fly_with_deku_leaf_outdoors(state: CollectionState, player: int) -> bool:
+    return state.has("Deku Leaf", player) and has_magic_meter(state, player) and can_play_winds_requiem(state, player)
+
+
+def can_use_magic_armor(state: CollectionState, player: int) -> bool:
+    return state.has("Magic Armor", player) and has_magic_meter(state, player)
+
+
+def can_aim_mirror_shield(state: CollectionState, player: int) -> bool:
+    return has_mirror_shield(state, player) and (
+        state.has_any(["Wind Waker", "Grappling Hook", "Boomerang", "Deku Leaf", "Hookshot"], player)
+        or has_heros_sword(state, player)
+        or has_heros_bow(state, player)
+    )
+
+
+def can_move_boulders(state: CollectionState, player: int) -> bool:
+    return state.has_any(["Bombs", "Power Bracelets"], player)
+
+
+def can_defeat_door_flowers(state: CollectionState, player: int) -> bool:
+    return state.has_any(["Boomerang", "Bombs", "Hookshot"], player) or has_heros_bow(state, player)
+
+
+def can_hit_diamond_switches_at_range(state: CollectionState, player: int) -> bool:
+    return state.has_any(["Boomerang", "Hookshot"], player) or has_heros_bow(state, player)
+
+
+def can_destroy_seeds_hanging_by_vines(state: CollectionState, player: int) -> bool:
+    return state.has_any(["Boomerang", "Bombs", "Hookshot"], player) or has_heros_bow(state, player)
+
+
+def has_heros_sword(state: CollectionState, player: int) -> bool:
+    return state.has("Progressive Sword", player, 1)
+
+
+def has_any_master_sword(state: CollectionState, player: int) -> bool:
+    return state.has("Progressive Sword", player, 2)
+
+
+def has_full_power_master_sword(state: CollectionState, player: int) -> bool:
+    return state.has("Progressive Sword", player, 4)
+
+
+def has_heros_shield(state: CollectionState, player: int) -> bool:
+    return state.has("Progressive Shield", player, 1)
+
+
+def has_mirror_shield(state: CollectionState, player: int) -> bool:
+    return state.has("Progressive Shield", player, 2)
+
+
+def has_heros_bow(state: CollectionState, player: int) -> bool:
+    return state.has("Progressive Bow", player, 1)
+
+
+def has_fire_arrows(state: CollectionState, player: int) -> bool:
+    return state.has("Progressive Bow", player, 2) and has_magic_meter(state, player)
+
+
+def has_ice_arrows(state: CollectionState, player: int) -> bool:
+    return state.has("Progressive Bow", player, 2) and has_magic_meter(state, player)
+
+
+def has_light_arrows(state: CollectionState, player: int) -> bool:
+    return state.has("Progressive Bow", player, 3) and has_magic_meter(state, player)
+
+
+def has_any_wallet_upgrade(state: CollectionState, player: int) -> bool:
+    return state.has("Wallet Capacity Upgrade", player, 1)
+
+
+def has_picto_box(state: CollectionState, player: int) -> bool:
+    return state.has("Progressive Picto Box", player, 1)
+
+
+def has_deluxe_picto_box(state: CollectionState, player: int) -> bool:
+    return state.has("Progressive Picto Box", player, 2)
+
+
+def has_any_quiver_upgrade(state: CollectionState, player: int) -> bool:
+    return state.has("Quiver Capacity Upgrade", player, 1)
+
+
+def has_magic_meter(state: CollectionState, player: int) -> bool:
+    return state.has("Progressive Magic Meter", player, 1)
+
+
+def has_magic_meter_upgrade(state: CollectionState, player: int) -> bool:
+    return state.has("Progressive Magic Meter", player, 2)
+
+
+def has_all_8_triforce_shards(state: CollectionState, player: int) -> bool:
+    return state.has_group_unique("Shards", player, 8)
+
+
+def has_tingle_bombs(state: CollectionState, player: int) -> bool:
+    return state.has("Bombs", player) or (state._tww_tuner_logic_enabled(player) and state.has("Tingle Tuner", player))
+
+
+def can_reach_outset_island_upper_level(state: CollectionState, player: int) -> bool:
+    return can_cut_down_outset_trees(state, player) or (
+        can_fly_with_deku_leaf_outdoors(state, player) and state._tww_obscure_1(player)
+    )
+
+
+def can_access_forest_of_fairies(state: CollectionState, player: int) -> bool:
+    return can_reach_outset_island_upper_level(state, player) and can_fly_with_deku_leaf_outdoors(state, player)
+
+
+def can_reach_dragon_roost_cavern_gaping_maw(state: CollectionState, player: int) -> bool:
+    return state.has("DRC Small Key", player, 1) and (
+        (state.has("DRC Small Key", player, 4) and can_cut_down_hanging_drc_platform(state, player))
+        or (can_fly_with_deku_leaf_indoors(state, player) and state._tww_obscure_2(player))
+        or (has_ice_arrows(state, player) and state._tww_obscure_2(player) and state._tww_precise_1(player))
+    )
+
+
+def can_reach_dragon_roost_cavern_boss_stairs(state: CollectionState, player: int) -> bool:
+    return state.has("DRC Small Key", player, 4) and (
+        state.has_any(["Grappling Hook", "Hookshot"], player)
+        or can_fly_with_deku_leaf_indoors(state, player)
+        or has_ice_arrows(state, player)
+    )
+
+
+def can_reach_tower_of_the_gods_second_floor(state: CollectionState, player: int) -> bool:
+    return state.has_all(["Bombs", "TotG Small Key"], player) and can_defeat_yellow_chuchus(state, player)
+
+
+def can_reach_tower_of_the_gods_third_floor(state: CollectionState, player: int) -> bool:
+    return (
+        can_reach_tower_of_the_gods_second_floor(state, player)
+        and can_bring_west_servant_of_the_tower(state, player)
+        and can_bring_north_servant_of_the_tower(state, player)
+        and state.has("Wind Waker", player)
+    )
+
+
+def can_bring_west_servant_of_the_tower(state: CollectionState, player: int) -> bool:
+    return (
+        (state.has("Grappling Hook", player) or can_fly_with_deku_leaf_indoors(state, player))
+        and can_play_command_melody(state, player)
+        and has_heros_bow(state, player)
+    )
+
+
+def can_bring_north_servant_of_the_tower(state: CollectionState, player: int) -> bool:
+    return (
+        state.has("TotG Small Key", player, 2)
+        and (can_fly_with_deku_leaf_indoors(state, player) or state._tww_obscure_1(player))
+        and can_play_command_melody(state, player)
+    )
+
+
+def can_reach_earth_temple_sun_statue_room(state: CollectionState, player: int) -> bool:
+    return (
+        can_play_command_melody(state, player)
+        and can_defeat_red_chuchus(state, player)
+        and can_defeat_green_chuchus(state, player)
+    )
+
+
+def can_reach_earth_temple_right_path(state: CollectionState, player: int) -> bool:
+    return (
+        can_reach_earth_temple_sun_statue_room(state, player)
+        and can_play_command_melody(state, player)
+        and state.has("Skull Hammer", player)
+    )
+
+
+def can_reach_earth_temple_left_path(state: CollectionState, player: int) -> bool:
+    return can_reach_earth_temple_sun_statue_room(state, player) and state.has("ET Small Key", player, 2)
+
+
+def can_reach_earth_temple_moblins_and_poes_room(state: CollectionState, player: int) -> bool:
+    return (
+        can_reach_earth_temple_left_path(state, player)
+        and has_fire_arrows(state, player)
+        and state.has("Power Bracelets", player)
+        and can_defeat_floormasters(state, player)
+        and (can_play_command_melody(state, player) or has_mirror_shield(state, player))
+    )
+
+
+def can_reach_earth_temple_basement(state: CollectionState, player: int) -> bool:
+    return (
+        can_reach_earth_temple_sun_statue_room(state, player)
+        and can_play_command_melody(state, player)
+        and can_aim_mirror_shield(state, player)
+    )
+
+
+def can_reach_earth_temple_redead_hub_room(state: CollectionState, player: int) -> bool:
+    return can_reach_earth_temple_basement(state, player) and can_play_earth_gods_lyric(state, player)
+
+
+def can_reach_earth_temple_third_crypt(state: CollectionState, player: int) -> bool:
+    return (
+        can_reach_earth_temple_redead_hub_room(state, player)
+        and (can_play_command_melody(state, player) or can_aim_mirror_shield(state, player))
+        and state.has_all_counts({"Power Bracelets": 1, "Skull Hammer": 1, "ET Small Key": 3}, player)
+        and (can_defeat_red_bubbles(state, player) or state._tww_precise_2(player))
+        and can_play_command_melody(state, player)
+        and can_aim_mirror_shield(state, player)
+    )
+
+
+def can_reach_earth_temple_tall_vine_room(state: CollectionState, player: int) -> bool:
+    return can_reach_earth_temple_third_crypt(state, player) and can_play_earth_gods_lyric(state, player)
+
+
+def can_reach_earth_temple_many_mirrors_room(state: CollectionState, player: int) -> bool:
+    return can_reach_earth_temple_tall_vine_room(state, player)
+
+
+def can_reach_wind_temple_kidnapping_room(state: CollectionState, player: int) -> bool:
+    return (
+        can_play_command_melody(state, player)
+        and state.has("Iron Boots", player)
+        and can_fly_with_deku_leaf_indoors(state, player)
+    )
+
+
+def can_reach_end_of_wind_temple_many_cyclones_room(state: CollectionState, player: int) -> bool:
+    return can_reach_wind_temple_kidnapping_room(state, player) and (
+        (
+            state.has("Iron Boots", player)
+            and can_fan_with_deku_leaf(state, player)
+            and can_fly_with_deku_leaf_indoors(state, player)
+            and can_cut_grass(state, player)
+        )
+        or (
+            state.has("Hookshot", player)
+            and can_defeat_blue_bubbles(state, player)
+            and can_fly_with_deku_leaf_indoors(state, player)
+        )
+        or (
+            state.has("Hookshot", player)
+            and can_fly_with_deku_leaf_indoors(state, player)
+            and state._tww_obscure_1(player)
+            and state._tww_precise_2(player)
+        )
+    )
+
+
+def can_open_wind_temple_upper_giant_grate(state: CollectionState, player: int) -> bool:
+    return can_reach_end_of_wind_temple_many_cyclones_room(state, player) and state.has("Iron Boots", player)
+
+
+def can_activate_wind_temple_giant_fan(state: CollectionState, player: int) -> bool:
+    return can_open_wind_temple_upper_giant_grate(state, player) and can_play_command_melody(state, player)
+
+
+def can_open_wind_temple_lower_giant_grate(state: CollectionState, player: int) -> bool:
+    return (
+        can_reach_wind_temple_kidnapping_room(state, player)
+        and state.has("Hookshot", player)
+        and can_defeat_blue_bubbles(state, player)
+    )
+
+
+def can_reach_wind_temple_tall_basement_room(state: CollectionState, player: int) -> bool:
+    return (
+        can_open_wind_temple_upper_giant_grate(state, player)
+        and can_open_wind_temple_lower_giant_grate(state, player)
+        and state.has("WT Small Key", player, 2)
+    )
+
+
+def can_access_dungeon_entrance_on_dragon_roost_island(state: CollectionState, player: int) -> bool:
+    return True
+
+
+def can_access_forest_haven(state: CollectionState, player: int) -> bool:
+    return state.has("Grappling Hook", player) or can_fly_with_deku_leaf_outdoors(state, player)
+
+
+def can_access_dungeon_entrance_in_forest_haven_sector(state: CollectionState, player: int) -> bool:
+    return (
+        can_access_forest_haven(state, player)
+        and (
+            state.has("Grappling Hook", player)
+            or (
+                can_fly_with_deku_leaf_indoors(state, player)
+                and can_fly_with_deku_leaf_outdoors(state, player)
+                and state._tww_obscure_1(player)
+                and state._tww_precise_1(player)
+            )
+        )
+        and can_fly_with_deku_leaf_outdoors(state, player)
+        and (can_cut_grass(state, player) or has_magic_meter_upgrade(state, player))
+    )
+
+
+def can_access_dungeon_entrance_in_tower_of_the_gods_sector(state: CollectionState, player: int) -> bool:
+    return state.has_group_unique("Pearls", player, 3)
+
+
+def can_access_dungeon_entrance_in_forsaken_fortress_sector(state: CollectionState, player: int) -> bool:
+    return False
+
+
+def can_access_dungeon_entrance_on_headstone_island(state: CollectionState, player: int) -> bool:
+    return state.has("Power Bracelets", player)
+
+
+def can_access_dungeon_entrance_on_gale_isle(state: CollectionState, player: int) -> bool:
+    return state.has_all(["Iron Boots", "Skull Hammer"], player)
+
+
+def can_access_miniboss_entrance_in_forbidden_woods(state: CollectionState, player: int) -> bool:
+    return (
+        can_fly_with_deku_leaf_indoors(state, player)
+        and can_defeat_boko_babas(state, player)
+        and state.has_all(["Grappling Hook", "FW Small Key"], player)
+    )
+
+
+def can_access_miniboss_entrance_in_tower_of_the_gods(state: CollectionState, player: int) -> bool:
+    return (
+        can_reach_tower_of_the_gods_second_floor(state, player)
+        and (state.has("Grappling Hook", player) or can_fly_with_deku_leaf_indoors(state, player))
+        and (can_play_command_melody(state, player) or has_heros_bow(state, player))
+    )
+
+
+def can_access_miniboss_entrance_in_earth_temple(state: CollectionState, player: int) -> bool:
+    return can_reach_earth_temple_moblins_and_poes_room(state, player) and state.has("ET Small Key", player, 3)
+
+
+def can_access_miniboss_entrance_in_wind_temple(state: CollectionState, player: int) -> bool:
+    return can_open_wind_temple_upper_giant_grate(state, player) and state.has("WT Small Key", player, 2)
+
+
+def can_access_miniboss_entrance_in_hyrule_castle(state: CollectionState, player: int) -> bool:
+    return can_access_hyrule(state, player)
+
+
+def can_access_boss_entrance_in_dragon_roost_cavern(state: CollectionState, player: int) -> bool:
+    return can_reach_dragon_roost_cavern_boss_stairs(state, player) and state.has("DRC Big Key", player)
+
+
+def can_access_boss_entrance_in_forbidden_woods(state: CollectionState, player: int) -> bool:
+    return (
+        can_fly_with_deku_leaf_indoors(state, player)
+        and can_defeat_boko_babas(state, player)
+        and (can_defeat_door_flowers(state, player) or state.has("Grappling Hook", player))
+        and can_defeat_mothulas(state, player)
+        and state.has("FW Big Key", player)
+    )
+
+
+def can_access_boss_entrance_in_tower_of_the_gods(state: CollectionState, player: int) -> bool:
+    return (
+        can_reach_tower_of_the_gods_third_floor(state, player)
+        and can_defeat_armos(state, player)
+        and state.has("TotG Big Key", player)
+    )
+
+
+def can_access_boss_entrance_in_forsaken_fortress(state: CollectionState, player: int) -> bool:
+    return (
+        can_get_inside_forsaken_fortress(state, player)
+        and state.has("Skull Hammer", player)
+        and (
+            can_fly_with_deku_leaf_indoors(state, player)
+            or state.has("Hookshot", player)
+            or (state._tww_obscure_2(player) and state._tww_precise_2(player))
+        )
+        and (
+            can_defeat_bokoblins(state, player)
+            or can_fly_with_deku_leaf_outdoors(state, player)
+            or state.has("Grappling Hook", player)
+        )
+    )
+
+
+def can_access_boss_entrance_in_earth_temple(state: CollectionState, player: int) -> bool:
+    return can_reach_earth_temple_tall_vine_room(state, player) and state.has("ET Big Key", player)
+
+
+def can_access_boss_entrance_in_wind_temple(state: CollectionState, player: int) -> bool:
+    return (
+        can_reach_wind_temple_tall_basement_room(state, player)
+        and state.has_all(["Hookshot", "Iron Boots", "WT Big Key"], player)
+        and can_play_command_melody(state, player)
+        and can_play_wind_gods_aria(state, player)
+    )
+
+
+def can_access_secret_cave_entrance_on_outset_island(state: CollectionState, player: int) -> bool:
+    return (
+        (can_reach_outset_island_upper_level(state, player) and can_fly_with_deku_leaf_outdoors(state, player))
+        or state.has("Hookshot", player)
+    ) and state.has("Power Bracelets", player)
+
+
+def can_access_secret_cave_entrance_on_dragon_roost_island(state: CollectionState, player: int) -> bool:
+    return can_move_boulders(state, player)
+
+
+def can_access_secret_cave_entrance_on_fire_mountain(state: CollectionState, player: int) -> bool:
+    return has_ice_arrows(state, player)
+
+
+def can_access_secret_cave_entrance_on_ice_ring_isle(state: CollectionState, player: int) -> bool:
+    return has_fire_arrows(state, player)
+
+
+def can_access_secret_cave_entrance_on_private_oasis(state: CollectionState, player: int) -> bool:
+    return state.has_all(["Delivery Bag", "Cabana Deed", "Grappling Hook"], player)
+
+
+def can_access_secret_cave_entrance_on_needle_rock_isle(state: CollectionState, player: int) -> bool:
+    return has_fire_arrows(state, player)
+
+
+def can_access_secret_cave_entrance_on_angular_isles(state: CollectionState, player: int) -> bool:
+    return can_fly_with_deku_leaf_outdoors(state, player) or state.has("Hookshot", player)
+
+
+def can_access_secret_cave_entrance_on_boating_course(state: CollectionState, player: int) -> bool:
+    return can_fly_with_deku_leaf_outdoors(state, player) or state.has("Hookshot", player)
+
+
+def can_access_secret_cave_entrance_on_stone_watcher_island(state: CollectionState, player: int) -> bool:
+    return state.has("Power Bracelets", player)
+
+
+def can_access_secret_cave_entrance_on_overlook_island(state: CollectionState, player: int) -> bool:
+    return state.has("Hookshot", player)
+
+
+def can_access_secret_cave_entrance_on_birds_peak_rock(state: CollectionState, player: int) -> bool:
+    return state.has("Bait Bag", player)
+
+
+def can_access_secret_cave_entrance_on_pawprint_isle(state: CollectionState, player: int) -> bool:
+    return True
+
+
+def can_access_secret_cave_entrance_on_pawprint_isle_side_isle(state: CollectionState, player: int) -> bool:
+    return state.has("Hookshot", player)
+
+
+def can_access_secret_cave_entrance_on_diamond_steppe_island(state: CollectionState, player: int) -> bool:
+    return state.has("Hookshot", player)
+
+
+def can_access_secret_cave_entrance_on_bomb_island(state: CollectionState, player: int) -> bool:
+    return can_move_boulders(state, player)
+
+
+def can_access_secret_cave_entrance_on_rock_spire_isle(state: CollectionState, player: int) -> bool:
+    return state.has("Bombs", player)
+
+
+def can_access_secret_cave_entrance_on_shark_island(state: CollectionState, player: int) -> bool:
+    return state.has_all(["Iron Boots", "Skull Hammer"], player)
+
+
+def can_access_secret_cave_entrance_on_cliff_plateau_isles(state: CollectionState, player: int) -> bool:
+    return True
+
+
+def can_access_secret_cave_entrance_on_horseshoe_island(state: CollectionState, player: int) -> bool:
+    return can_fan_with_deku_leaf(state, player)
+
+
+def can_access_secret_cave_entrance_on_star_island(state: CollectionState, player: int) -> bool:
+    return can_move_boulders(state, player)
+
+
+def can_access_inner_entrance_in_ice_ring_isle_secret_cave(state: CollectionState, player: int) -> bool:
+    return state.has("Iron Boots", player)
+
+
+def can_access_inner_entrance_in_cliff_plateau_isles_secret_cave(state: CollectionState, player: int) -> bool:
+    return can_defeat_boko_babas(state, player) and can_fly_with_deku_leaf_indoors(state, player)
+
+
+def can_access_fairy_fountain_entrance_on_outset_island(state: CollectionState, player: int) -> bool:
+    return can_access_forest_of_fairies(state, player) and can_move_boulders(state, player)
+
+
+def can_access_fairy_fountain_entrance_on_thorned_fairy_island(state: CollectionState, player: int) -> bool:
+    return state.has("Skull Hammer", player)
+
+
+def can_access_fairy_fountain_entrance_on_eastern_fairy_island(state: CollectionState, player: int) -> bool:
+    return can_move_boulders(state, player)
+
+
+def can_access_fairy_fountain_entrance_on_western_fairy_island(state: CollectionState, player: int) -> bool:
+    return state.has("Skull Hammer", player)
+
+
+def can_access_fairy_fountain_entrance_on_southern_fairy_island(state: CollectionState, player: int) -> bool:
+    return state.has("Bombs", player) or has_fire_arrows(state, player)
+
+
+def can_access_fairy_fountain_entrance_on_northern_fairy_island(state: CollectionState, player: int) -> bool:
+    return True
+
+
+def can_get_past_forsaken_fortress_gate(state: CollectionState, player: int) -> bool:
+    return (
+        state.has("Bombs", player)
+        or (state._tww_obscure_1(player) and state._tww_precise_1(player))
+        or (can_open_ganons_tower_dark_portal(state, player) and state._tww_obscure_1(player))
+    )
+
+
+def can_get_inside_forsaken_fortress(state: CollectionState, player: int) -> bool:
+    return can_get_past_forsaken_fortress_gate(state, player) and state.has("Skull Hammer", player)
+
+
+def can_reach_and_defeat_phantom_ganon(state: CollectionState, player: int) -> bool:
+    return can_get_past_forsaken_fortress_gate(state, player) and can_defeat_phantom_ganon(state, player)
+
+
+def can_defeat_phantom_ganon(state: CollectionState, player: int) -> bool:
+    return (state._tww_outside_swordless_mode(player) and has_any_master_sword(state, player)) or (
+        state._tww_in_swordless_mode(player) and state.has("Skull Hammer", player)
+    )
+
+
+def can_access_hyrule(state: CollectionState, player: int) -> bool:
+    return has_all_8_triforce_shards(state, player)
+
+
+def can_get_past_hyrule_barrier(state: CollectionState, player: int) -> bool:
+    return can_access_hyrule(state, player) and (
+        has_full_power_master_sword(state, player) or state._tww_in_swordless_mode(player)
+    )
+
+
+def can_access_ganons_tower(state: CollectionState, player: int) -> bool:
+    return can_get_past_hyrule_barrier(state, player) and (
+        state.has("Hookshot", player) or can_fly_with_deku_leaf_indoors(state, player)
+    )
+
+
+def can_complete_memory_dragon_roost_cavern_and_gohma(state: CollectionState, player: int) -> bool:
+    return (
+        state.has("Grappling Hook", player)
+        and can_fly_with_deku_leaf_indoors(state, player)
+        and can_defeat_gohma(state, player)
+    )
+
+
+def can_complete_memory_forbidden_woods_and_kalle_demos(state: CollectionState, player: int) -> bool:
+    return (
+        can_fan_with_deku_leaf(state, player)
+        and can_fly_with_deku_leaf_indoors(state, player)
+        and can_defeat_kalle_demos(state, player)
+    )
+
+
+def can_complete_memory_earth_temple_and_jalhalla(state: CollectionState, player: int) -> bool:
+    return can_defeat_jalhalla(state, player)
+
+
+def can_complete_memory_wind_temple_and_molgera(state: CollectionState, player: int) -> bool:
+    return can_fly_with_deku_leaf_indoors(state, player) and can_defeat_molgera(state, player)
+
+
+def can_complete_all_memory_dungeons_and_bosses(state: CollectionState, player: int) -> bool:
+    return (
+        can_complete_memory_dragon_roost_cavern_and_gohma(state, player)
+        and can_complete_memory_forbidden_woods_and_kalle_demos(state, player)
+        and can_complete_memory_earth_temple_and_jalhalla(state, player)
+        and can_complete_memory_wind_temple_and_molgera(state, player)
+    )
+
+
+def can_unlock_ganons_tower_four_boss_door(state: CollectionState, player: int) -> bool:
+    return can_complete_all_memory_dungeons_and_bosses(state, player) or state._tww_rematch_bosses_skipped(player)
+
+
+def can_reach_ganons_tower_phantom_ganon_room(state: CollectionState, player: int) -> bool:
+    return can_access_ganons_tower(state, player) and can_unlock_ganons_tower_four_boss_door(state, player)
+
+
+def can_open_ganons_tower_dark_portal(state: CollectionState, player: int) -> bool:
+    return can_reach_ganons_tower_phantom_ganon_room(state, player) and state.has("Boomerang", player)
+
+
+def can_reach_and_defeat_puppet_ganon(state: CollectionState, player: int) -> bool:
+    return (
+        can_reach_ganons_tower_phantom_ganon_room(state, player)
+        and has_light_arrows(state, player)
+        and can_unlock_puppet_ganon_door(state, player)
+        and can_defeat_puppet_ganon(state, player)
+    )
+
+
+def can_unlock_puppet_ganon_door(state: CollectionState, player: int) -> bool:
+    return (
+        can_defeat_moblins(state, player)
+        and can_defeat_mighty_darknuts(state, player)
+        and (
+            state._tww_outside_required_bosses_mode(player)
+            or (state._tww_in_required_bosses_mode(player) and state._tww_can_defeat_all_required_bosses(player))
+        )
+    )
+
+
+def can_defeat_puppet_ganon(state: CollectionState, player: int) -> bool:
+    return has_light_arrows(state, player) and (state.has("Boomerang", player) or state._tww_precise_2(player))
+
+
+def can_reach_and_defeat_ganondorf(state: CollectionState, player: int) -> bool:
+    return (
+        can_reach_and_defeat_puppet_ganon(state, player)
+        and state.has_all(["Grappling Hook", "Hookshot"], player)
+        and can_defeat_ganondorf(state, player)
+    )
+
+
+def can_defeat_ganondorf(state: CollectionState, player: int) -> bool:
+    return (has_heros_sword(state, player) or state._tww_in_swordless_mode(player)) and (
+        has_heros_shield(state, player) or (state.has("Skull Hammer", player) and state._tww_obscure_2(player))
+    )
+
+
+def can_farm_knights_crests(state: CollectionState, player: int) -> bool:
+    return state.has_all(["Grappling Hook", "Spoils Bag"], player) and (
+        # (Can Access Item Location "Ice Ring Isle - Inner Cave - Chest")
+        (state.can_reach_region("Ice Ring Isle Inner Cave", player) and has_fire_arrows(state, player))
+        # | (Can Access Item Location "Outset Island - Savage Labyrinth - Floor 30")
+        or (
+            state.can_reach_region("Savage Labyrinth", player)
+            and can_defeat_keese(state, player)
+            and can_defeat_miniblins(state, player)
+            and can_defeat_red_chuchus(state, player)
+            and can_defeat_magtails(state, player)
+            and can_defeat_fire_keese(state, player)
+            and can_defeat_peahats(state, player)
+            and can_defeat_green_chuchus(state, player)
+            and can_defeat_boko_babas(state, player)
+            and can_defeat_mothulas(state, player)
+            and can_defeat_winged_mothulas(state, player)
+            and can_defeat_wizzrobes(state, player)
+            and can_defeat_armos(state, player)
+            and can_defeat_yellow_chuchus(state, player)
+            and can_defeat_red_bubbles(state, player)
+            and can_defeat_darknuts(state, player)
+            and can_play_winds_requiem(state, player)
+            and (state.has_any(["Grappling Hook", "Skull Hammer"], player) or has_heros_sword(state, player))
+        )
+        # | (Can Access Item Location "Earth Temple - Big Key Chest" & Can Defeat Darknuts Easily)
+        or (
+            state.can_reach_region("Earth Temple", player)
+            and can_reach_earth_temple_many_mirrors_room(state, player)
+            and state.has("Power Bracelets", player)
+            and can_play_command_melody(state, player)
+            and can_aim_mirror_shield(state, player)
+            and (
+                can_defeat_blue_bubbles(state, player)
+                or (has_heros_bow(state, player) and state._tww_obscure_1(player))
+                or (
+                    (
+                        has_heros_sword(state, player)
+                        or has_any_master_sword(state, player)
+                        or state.has("Skull Hammer", player)
+                    )
+                    and state._tww_obscure_1(player)
+                    and state._tww_precise_1(player)
+                )
+            )
+            and can_defeat_darknuts_easily(state, player)
+        )
+        # | (Can Access Item Location "Wind Temple - Big Key Chest" & Can Defeat Darknuts Easily)
+        or (
+            state.can_reach_region("Wind Temple", player)
+            and can_reach_wind_temple_kidnapping_room(state, player)
+            and state.has("Iron Boots", player)
+            and can_fan_with_deku_leaf(state, player)
+            and can_play_wind_gods_aria(state, player)
+            and can_defeat_darknuts_easily(state, player)
+        )
+        # | (Can Access Item Location "Shark Island - Cave")
+        or (state.can_reach_region("Shark Island Secret Cave", player) and can_defeat_miniblins(state, player))
+        # | (Can Access Item Location "Stone Watcher Island - Cave" & Can Defeat Darknuts Easily)
+        or (
+            state.can_reach_region("Stone Watcher Island Secret Cave", player)
+            and can_defeat_armos(state, player)
+            and can_defeat_wizzrobes(state, player)
+            and can_play_winds_requiem(state, player)
+            and can_defeat_darknuts_easily(state, player)
+        )
+        # | (Can Access Item Location "Overlook Island - Cave" & Can Defeat Darknuts Easily)
+        or (
+            state.can_reach_region("Overlook Island Secret Cave", player)
+            and can_defeat_stalfos(state, player)
+            and can_defeat_wizzrobes(state, player)
+            and can_defeat_red_chuchus(state, player)
+            and can_defeat_green_chuchus(state, player)
+            and can_defeat_keese(state, player)
+            and can_defeat_fire_keese(state, player)
+            and can_defeat_morths(state, player)
+            and can_defeat_kargarocs(state, player)
+            and can_play_winds_requiem(state, player)
+            and can_defeat_darknuts_easily(state, player)
+        )
+        # | (Can Access Hyrule)
+        or can_access_hyrule(state, player)
+    )
+
+
+def can_farm_joy_pendants(state: CollectionState, player: int) -> bool:
+    return state.has_all(["Grappling Hook", "Spoils Bag"], player)
+
+
+def can_farm_skull_necklaces(state: CollectionState, player: int) -> bool:
+    return state.has_all(["Grappling Hook", "Spoils Bag"], player)
+
+
+def can_farm_golden_feathers(state: CollectionState, player: int) -> bool:
+    return state.has_all(["Grappling Hook", "Spoils Bag"], player)
+
+
+def can_farm_green_chu_jelly(state: CollectionState, player: int) -> bool:
+    return state.has_all(["Grappling Hook", "Spoils Bag"], player)
+
+
+def can_obtain_15_blue_chu_jelly(state: CollectionState, player: int) -> bool:
+    return (
+        can_get_blue_chu_jelly_from_blue_chuchus(state, player)
+        and (
+            state.has_any(["Hookshot", "Bombs", "Grappling Hook"], player)
+            or can_move_boulders(state, player)
+            or (
+                can_access_secret_cave_entrance_on_shark_island(state, player)
+                and can_fly_with_deku_leaf_outdoors(state, player)
+            )
+            or state.can_reach_region("Cliff Plateau Isles Inner Cave", player)
+            or can_fan_with_deku_leaf(state, player)
+            or can_access_secret_cave_entrance_on_boating_course(state, player)
+        )
+        and state.has("Spoils Bag", player)
+    )
+
+
+def can_defeat_bokoblins(state: CollectionState, player: int) -> bool:
+    return (
+        state.has_any(["Bombs", "Skull Hammer"], player)
+        or has_heros_sword(state, player)
+        or has_heros_bow(state, player)
+    )
+
+
+def can_defeat_moblins(state: CollectionState, player: int) -> bool:
+    return (
+        state.has_any(["Bombs", "Skull Hammer"], player)
+        or has_heros_sword(state, player)
+        or has_heros_bow(state, player)
+    )
+
+
+def can_defeat_darknuts(state: CollectionState, player: int) -> bool:
+    return has_heros_sword(state, player) or has_light_arrows(state, player) or state.has("Skull Hammer", player)
+
+
+def can_defeat_darknuts_easily(state: CollectionState, player: int) -> bool:
+    return has_heros_sword(state, player) or has_light_arrows(state, player)
+
+
+def can_defeat_mighty_darknuts(state: CollectionState, player: int) -> bool:
+    return can_defeat_darknuts_easily(state, player) or (
+        state.has("Skull Hammer", player) and state._tww_precise_3(player)
+    )
+
+
+def can_defeat_miniblins(state: CollectionState, player: int) -> bool:
+    return (
+        state.has_any(["Grappling Hook", "Boomerang", "Bombs", "Skull Hammer"], player)
+        or has_heros_sword(state, player)
+        or has_heros_bow(state, player)
+    )
+
+
+def can_defeat_miniblins_easily(state: CollectionState, player: int) -> bool:
+    return (
+        state.has_any(["Boomerang", "Bombs", "Skull Hammer"], player)
+        or has_heros_sword(state, player)
+        or has_heros_bow(state, player)
+    )
+
+
+def can_defeat_red_chuchus(state: CollectionState, player: int) -> bool:
+    return (
+        state.has_any(["Skull Hammer", "Bombs"], player)
+        or has_heros_sword(state, player)
+        or has_heros_bow(state, player)
+    )
+
+
+def can_defeat_green_chuchus(state: CollectionState, player: int) -> bool:
+    return can_defeat_red_chuchus(state, player)
+
+
+def can_defeat_yellow_chuchus(state: CollectionState, player: int) -> bool:
+    return (
+        state.has_any(["Bombs", "Skull Hammer"], player)
+        or (state.has("Boomerang", player) and has_heros_sword(state, player))
+        or has_heros_bow(state, player)
+        or (can_fan_with_deku_leaf(state, player) and has_heros_sword(state, player))
+        or (
+            state.has("Grappling Hook", player)
+            and has_heros_sword(state, player)
+            and state._tww_obscure_1(player)
+            and state._tww_precise_2(player)
+        )
+    )
+
+
+def can_defeat_blue_chuchus(state: CollectionState, player: int) -> bool:
+    return can_defeat_yellow_chuchus(state, player)
+
+
+def can_get_blue_chu_jelly_from_blue_chuchus(state: CollectionState, player: int) -> bool:
+    return can_defeat_blue_chuchus(state, player) or state.has("Grappling Hook", player)
+
+
+def can_defeat_keese(state: CollectionState, player: int) -> bool:
+    return (
+        state.has_any(["Hookshot", "Grappling Hook", "Boomerang", "Bombs", "Skull Hammer"], player)
+        or has_heros_sword(state, player)
+        or has_heros_bow(state, player)
+    )
+
+
+def can_defeat_fire_keese(state: CollectionState, player: int) -> bool:
+    return can_defeat_keese(state, player)
+
+
+def can_defeat_magtails(state: CollectionState, player: int) -> bool:
+    return (
+        state.has_any(["Skull Hammer", "Boomerang", "Hookshot", "Bombs", "Grappling Hook"], player)
+        or has_heros_sword(state, player)
+        or has_heros_bow(state, player)
+    )
+
+
+def can_stun_magtails(state: CollectionState, player: int) -> bool:
+    return (
+        state.has_any(["Skull Hammer", "Boomerang", "Hookshot", "Bombs", "Grappling Hook"], player)
+        or has_heros_sword(state, player)
+        or has_heros_bow(state, player)
+    )
+
+
+def can_defeat_kargarocs(state: CollectionState, player: int) -> bool:
+    return (
+        state.has_any(["Boomerang", "Skull Hammer", "Bombs"], player)
+        or has_heros_sword(state, player)
+        or has_heros_bow(state, player)
+    )
+
+
+def can_defeat_peahats(state: CollectionState, player: int) -> bool:
+    return (
+        state.has_any(["Boomerang", "Skull Hammer", "Bombs"], player)
+        or (state.has("Hookshot", player) and has_heros_sword(state, player))
+        or (can_fan_with_deku_leaf(state, player) and has_heros_sword(state, player))
+        or has_heros_bow(state, player)
+    )
+
+
+def can_remove_peahat_armor(state: CollectionState, player: int) -> bool:
+    return (
+        state.has_any(["Boomerang", "Hookshot", "Skull Hammer", "Bombs"], player)
+        or can_fan_with_deku_leaf(state, player)
+        or has_heros_bow(state, player)
+    )
+
+
+def can_defeat_seahats(state: CollectionState, player: int) -> bool:
+    return state.has_any(["Boomerang", "Hookshot", "Bombs"], player) or has_heros_bow(state, player)
+
+
+def can_defeat_boko_babas(state: CollectionState, player: int) -> bool:
+    return (
+        state.has_any(["Boomerang", "Skull Hammer", "Hookshot", "Bombs"], player)
+        or has_heros_sword(state, player)
+        or has_heros_bow(state, player)
+        or (can_fan_with_deku_leaf(state, player) and state.has("Grappling Hook", player))
+    )
+
+
+def can_defeat_mothulas(state: CollectionState, player: int) -> bool:
+    return (
+        state.has_any(["Bombs", "Skull Hammer"], player)
+        or has_heros_sword(state, player)
+        or has_heros_bow(state, player)
+    )
+
+
+def can_defeat_winged_mothulas(state: CollectionState, player: int) -> bool:
+    return (
+        state.has_any(["Bombs", "Skull Hammer"], player)
+        or has_heros_sword(state, player)
+        or has_heros_bow(state, player)
+    )
+
+
+def can_defeat_wizzrobes(state: CollectionState, player: int) -> bool:
+    return (
+        state.has_any(["Hookshot", "Bombs", "Skull Hammer"], player)
+        or has_heros_sword(state, player)
+        or has_heros_bow(state, player)
+    )
+
+
+def can_defeat_wizzrobes_at_range(state: CollectionState, player: int) -> bool:
+    return has_heros_bow(state, player) or (state.has("Hookshot", player) and state._tww_precise_1(player))
+
+
+def can_defeat_armos(state: CollectionState, player: int) -> bool:
+    return (
+        state.has_any(["Bombs", "Skull Hammer", "Hookshot"], player)
+        or has_heros_sword(state, player)
+        or has_heros_bow(state, player)
+    )
+
+
+def can_defeat_big_octos(state: CollectionState, player: int) -> bool:
+    return state.has_any(["Bombs", "Boomerang"], player) or has_heros_bow(state, player)
+
+
+def can_defeat_12_eye_big_octos(state: CollectionState, player: int) -> bool:
+    return (
+        state.has_any(["Bombs", "Boomerang"], player)
+        or (has_heros_bow(state, player) and has_any_quiver_upgrade(state, player))
+        or has_light_arrows(state, player)
+    )
+
+
+def can_defeat_red_bubbles(state: CollectionState, player: int) -> bool:
+    return (
+        state.has_any(["Skull Hammer", "Bombs"], player)
+        or has_heros_sword(state, player)
+        or has_heros_bow(state, player)
+        or (
+            (can_fan_with_deku_leaf(state, player) or state.has("Hookshot", player))
+            and state.has("Grappling Hook", player)
+        )
+    )
+
+
+def can_defeat_blue_bubbles(state: CollectionState, player: int) -> bool:
+    return (
+        has_ice_arrows(state, player)
+        or state.has("Bombs", player)
+        or (
+            (can_fan_with_deku_leaf(state, player) or state.has("Hookshot", player))
+            and (
+                state.has_any(["Grappling Hook", "Skull Hammer"], player)
+                or has_heros_sword(state, player)
+                or has_heros_bow(state, player)
+            )
+        )
+    )
+
+
+def can_defeat_redeads(state: CollectionState, player: int) -> bool:
+    return (
+        state.has_any(["Skull Hammer", "Bombs"], player)
+        or has_heros_sword(state, player)
+        or has_light_arrows(state, player)
+    )
+
+
+def can_defeat_jalhalla_poes(state: CollectionState, player: int) -> bool:
+    return (
+        state.has_any(["Bombs", "Skull Hammer"], player)
+        or has_heros_sword(state, player)
+        or has_heros_bow(state, player)
+    )
+
+
+def can_defeat_stalfos(state: CollectionState, player: int) -> bool:
+    return (
+        state.has_any(["Bombs", "Skull Hammer"], player)
+        or has_heros_sword(state, player)
+        or has_light_arrows(state, player)
+    )
+
+
+def can_defeat_floormasters(state: CollectionState, player: int) -> bool:
+    return (
+        has_heros_sword(state, player)
+        or has_heros_bow(state, player)
+        or (state.has("Skull Hammer", player) and state._tww_precise_1(player))
+    )
+
+
+def can_defeat_morths(state: CollectionState, player: int) -> bool:
+    return (
+        state.has_any(["Boomerang", "Hookshot"], player)
+        or has_heros_sword(state, player)
+        or has_heros_bow(state, player)
+    )
+
+
+def can_defeat_bombchus(state: CollectionState, player: int) -> bool:
+    return (
+        state.has_any(["Boomerang", "Skull Hammer", "Grappling Hook"], player)
+        or has_heros_sword(state, player)
+        or has_heros_bow(state, player)
+    )
+
+
+def can_defeat_gohma(state: CollectionState, player: int) -> bool:
+    return state.has("Grappling Hook", player)
+
+
+def can_defeat_kalle_demos(state: CollectionState, player: int) -> bool:
+    return state.has("Boomerang", player)
+
+
+def can_defeat_gohdan(state: CollectionState, player: int) -> bool:
+    return (
+        has_heros_bow(state, player)
+        or (state.has("Hookshot", player) and state._tww_obscure_1(player) and state._tww_precise_2(player))
+    ) and state.has("Bombs", player)
+
+
+def can_defeat_helmaroc_king(state: CollectionState, player: int) -> bool:
+    return state.has("Skull Hammer", player)
+
+
+def can_defeat_jalhalla(state: CollectionState, player: int) -> bool:
+    return (
+        (can_aim_mirror_shield(state, player) or has_light_arrows(state, player))
+        and state.has("Power Bracelets", player)
+        and can_defeat_jalhalla_poes(state, player)
+    )
+
+
+def can_defeat_molgera(state: CollectionState, player: int) -> bool:
+    return state.has("Hookshot", player) and (
+        state.has_any(["Boomerang", "Grappling Hook", "Skull Hammer", "Bombs"], player)
+        or has_heros_sword(state, player)
+        or has_heros_bow(state, player)
+    )
+
+
+def can_destroy_cannons(state: CollectionState, player: int) -> bool:
+    return state.has_any(["Bombs", "Boomerang"], player)
+
+
+def can_cut_down_outset_trees(state: CollectionState, player: int) -> bool:
+    return (
+        state.has_any(["Boomerang", "Skull Hammer"], player)
+        or has_heros_sword(state, player)
+        or (state.has("Power Bracelets", player) and state._tww_obscure_3(player))
+    )
+
+
+def can_cut_down_hanging_drc_platform(state: CollectionState, player: int) -> bool:
+    return (
+        state.has_any(["Bombs", "Skull Hammer"], player)
+        or has_heros_sword(state, player)
+        or has_heros_bow(state, player)
+        or (state.has("Hookshot", player) and state._tww_precise_1(player))
+        or (state.has("Grappling Hook", player) and state._tww_precise_1(player))
+    )
+
+
+def can_cut_grass(state: CollectionState, player: int) -> bool:
+    return state.has_any(["Skull Hammer", "Boomerang", "Bombs"], player) or has_heros_sword(state, player)
+
+
+def can_sword_fight_with_orca(state: CollectionState, player: int) -> bool:
+    return has_heros_sword(state, player) or state._tww_in_swordless_mode(player)
diff --git a/worlds/tww/Options.py b/worlds/tww/Options.py
new file mode 100644
index 0000000000..6e7724e2a1
--- /dev/null
+++ b/worlds/tww/Options.py
@@ -0,0 +1,854 @@
+from dataclasses import dataclass
+
+from Options import (
+    Choice,
+    DeathLink,
+    DefaultOnToggle,
+    OptionGroup,
+    OptionSet,
+    PerGameCommonOptions,
+    Range,
+    StartInventoryPool,
+    Toggle,
+)
+
+from .Locations import DUNGEON_NAMES
+
+
+class Dungeons(DefaultOnToggle):
+    """
+    This controls whether dungeon locations are randomized.
+    """
+
+    display_name = "Dungeons"
+
+
+class TingleChests(Toggle):
+    """
+    Tingle Chests are hidden in dungeons and must be bombed to make them appear. (2 in DRC, 1 each in FW, TotG, ET, and
+    WT). This controls whether they are randomized.
+    """
+
+    display_name = "Tingle Chests"
+
+
+class DungeonSecrets(Toggle):
+    """
+    DRC, FW, TotG, ET, and WT each contain 2-3 secret items (11 in total). This controls whether these are randomized.
+
+    The items are relatively well-hidden (they aren't in chests), so don't select this option unless you're prepared to
+    search each dungeon high and low!
+    """
+
+    display_name = "Dungeon Secrets"
+
+
+class PuzzleSecretCaves(DefaultOnToggle):
+    """
+    This controls whether the rewards from puzzle-focused secret caves are randomized locations.
+    """
+
+    display_name = "Puzzle Secret Caves"
+
+
+class CombatSecretCaves(Toggle):
+    """
+    This controls whether the rewards from combat-focused secret caves (besides Savage Labyrinth) are randomized
+    locations.
+    """
+
+    display_name = "Combat Secret Caves"
+
+
+class SavageLabyrinth(Toggle):
+    """
+    This controls whether the two locations in Savage Labyrinth are randomized.
+    """
+
+    display_name = "Savage Labyrinth"
+
+
+class GreatFairies(DefaultOnToggle):
+    """
+    This controls whether the items given by Great Fairies are randomized.
+    """
+
+    display_name = "Great Fairies"
+
+
+class ShortSidequests(Toggle):
+    """
+    This controls whether sidequests that can be completed quickly are randomized.
+    """
+
+    display_name = "Short Sidequests"
+
+
+class LongSidequests(Toggle):
+    """
+    This controls whether long sidequests (e.g., Lenzo's assistant, withered trees, goron trading) are randomized.
+    """
+
+    display_name = "Long Sidequests"
+
+
+class SpoilsTrading(Toggle):
+    """
+    This controls whether the items you get by trading in spoils to NPCs are randomized.
+    """
+
+    display_name = "Spoils Trading"
+
+
+class Minigames(Toggle):
+    """
+    This controls whether most minigames are randomized (auctions, mail sorting, barrel shooting, bird-man contest).
+    """
+
+    display_name = "Minigames"
+
+
+class Battlesquid(Toggle):
+    """
+    This controls whether the Windfall battleship minigame is randomized.
+    """
+
+    display_name = "Battlesquid Minigame"
+
+
+class FreeGifts(DefaultOnToggle):
+    """
+    This controls whether gifts freely given by NPCs are randomized (Tott, Salvage Corp, imprisoned Tingle).
+    """
+
+    display_name = "Free Gifts"
+
+
+class Mail(Toggle):
+    """
+    This controls whether items received from the mail are randomized.
+    """
+
+    display_name = "Mail"
+
+
+class PlatformsRafts(Toggle):
+    """
+    This controls whether lookout platforms and rafts are randomized.
+    """
+
+    display_name = "Lookout Platforms and Rafts"
+
+
+class Submarines(Toggle):
+    """
+    This controls whether submarines are randomized.
+    """
+
+    display_name = "Submarines"
+
+
+class EyeReefChests(Toggle):
+    """
+    This controls whether the chests that appear after clearing out the eye reefs are randomized.
+    """
+
+    display_name = "Eye Reef Chests"
+
+
+class BigOctosGunboats(Toggle):
+    """
+    This controls whether the items dropped by Big Octos and Gunboats are randomized.
+    """
+
+    display_name = "Big Octos and Gunboats"
+
+
+class TriforceCharts(Toggle):
+    """
+    This controls whether the sunken treasure chests marked on Triforce Charts are randomized.
+    """
+
+    display_name = "Sunken Treasure (From Triforce Charts)"
+
+
+class TreasureCharts(Toggle):
+    """
+    This controls whether the sunken treasure chests marked on Treasure Charts are randomized.
+    """
+
+    display_name = "Sunken Treasure (From Treasure Charts)"
+
+
+class ExpensivePurchases(DefaultOnToggle):
+    """
+    This controls whether items that cost many Rupees are randomized (Rock Spire shop, auctions, Tingle's letter,
+    trading quest).
+    """
+
+    display_name = "Expensive Purchases"
+
+
+class IslandPuzzles(Toggle):
+    """
+    This controls whether various island puzzles are randomized (e.g., chests hidden in unusual places).
+    """
+
+    display_name = "Island Puzzles"
+
+
+class Misc(Toggle):
+    """
+    Miscellaneous locations that don't fit into any of the above categories (outdoors chests, wind shrine, Cyclos, etc).
+    This controls whether these are randomized.
+    """
+
+    display_name = "Miscellaneous"
+
+
+class DungeonItem(Choice):
+    """
+    This is the base class for the shuffle options for dungeon items.
+    """
+
+    value: int
+    option_startwith = 0
+    option_vanilla = 1
+    option_dungeon = 2
+    option_any_dungeon = 3
+    option_local = 4
+    option_keylunacy = 5
+    default = 2
+
+    @property
+    def in_dungeon(self) -> bool:
+        """
+        Return whether the item should be shuffled into a dungeon.
+
+        :return: Whether the item is shuffled into a dungeon.
+        """
+        return self.value in (2, 3)
+
+
+class RandomizeMapCompass(DungeonItem):
+    """
+    Controls how dungeon maps and compasses are randomized.
+
+    - **Start With Maps & Compasses:** You will start the game with the dungeon maps and compasses for all dungeons.
+    - **Vanilla Maps & Compasses:** Dungeon maps and compasses will be kept in their vanilla location (non-randomized).
+    - **Own Dungeon Maps & Compasses:** Dungeon maps and compasses will be randomized locally within their own dungeon.
+    - **Any Dungeon Maps & Compasses:** Dungeon maps and compasses will be randomized locally within any dungeon.
+    - **Local Maps & Compasses:** Dungeon maps and compasses will be randomized locally anywhere.
+    - **Key-Lunacy:** Dungeon maps and compasses can be found anywhere, without restriction.
+    """
+
+    item_name_group = "Dungeon Items"
+    display_name = "Randomize Maps & Compasses"
+    default = 2
+
+
+class RandomizeSmallKeys(DungeonItem):
+    """
+    Controls how small keys are randomized.
+
+    - **Start With Small Keys:** You will start the game with the small keys for all dungeons.
+    - **Vanilla Small Keys:** Small keys will be kept in their vanilla location (non-randomized).
+    - **Own Dungeon Small Keys:** Small keys will be randomized locally within their own dungeon.
+    - **Any Dungeon Small Keys:** Small keys will be randomized locally within any dungeon.
+    - **Local Small Keys:** Small keys will be randomized locally anywhere.
+    - **Key-Lunacy:** Small keys can be found in any progression location, if dungeons are randomized.
+    """
+
+    item_name_group = "Small Keys"
+    display_name = "Randomize Small Keys"
+    default = 2
+
+
+class RandomizeBigKeys(DungeonItem):
+    """
+    Controls how big keys are randomized.
+
+    - **Start With Big Keys:** You will start the game with the big keys for all dungeons.
+    - **Vanilla Big Keys:** Big keys will be kept in their vanilla location (non-randomized).
+    - **Own Dungeon Big Keys:** Big keys will be randomized locally within their own dungeon.
+    - **Any Dungeon Big Keys:** Big keys will be randomized locally within any dungeon.
+    - **Local Big Keys:** Big keys will be randomized locally anywhere.
+    - **Key-Lunacy:** Big keys can be found in any progression location, if dungeons are randomized.
+    """
+
+    item_name_group = "Big Keys"
+    display_name = "Randomize Big Keys"
+    default = 2
+
+
+class SwordMode(Choice):
+    """
+    Controls whether you start with the Hero's Sword, the Hero's Sword is randomized, or if there are no swords in the
+    entire game.
+
+    - **Start with Hero's Sword:** You will start the game with the basic Hero's Sword already in your inventory.
+    - **No Starting Sword:** You will start the game with no sword, and have to find it somewhere in the world like
+      other randomized items.
+    - **Swords Optional:** You will start the game with no sword, but they'll still be randomized. However, they are not
+      necessary to beat the game. The Hyrule Barrier will be gone, Phantom Ganon in FF is vulnerable to Skull Hammer,
+      and the logic does not expect you to have a sword.
+    - **Swordless:** You will start the game with no sword, and won't be able to find it anywhere. You have to beat the
+      entire game using other items as weapons instead of the sword. (Note that Phantom Ganon in FF becomes vulnerable
+      to Skull Hammer in this mode.)
+    """
+
+    display_name = "Sword Mode"
+    option_start_with_sword = 0
+    option_no_starting_sword = 1
+    option_swords_optional = 2
+    option_swordless = 3
+    default = 0
+
+
+class RequiredBosses(Toggle):
+    """
+    In this mode, you will not be allowed to beat the game until certain randomly-chosen bosses are defeated. Nothing in
+    dungeons for other bosses will ever be required.
+
+    You can see which islands have the required bosses on them by opening the sea chart and checking which islands have
+    blue quest markers.
+    """
+
+    display_name = "Required Bosses Mode"
+
+
+class NumRequiredBosses(Range):
+    """
+    Select the number of randomly-chosen bosses that are required in Required Bosses Mode.
+
+    The door to Puppet Ganon will not unlock until you've defeated all of these bosses. Nothing in dungeons for other
+    bosses will ever be required.
+    """
+
+    display_name = "Number of Required Bosses"
+    range_start = 1
+    range_end = 6
+    default = 4
+
+
+class IncludedDungeons(OptionSet):
+    """
+    A list of dungeons that should always be included when required bosses mode is on.
+    """
+
+    display_name = "Included Dungeons"
+    valid_keys = frozenset(DUNGEON_NAMES)
+
+
+class ExcludedDungeons(OptionSet):
+    """
+    A list of dungeons that should always be excluded when required bosses mode is on.
+    """
+
+    display_name = "Excluded Dungeons"
+    valid_keys = frozenset(DUNGEON_NAMES)
+
+
+class ChestTypeMatchesContents(Toggle):
+    """
+    Changes the chest type to reflect its contents. A metal chest has a progress item, a wooden chest has a non-progress
+    item or a consumable, and a green chest has a potentially required dungeon key.
+    """
+
+    display_name = "Chest Type Matches Contents"
+
+
+class TrapChests(Toggle):
+    """
+    **DEV NOTE:** This option is currently unimplemented and will be ignored.
+
+    Allows the randomizer to place several trapped chests across the game that do not give you items. Perfect for
+    spicing up any run!
+    """
+
+    display_name = "Enable Trap Chests"
+
+
+class HeroMode(Toggle):
+    """
+    In Hero Mode, you take four times more damage than normal and heart refills will not drop.
+    """
+
+    display_name = "Hero Mode"
+
+
+class LogicObscurity(Choice):
+    """
+    Obscure tricks are ways of obtaining items that are not obvious and may involve thinking outside the box.
+
+    This option controls the maximum difficulty of obscure tricks the randomizer will require you to do to beat the
+    game.
+    """
+
+    display_name = "Obscure Tricks Required"
+    option_none = 0
+    option_normal = 1
+    option_hard = 2
+    option_very_hard = 3
+    default = 0
+
+
+class LogicPrecision(Choice):
+    """
+    Precise tricks are ways of obtaining items that involve difficult inputs such as accurate aiming or perfect timing.
+
+    This option controls the maximum difficulty of precise tricks the randomizer will require you to do to beat the
+    game.
+    """
+
+    display_name = "Precise Tricks Required"
+    option_none = 0
+    option_normal = 1
+    option_hard = 2
+    option_very_hard = 3
+    default = 0
+
+
+class EnableTunerLogic(Toggle):
+    """
+    If enabled, the randomizer can logically expect the Tingle Tuner for Tingle Chests.
+
+    The randomizer behavior of logically expecting Bombs/bomb flowers to spawn in Tingle Chests remains unchanged.
+    """
+
+    display_name = "Enable Tuner Logic"
+
+
+class RandomizeDungeonEntrances(Toggle):
+    """
+    Shuffles around which dungeon entrances take you into which dungeons.
+
+    (No effect on Forsaken Fortress or Ganon's Tower.)
+    """
+
+    display_name = "Randomize Dungeons"
+
+
+class RandomizeSecretCavesEntrances(Toggle):
+    """
+    Shuffles around which secret cave entrances take you into which secret caves.
+    """
+
+    display_name = "Randomize Secret Caves"
+
+
+class RandomizeMinibossEntrances(Toggle):
+    """
+    Allows dungeon miniboss doors to act as entrances to be randomized.
+
+    If on with random dungeon entrances, dungeons may nest within each other, forming chains of connected dungeons.
+    """
+
+    display_name = "Randomize Nested Minibosses"
+
+
+class RandomizeBossEntrances(Toggle):
+    """
+    Allows dungeon boss doors to act as entrances to be randomized.
+
+    If on with random dungeon entrances, dungeons may nest within each other, forming chains of connected dungeons.
+    """
+
+    display_name = "Randomize Nested Bosses"
+
+
+class RandomizeSecretCaveInnerEntrances(Toggle):
+    """
+    Allows the pit in Ice Ring Isle's secret cave and the rear exit out of Cliff Plateau Isles' secret cave to act as
+    entrances to be randomized."""
+
+    display_name = "Randomize Inner Secret Caves"
+
+
+class RandomizeFairyFountainEntrances(Toggle):
+    """
+    Allows the pits that lead down into Fairy Fountains to act as entrances to be randomized.
+    """
+
+    display_name = "Randomize Fairy Fountains"
+
+
+class MixEntrances(Choice):
+    """
+    Controls how the different types (pools) of randomized entrances should be shuffled.
+
+    - **Separate Pools:** Each pool of randomized entrances will shuffle into itself (e.g., dungeons into dungeons).
+    - **Mix Pools:** All pools of randomized entrances will be combined into one pool to be shuffled.
+    """
+
+    display_name = "Mix Entrances"
+    option_separate_pools = 0
+    option_mix_pools = 1
+    default = 0
+
+
+class RandomizeEnemies(Toggle):
+    """
+    Randomizes the placement of non-boss enemies.
+
+    This option is an *incomplete* option from the base randomizer and **may result in unbeatable seeds! Use at your own
+    risk!**
+    """
+
+    display_name = "Randomize Enemies"
+
+
+# class RandomizeMusic(Toggle):
+#     """
+#     Shuffles around all the music in the game. This affects background music, combat music, fanfares, etc.
+#     """
+
+#     display_name = "Randomize Music"
+
+
+class RandomizeStartingIsland(Toggle):
+    """
+    Randomizes which island you start the game on.
+    """
+
+    display_name = "Randomize Starting Island"
+
+
+class RandomizeCharts(Toggle):
+    """
+    Randomizes which sector is drawn on each Triforce/Treasure Chart.
+    """
+
+    display_name = "Randomize Charts"
+
+
+class HoHoHints(DefaultOnToggle):
+    """
+    **DEV NOTE:** This option is currently unimplemented and will be ignored.
+
+    Places hints on Old Man Ho Ho. Old Man Ho Ho appears at 10 different islands in the game. Talk to Old Man Ho Ho to
+    get hints.
+    """
+
+    display_name = "Place Hints on Old Man Ho Ho"
+
+
+class FishmenHints(DefaultOnToggle):
+    """
+    **DEV NOTE:** This option is currently unimplemented and will be ignored.
+
+    Places hints on the fishmen. There is one fishman at each of the 49 islands of the Great Sea. Each fishman must be
+    fed an All-Purpose Bait before he will give a hint.
+    """
+
+    display_name = "Place Hints on Fishmen"
+
+
+class KoRLHints(Toggle):
+    """
+    **DEV NOTE:** This option is currently unimplemented and will be ignored.
+
+    Places hints on the King of Red Lions. Talk to the King of Red Lions to get hints.
+    """
+
+    display_name = "Place Hints on King of Red Lions"
+
+
+class NumItemHints(Range):
+    """
+    **DEV NOTE:** This option is currently unimplemented and will be ignored.
+
+    The number of item hints that will be placed. Item hints tell you which area contains a particular progress item in
+    this seed.
+
+    If multiple hint placement options are selected, the hint count will be split evenly among the placement options.
+    """
+
+    display_name = "Item Hints"
+    range_start = 0
+    range_end = 15
+    default = 15
+
+
+class NumLocationHints(Range):
+    """
+    **DEV NOTE:** This option is currently unimplemented and will be ignored.
+
+    The number of location hints that will be placed. Location hints tell you what item is at a specific location in
+    this seed.
+
+    If multiple hint placement options are selected, the hint count will be split evenly among the placement options.
+    """
+
+    display_name = "Location Hints"
+    range_start = 0
+    range_end = 15
+    default = 5
+
+
+class NumBarrenHints(Range):
+    """
+    **DEV NOTE:** This option is currently unimplemented and will be ignored.
+
+    The number of barren hints that will be placed. Barren hints tell you that an area does not contain any required
+    items in this seed.
+
+    If multiple hint placement options are selected, the hint count will be split evenly among the placement options.
+    """
+
+    display_name = "Barren Hints"
+    range_start = 0
+    range_end = 15
+    default = 0
+
+
+class NumPathHints(Range):
+    """
+    **DEV NOTE:** This option is currently unimplemented and will be ignored.
+
+    The number of path hints that will be placed. Path hints tell you that an area contains an item that is required to
+    reach a particular goal in this seed.
+
+    If multiple hint placement options are selected, the hint count will be split evenly among the placement options.
+    """
+
+    display_name = "Path Hints"
+    range_start = 0
+    range_end = 15
+    default = 0
+
+
+class PrioritizeRemoteHints(Toggle):
+    """
+    **DEV NOTE:** This option is currently unimplemented and will be ignored.
+
+    When this option is selected, certain locations that are out of the way and time-consuming to complete will take
+    precedence over normal location hints."""
+
+    display_name = "Prioritize Remote Location Hints"
+
+
+class SwiftSail(DefaultOnToggle):
+    """
+    Sailing speed is doubled and the direction of the wind is always at your back as long as the sail is out.
+    """
+
+    display_name = "Swift Sail"
+
+
+class InstantTextBoxes(DefaultOnToggle):
+    """
+    Text appears instantly. Also, the B button is changed to instantly skip through text as long as you hold it down.
+    """
+
+    display_name = "Instant Text Boxes"
+
+
+class RevealFullSeaChart(DefaultOnToggle):
+    """
+    Start the game with the sea chart fully drawn out.
+    """
+
+    display_name = "Reveal Full Sea Chart"
+
+
+class AddShortcutWarpsBetweenDungeons(Toggle):
+    """
+    Adds new warp pots that act as shortcuts connecting dungeons to each other directly. (DRC, FW, TotG, and separately
+    FF, ET, WT.)
+
+    Each pot must be unlocked before it can be used, so you cannot use them to access dungeons
+    you wouldn't already have access to.
+    """
+
+    display_name = "Add Shortcut Warps Between Dungeons"
+
+
+class SkipRematchBosses(DefaultOnToggle):
+    """
+    Removes the door in Ganon's Tower that only unlocks when you defeat the rematch versions of Gohma, Kalle Demos,
+    Jalhalla, and Molgera.
+    """
+
+    display_name = "Skip Boss Rematches"
+
+
+class RemoveMusic(Toggle):
+    """
+    Mutes all ingame music.
+    """
+
+    display_name = "Remove Music"
+
+
+@dataclass
+class TWWOptions(PerGameCommonOptions):
+    """
+    A data class that encapsulates all configuration options for The Wind Waker.
+    """
+
+    start_inventory_from_pool: StartInventoryPool
+    progression_dungeons: Dungeons
+    progression_tingle_chests: TingleChests
+    progression_dungeon_secrets: DungeonSecrets
+    progression_puzzle_secret_caves: PuzzleSecretCaves
+    progression_combat_secret_caves: CombatSecretCaves
+    progression_savage_labyrinth: SavageLabyrinth
+    progression_great_fairies: GreatFairies
+    progression_short_sidequests: ShortSidequests
+    progression_long_sidequests: LongSidequests
+    progression_spoils_trading: SpoilsTrading
+    progression_minigames: Minigames
+    progression_battlesquid: Battlesquid
+    progression_free_gifts: FreeGifts
+    progression_mail: Mail
+    progression_platforms_rafts: PlatformsRafts
+    progression_submarines: Submarines
+    progression_eye_reef_chests: EyeReefChests
+    progression_big_octos_gunboats: BigOctosGunboats
+    progression_triforce_charts: TriforceCharts
+    progression_treasure_charts: TreasureCharts
+    progression_expensive_purchases: ExpensivePurchases
+    progression_island_puzzles: IslandPuzzles
+    progression_misc: Misc
+    randomize_mapcompass: RandomizeMapCompass
+    randomize_smallkeys: RandomizeSmallKeys
+    randomize_bigkeys: RandomizeBigKeys
+    sword_mode: SwordMode
+    required_bosses: RequiredBosses
+    num_required_bosses: NumRequiredBosses
+    included_dungeons: IncludedDungeons
+    excluded_dungeons: ExcludedDungeons
+    chest_type_matches_contents: ChestTypeMatchesContents
+    # trap_chests: TrapChests
+    hero_mode: HeroMode
+    logic_obscurity: LogicObscurity
+    logic_precision: LogicPrecision
+    enable_tuner_logic: EnableTunerLogic
+    randomize_dungeon_entrances: RandomizeDungeonEntrances
+    randomize_secret_cave_entrances: RandomizeSecretCavesEntrances
+    randomize_miniboss_entrances: RandomizeMinibossEntrances
+    randomize_boss_entrances: RandomizeBossEntrances
+    randomize_secret_cave_inner_entrances: RandomizeSecretCaveInnerEntrances
+    randomize_fairy_fountain_entrances: RandomizeFairyFountainEntrances
+    mix_entrances: MixEntrances
+    randomize_enemies: RandomizeEnemies
+    # randomize_music: RandomizeMusic
+    randomize_starting_island: RandomizeStartingIsland
+    randomize_charts: RandomizeCharts
+    # hoho_hints: HoHoHints
+    # fishmen_hints: FishmenHints
+    # korl_hints: KoRLHints
+    # num_item_hints: NumItemHints
+    # num_location_hints: NumLocationHints
+    # num_barren_hints: NumBarrenHints
+    # num_path_hints: NumPathHints
+    # prioritize_remote_hints: PrioritizeRemoteHints
+    swift_sail: SwiftSail
+    instant_text_boxes: InstantTextBoxes
+    reveal_full_sea_chart: RevealFullSeaChart
+    add_shortcut_warps_between_dungeons: AddShortcutWarpsBetweenDungeons
+    skip_rematch_bosses: SkipRematchBosses
+    remove_music: RemoveMusic
+    death_link: DeathLink
+
+
+tww_option_groups: list[OptionGroup] = [
+    OptionGroup(
+        "Progression Locations",
+        [
+            Dungeons,
+            DungeonSecrets,
+            TingleChests,
+            PuzzleSecretCaves,
+            CombatSecretCaves,
+            SavageLabyrinth,
+            IslandPuzzles,
+            GreatFairies,
+            Submarines,
+            PlatformsRafts,
+            ShortSidequests,
+            LongSidequests,
+            SpoilsTrading,
+            EyeReefChests,
+            BigOctosGunboats,
+            Misc,
+            Minigames,
+            Battlesquid,
+            FreeGifts,
+            Mail,
+            ExpensivePurchases,
+            TriforceCharts,
+            TreasureCharts,
+        ],
+    ),
+    OptionGroup(
+        "Item Randomizer Modes",
+        [
+            SwordMode,
+            RandomizeMapCompass,
+            RandomizeSmallKeys,
+            RandomizeBigKeys,
+            ChestTypeMatchesContents,
+            # TrapChests,
+        ],
+    ),
+    OptionGroup(
+        "Entrance Randomizer Options",
+        [
+            RandomizeDungeonEntrances,
+            RandomizeBossEntrances,
+            RandomizeMinibossEntrances,
+            RandomizeSecretCavesEntrances,
+            RandomizeSecretCaveInnerEntrances,
+            RandomizeFairyFountainEntrances,
+            MixEntrances,
+        ],
+    ),
+    OptionGroup(
+        "Other Randomizers",
+        [
+            RandomizeStartingIsland,
+            RandomizeCharts,
+            # RandomizeMusic,
+        ],
+    ),
+    OptionGroup(
+        "Convenience Tweaks",
+        [
+            SwiftSail,
+            InstantTextBoxes,
+            RevealFullSeaChart,
+            SkipRematchBosses,
+            AddShortcutWarpsBetweenDungeons,
+            RemoveMusic,
+        ],
+    ),
+    OptionGroup(
+        "Required Bosses",
+        [
+            RequiredBosses,
+            NumRequiredBosses,
+            IncludedDungeons,
+            ExcludedDungeons,
+        ],
+        start_collapsed=True,
+    ),
+    OptionGroup(
+        "Difficulty Options",
+        [
+            HeroMode,
+            LogicObscurity,
+            LogicPrecision,
+            EnableTunerLogic,
+        ],
+        start_collapsed=True,
+    ),
+    OptionGroup(
+        "Work-in-Progress Options",
+        [
+            RandomizeEnemies,
+        ],
+        start_collapsed=True,
+    ),
+]
diff --git a/worlds/tww/Presets.py b/worlds/tww/Presets.py
new file mode 100644
index 0000000000..286494262f
--- /dev/null
+++ b/worlds/tww/Presets.py
@@ -0,0 +1,138 @@
+from typing import Any
+
+tww_options_presets: dict[str, dict[str, Any]] = {
+    "Tournament S7": {
+        "progression_dungeon_secrets": True,
+        "progression_combat_secret_caves": True,
+        "progression_short_sidequests": True,
+        "progression_spoils_trading": True,
+        "progression_big_octos_gunboats": True,
+        "progression_mail": True,
+        "progression_island_puzzles": True,
+        "progression_misc": True,
+        "randomize_mapcompass": "startwith",
+        "required_bosses": True,
+        "num_required_bosses": 3,
+        "chest_type_matches_contents": True,
+        "logic_obscurity": "hard",
+        "randomize_starting_island": True,
+        "add_shortcut_warps_between_dungeons": True,
+        "start_inventory_from_pool": {
+            "Telescope": 1,
+            "Wind Waker": 1,
+            "Goddess Tingle Statue": 1,
+            "Earth Tingle Statue": 1,
+            "Wind Tingle Statue": 1,
+            "Wind's Requiem": 1,
+            "Ballad of Gales": 1,
+            "Earth God's Lyric": 1,
+            "Wind God's Aria": 1,
+            "Song of Passing": 1,
+            "Progressive Magic Meter": 2,
+        },
+        "start_location_hints": ["Ganon's Tower - Maze Chest"],
+        "exclude_locations": [
+            "Outset Island - Orca - Give 10 Knight's Crests",
+            "Outset Island - Great Fairy",
+            "Windfall Island - Chu Jelly Juice Shop - Give 15 Green Chu Jelly",
+            "Windfall Island - Mrs. Marie - Give 21 Joy Pendants",
+            "Windfall Island - Mrs. Marie - Give 40 Joy Pendants",
+            "Windfall Island - Maggie's Father - Give 20 Skull Necklaces",
+            "Dragon Roost Island - Rito Aerie - Give Hoskit 20 Golden Feathers",
+            "Fire Mountain - Big Octo",
+            "Mailbox - Letter from Hoskit's Girlfriend",
+            "Private Oasis - Big Octo",
+            "Stone Watcher Island - Cave",
+            "Overlook Island - Cave",
+            "Thorned Fairy Island - Great Fairy",
+            "Eastern Fairy Island - Great Fairy",
+            "Western Fairy Island - Great Fairy",
+            "Southern Fairy Island - Great Fairy",
+            "Northern Fairy Island - Great Fairy",
+            "Tingle Island - Big Octo",
+            "Diamond Steppe Island - Big Octo",
+            "Rock Spire Isle - Beedle's Special Shop Ship - 500 Rupee Item",
+            "Rock Spire Isle - Beedle's Special Shop Ship - 950 Rupee Item",
+            "Rock Spire Isle - Beedle's Special Shop Ship - 900 Rupee Item",
+            "Shark Island - Cave",
+            "Seven-Star Isles - Big Octo",
+        ],
+    },
+    "Miniblins 2025": {
+        "progression_great_fairies": False,
+        "progression_short_sidequests": True,
+        "progression_mail": True,
+        "progression_expensive_purchases": False,
+        "progression_island_puzzles": True,
+        "progression_misc": True,
+        "randomize_mapcompass": "startwith",
+        "required_bosses": True,
+        "num_required_bosses": 2,
+        "chest_type_matches_contents": True,
+        "randomize_starting_island": True,
+        "add_shortcut_warps_between_dungeons": True,
+        "start_inventory_from_pool": {
+            "Telescope": 1,
+            "Wind Waker": 1,
+            "Wind's Requiem": 1,
+            "Ballad of Gales": 1,
+            "Command Melody": 1,
+            "Earth God's Lyric": 1,
+            "Wind God's Aria": 1,
+            "Song of Passing": 1,
+            "Nayru's Pearl": 1,
+            "Din's Pearl": 1,
+            "Progressive Shield": 1,
+            "Progressive Magic Meter": 2,
+            "Quiver Capacity Upgrade": 1,
+            "Bomb Bag Capacity Upgrade": 1,
+            "Piece of Heart": 12,
+        },
+        "start_location_hints": ["Ganon's Tower - Maze Chest"],
+        "exclude_locations": [
+            "Outset Island - Jabun's Cave",
+            "Windfall Island - Jail - Tingle - First Gift",
+            "Windfall Island - Jail - Tingle - Second Gift",
+            "Windfall Island - Jail - Maze Chest",
+            "Windfall Island - Maggie - Delivery Reward",
+            "Windfall Island - Cafe Bar - Postman",
+            "Windfall Island - Zunari - Stock Exotic Flower in Zunari's Shop",
+            "Tingle Island - Ankle - Reward for All Tingle Statues",
+            "Horseshoe Island - Play Golf",
+        ],
+    },
+    "Mixed Pools": {
+        "progression_tingle_chests": True,
+        "progression_dungeon_secrets": True,
+        "progression_combat_secret_caves": True,
+        "progression_short_sidequests": True,
+        "progression_mail": True,
+        "progression_submarines": True,
+        "progression_expensive_purchases": False,
+        "progression_island_puzzles": True,
+        "progression_misc": True,
+        "randomize_mapcompass": "startwith",
+        "required_bosses": True,
+        "num_required_bosses": 6,
+        "chest_type_matches_contents": True,
+        "randomize_dungeon_entrances": True,
+        "randomize_secret_cave_entrances": True,
+        "randomize_miniboss_entrances": True,
+        "randomize_boss_entrances": True,
+        "randomize_secret_cave_inner_entrances": True,
+        "randomize_fairy_fountain_entrances": True,
+        "mix_entrances": "mix_pools",
+        "randomize_starting_island": True,
+        "add_shortcut_warps_between_dungeons": True,
+        "start_inventory_from_pool": {
+            "Telescope": 1,
+            "Wind Waker": 1,
+            "Wind's Requiem": 1,
+            "Ballad of Gales": 1,
+            "Earth God's Lyric": 1,
+            "Wind God's Aria": 1,
+            "Song of Passing": 1,
+        },
+        "start_location_hints": ["Ganon's Tower - Maze Chest", "Shark Island - Cave"],
+    },
+}
diff --git a/worlds/tww/Rules.py b/worlds/tww/Rules.py
new file mode 100644
index 0000000000..d4c743783c
--- /dev/null
+++ b/worlds/tww/Rules.py
@@ -0,0 +1,1414 @@
+# flake8: noqa
+
+from collections.abc import Callable
+from typing import TYPE_CHECKING
+
+from BaseClasses import MultiWorld
+from worlds.AutoWorld import LogicMixin
+from worlds.generic.Rules import set_rule
+
+from .Macros import *
+
+if TYPE_CHECKING:
+    from . import TWWWorld
+
+
+class TWWLogic(LogicMixin):
+    """
+    This class implements some of the game logic for The Wind Waker.
+
+    This class's methods reference the world's options. All methods defined in this class should be prefixed with
+    "_tww."
+    """
+
+    multiworld: MultiWorld
+
+    def _tww_has_chart_for_island(self, player: int, island_number: int) -> bool:
+        chart_item_name = self.multiworld.worlds[player].charts.island_number_to_chart_name[island_number]
+
+        if "Triforce Chart" in chart_item_name:
+            return self.has(chart_item_name, player) and has_any_wallet_upgrade(self, player)
+        else:
+            return self.has(chart_item_name, player)
+
+    def _tww_can_defeat_all_required_bosses(self, player: int) -> bool:
+        required_boss_item_locations = self.multiworld.worlds[player].boss_reqs.required_boss_item_locations
+        for loc in required_boss_item_locations:
+            if not self.can_reach_location(loc, player):
+                return False
+        return True
+
+    def _tww_rematch_bosses_skipped(self, player: int) -> bool:
+        return self.multiworld.worlds[player].logic_rematch_bosses_skipped
+
+    def _tww_in_swordless_mode(self, player: int) -> bool:
+        return self.multiworld.worlds[player].logic_in_swordless_mode
+
+    def _tww_outside_swordless_mode(self, player: int) -> bool:
+        return not self.multiworld.worlds[player].logic_in_swordless_mode
+
+    def _tww_in_required_bosses_mode(self, player: int) -> bool:
+        return self.multiworld.worlds[player].logic_in_required_bosses_mode
+
+    def _tww_outside_required_bosses_mode(self, player: int) -> bool:
+        return not self.multiworld.worlds[player].logic_in_required_bosses_mode
+
+    def _tww_obscure_1(self, player: int) -> bool:
+        return self.multiworld.worlds[player].logic_obscure_1
+
+    def _tww_obscure_2(self, player: int) -> bool:
+        return self.multiworld.worlds[player].logic_obscure_2
+
+    def _tww_obscure_3(self, player: int) -> bool:
+        return self.multiworld.worlds[player].logic_obscure_3
+
+    def _tww_precise_1(self, player: int) -> bool:
+        return self.multiworld.worlds[player].logic_precise_1
+
+    def _tww_precise_2(self, player: int) -> bool:
+        return self.multiworld.worlds[player].logic_precise_2
+
+    def _tww_precise_3(self, player: int) -> bool:
+        return self.multiworld.worlds[player].logic_precise_3
+
+    def _tww_tuner_logic_enabled(self, player: int) -> bool:
+        return self.multiworld.worlds[player].logic_tuner_logic_enabled
+
+
+def set_rules(world: "TWWWorld") -> None:  # noqa: F405
+    """
+    Define the logic rules for locations in The Wind Waker.
+    Rules are only set for locations if they are present in the world.
+
+    :param world: The Wind Waker game world.
+    """
+
+    def set_rule_if_exists(location_name: str, rule: Callable[[CollectionState], bool]) -> None:
+        if location_name in world.progress_locations:
+            set_rule(world.get_location(location_name), rule)
+
+    player = world.player
+
+    # Outset Island
+    set_rule_if_exists("Outset Island - Underneath Link's House", lambda state: True)
+    set_rule_if_exists("Outset Island - Mesa the Grasscutter's House", lambda state: True)
+    set_rule_if_exists(
+        "Outset Island - Orca - Give 10 Knight's Crests",
+        lambda state: state.has("Spoils Bag", player)
+        and can_sword_fight_with_orca(state, player)
+        and has_magic_meter(state, player)
+        and can_farm_knights_crests(state, player),
+    )
+    # set_rule_if_exists("Outset Island - Orca - Hit 500 Times", lambda state: can_sword_fight_with_orca(state, player))
+    set_rule_if_exists(
+        "Outset Island - Great Fairy", lambda state: state.can_reach_region("Outset Fairy Fountain", player)
+    )
+    set_rule_if_exists("Outset Island - Jabun's Cave", lambda state: state.has("Bombs", player))
+    set_rule_if_exists(
+        "Outset Island - Dig up Black Soil", lambda state: state.has_all(["Bait Bag", "Power Bracelets"], player)
+    )
+    set_rule_if_exists(
+        "Outset Island - Savage Labyrinth - Floor 30",
+        lambda state: can_defeat_keese(state, player)
+        and can_defeat_miniblins(state, player)
+        and can_defeat_red_chuchus(state, player)
+        and can_defeat_magtails(state, player)
+        and can_defeat_fire_keese(state, player)
+        and can_defeat_peahats(state, player)
+        and can_defeat_green_chuchus(state, player)
+        and can_defeat_boko_babas(state, player)
+        and can_defeat_mothulas(state, player)
+        and can_defeat_winged_mothulas(state, player)
+        and can_defeat_wizzrobes(state, player)
+        and can_defeat_armos(state, player)
+        and can_defeat_yellow_chuchus(state, player)
+        and can_defeat_red_bubbles(state, player)
+        and can_defeat_darknuts(state, player)
+        and can_play_winds_requiem(state, player)
+        and (state.has_any(["Grappling Hook", "Skull Hammer"], player) or has_heros_sword(state, player)),
+    )
+    set_rule_if_exists(
+        "Outset Island - Savage Labyrinth - Floor 50",
+        lambda state: can_defeat_keese(state, player)
+        and can_defeat_miniblins(state, player)
+        and can_defeat_red_chuchus(state, player)
+        and can_defeat_magtails(state, player)
+        and can_defeat_fire_keese(state, player)
+        and can_defeat_peahats(state, player)
+        and can_defeat_green_chuchus(state, player)
+        and can_defeat_boko_babas(state, player)
+        and can_defeat_mothulas(state, player)
+        and can_defeat_winged_mothulas(state, player)
+        and can_defeat_wizzrobes(state, player)
+        and can_defeat_armos(state, player)
+        and can_defeat_yellow_chuchus(state, player)
+        and can_defeat_red_bubbles(state, player)
+        and can_defeat_darknuts(state, player)
+        and can_play_winds_requiem(state, player)
+        and (state.has_any(["Grappling Hook", "Skull Hammer"], player) or has_heros_sword(state, player))
+        and can_aim_mirror_shield(state, player)
+        and can_defeat_redeads(state, player)
+        and can_defeat_blue_bubbles(state, player)
+        and can_defeat_stalfos(state, player)
+        and state.has("Skull Hammer", player),
+    )
+
+    # Windfall Island
+    set_rule_if_exists("Windfall Island - Jail - Tingle - First Gift", lambda state: True)
+    set_rule_if_exists("Windfall Island - Jail - Tingle - Second Gift", lambda state: True)
+    set_rule_if_exists("Windfall Island - Jail - Maze Chest", lambda state: True)
+    set_rule_if_exists(
+        "Windfall Island - Chu Jelly Juice Shop - Give 15 Green Chu Jelly",
+        lambda state: can_farm_green_chu_jelly(state, player),
+    )
+    set_rule_if_exists(
+        "Windfall Island - Chu Jelly Juice Shop - Give 15 Blue Chu Jelly",
+        lambda state: can_obtain_15_blue_chu_jelly(state, player),
+    )
+    set_rule_if_exists("Windfall Island - Ivan - Catch Killer Bees", lambda state: True)
+    set_rule_if_exists("Windfall Island - Mrs. Marie - Catch Killer Bees", lambda state: True)
+    set_rule_if_exists(
+        "Windfall Island - Mrs. Marie - Give 1 Joy Pendant",
+        # In Archipelago, the non-randomized Joy Pendant on Windfall is not obtainable, so require the player to have
+        # a way to collect Joy Pendants.
+        lambda state: state.has("Spoils Bag", player) and can_farm_joy_pendants(state, player),
+    )
+    set_rule_if_exists(
+        "Windfall Island - Mrs. Marie - Give 21 Joy Pendants",
+        lambda state: state.has("Spoils Bag", player) and can_farm_joy_pendants(state, player),
+    )
+    set_rule_if_exists(
+        "Windfall Island - Mrs. Marie - Give 40 Joy Pendants",
+        lambda state: state.has("Spoils Bag", player) and can_farm_joy_pendants(state, player),
+    )
+    set_rule_if_exists(
+        "Windfall Island - Lenzo's House - Left Chest",
+        lambda state: can_play_winds_requiem(state, player) and has_picto_box(state, player),
+    )
+    set_rule_if_exists(
+        "Windfall Island - Lenzo's House - Right Chest",
+        lambda state: can_play_winds_requiem(state, player) and has_picto_box(state, player),
+    )
+    set_rule_if_exists(
+        "Windfall Island - Lenzo's House - Become Lenzo's Assistant", lambda state: has_picto_box(state, player)
+    )
+    set_rule_if_exists(
+        "Windfall Island - Lenzo's House - Bring Forest Firefly",
+        lambda state: has_picto_box(state, player)
+        and state.has("Empty Bottle", player)
+        and can_access_forest_haven(state, player),
+    )
+    set_rule_if_exists("Windfall Island - House of Wealth Chest", lambda state: True)
+    set_rule_if_exists(
+        "Windfall Island - Maggie's Father - Give 20 Skull Necklaces",
+        lambda state: state.has("Spoils Bag", player) and can_farm_skull_necklaces(state, player),
+    )
+    set_rule_if_exists("Windfall Island - Maggie - Free Item", lambda state: True)
+    set_rule_if_exists(
+        "Windfall Island - Maggie - Delivery Reward",
+        lambda state: state.has_all(["Delivery Bag", "Moblin's Letter"], player),
+    )
+    set_rule_if_exists(
+        "Windfall Island - Cafe Bar - Postman", lambda state: state.has_all(["Delivery Bag", "Maggie's Letter"], player)
+    )
+    set_rule_if_exists(
+        "Windfall Island - Kreeb - Light Up Lighthouse",
+        lambda state: can_play_winds_requiem(state, player) and has_fire_arrows(state, player),
+    )
+    set_rule_if_exists(
+        "Windfall Island - Transparent Chest",
+        lambda state: can_play_winds_requiem(state, player)
+        and has_fire_arrows(state, player)
+        and (can_fly_with_deku_leaf_outdoors(state, player) or state.has("Hookshot", player)),
+    )
+    set_rule_if_exists("Windfall Island - Tott - Teach Rhythm", lambda state: state.has("Wind Waker", player))
+    set_rule_if_exists("Windfall Island - Pirate Ship", lambda state: True)
+    set_rule_if_exists("Windfall Island - 5 Rupee Auction", lambda state: True)
+    set_rule_if_exists("Windfall Island - 40 Rupee Auction", lambda state: True)
+    set_rule_if_exists("Windfall Island - 60 Rupee Auction", lambda state: True)
+    set_rule_if_exists("Windfall Island - 80 Rupee Auction", lambda state: True)
+    set_rule_if_exists(
+        "Windfall Island - Zunari - Stock Exotic Flower in Zunari's Shop",
+        lambda state: state.has("Delivery Bag", player),
+    )
+    set_rule_if_exists("Windfall Island - Sam - Decorate the Town", lambda state: state.has("Delivery Bag", player))
+    # set_rule_if_exists(
+    #     "Windfall Island - Kane - Place Shop Guru Statue on Gate", lambda state: state.has("Delivery Bag", player)
+    # )
+    # set_rule_if_exists(
+    #     "Windfall Island - Kane - Place Postman Statue on Gate", lambda state: state.has("Delivery Bag", player)
+    # )
+    # set_rule_if_exists(
+    #     "Windfall Island - Kane - Place Six Flags on Gate", lambda state: state.has("Delivery Bag", player)
+    # )
+    # set_rule_if_exists(
+    #     "Windfall Island - Kane - Place Six Idols on Gate", lambda state: state.has("Delivery Bag", player)
+    # )
+    set_rule_if_exists("Windfall Island - Mila - Follow the Thief", lambda state: True)
+    set_rule_if_exists("Windfall Island - Battlesquid - First Prize", lambda state: True)
+    set_rule_if_exists("Windfall Island - Battlesquid - Second Prize", lambda state: True)
+    set_rule_if_exists("Windfall Island - Battlesquid - Under 20 Shots Prize", lambda state: True)
+    set_rule_if_exists(
+        "Windfall Island - Pompie and Vera - Secret Meeting Photo",
+        lambda state: can_play_winds_requiem(state, player) and has_picto_box(state, player),
+    )
+    set_rule_if_exists(
+        "Windfall Island - Kamo - Full Moon Photo",
+        lambda state: has_deluxe_picto_box(state, player) and can_play_song_of_passing(state, player),
+    )
+    set_rule_if_exists(
+        "Windfall Island - Minenco - Miss Windfall Photo", lambda state: has_deluxe_picto_box(state, player)
+    )
+    set_rule_if_exists(
+        "Windfall Island - Linda and Anton",
+        lambda state: has_deluxe_picto_box(state, player) and can_play_song_of_passing(state, player),
+    )
+
+    # Dragon Roost Island
+    set_rule_if_exists("Dragon Roost Island - Wind Shrine", lambda state: state.has("Wind Waker", player))
+    set_rule_if_exists(
+        "Dragon Roost Island - Rito Aerie - Give Hoskit 20 Golden Feathers",
+        lambda state: state.has("Spoils Bag", player) and can_farm_golden_feathers(state, player),
+    )
+    set_rule_if_exists(
+        "Dragon Roost Island - Chest on Top of Boulder",
+        lambda state: state.has_any(["Boomerang", "Bombs", "Bait Bag"], player) or has_heros_bow(state, player),
+    )
+    set_rule_if_exists(
+        "Dragon Roost Island - Fly Across Platforms Around Island",
+        lambda state: can_fly_with_deku_leaf_outdoors(state, player)
+        and (can_cut_grass(state, player) or has_magic_meter_upgrade(state, player)),
+    )
+    set_rule_if_exists("Dragon Roost Island - Rito Aerie - Mail Sorting", lambda state: True)
+    set_rule_if_exists(
+        "Dragon Roost Island - Secret Cave",
+        lambda state: can_defeat_keese(state, player) and can_defeat_red_chuchus(state, player),
+    )
+
+    # Dragon Roost Cavern
+    set_rule_if_exists("Dragon Roost Cavern - First Room", lambda state: True)
+    set_rule_if_exists(
+        "Dragon Roost Cavern - Alcove With Water Jugs", lambda state: state.has("DRC Small Key", player, 1)
+    )
+    set_rule_if_exists(
+        "Dragon Roost Cavern - Water Jug on Upper Shelf", lambda state: state.has("DRC Small Key", player, 1)
+    )
+    set_rule_if_exists("Dragon Roost Cavern - Boarded Up Chest", lambda state: state.has("DRC Small Key", player, 1))
+    set_rule_if_exists(
+        "Dragon Roost Cavern - Chest Across Lava Pit",
+        lambda state: state.has("DRC Small Key", player, 2)
+        and (
+            state.has("Grappling Hook", player)
+            or can_fly_with_deku_leaf_indoors(state, player)
+            or (state.has("Hookshot", player) and state._tww_obscure_1(player))
+        ),
+    )
+    set_rule_if_exists("Dragon Roost Cavern - Rat Room", lambda state: state.has("DRC Small Key", player, 2))
+    set_rule_if_exists(
+        "Dragon Roost Cavern - Rat Room Boarded Up Chest", lambda state: state.has("DRC Small Key", player, 2)
+    )
+    set_rule_if_exists("Dragon Roost Cavern - Bird's Nest", lambda state: state.has("DRC Small Key", player, 3))
+    set_rule_if_exists("Dragon Roost Cavern - Dark Room", lambda state: state.has("DRC Small Key", player, 4))
+    set_rule_if_exists(
+        "Dragon Roost Cavern - Tingle Chest in Hub Room",
+        lambda state: state.has("DRC Small Key", player, 4) and has_tingle_bombs(state, player),
+    )
+    set_rule_if_exists(
+        "Dragon Roost Cavern - Pot on Upper Shelf in Pot Room", lambda state: state.has("DRC Small Key", player, 4)
+    )
+    set_rule_if_exists("Dragon Roost Cavern - Pot Room Chest", lambda state: state.has("DRC Small Key", player, 4))
+    set_rule_if_exists("Dragon Roost Cavern - Miniboss", lambda state: state.has("DRC Small Key", player, 4))
+    set_rule_if_exists(
+        "Dragon Roost Cavern - Under Rope Bridge",
+        lambda state: state.has("DRC Small Key", player, 4)
+        and (state.has("Grappling Hook", player) or can_fly_with_deku_leaf_outdoors(state, player)),
+    )
+    set_rule_if_exists(
+        "Dragon Roost Cavern - Tingle Statue Chest",
+        lambda state: can_reach_dragon_roost_cavern_gaping_maw(state, player)
+        and state.has("Grappling Hook", player)
+        and has_tingle_bombs(state, player),
+    )
+    set_rule_if_exists(
+        "Dragon Roost Cavern - Big Key Chest",
+        lambda state: can_reach_dragon_roost_cavern_gaping_maw(state, player)
+        and state.has("Grappling Hook", player)
+        and can_stun_magtails(state, player),
+    )
+    set_rule_if_exists(
+        "Dragon Roost Cavern - Boss Stairs Right Chest",
+        lambda state: can_reach_dragon_roost_cavern_boss_stairs(state, player),
+    )
+    set_rule_if_exists(
+        "Dragon Roost Cavern - Boss Stairs Left Chest",
+        lambda state: can_reach_dragon_roost_cavern_boss_stairs(state, player),
+    )
+    set_rule_if_exists(
+        "Dragon Roost Cavern - Boss Stairs Right Pot",
+        lambda state: can_reach_dragon_roost_cavern_boss_stairs(state, player),
+    )
+    set_rule_if_exists("Dragon Roost Cavern - Gohma Heart Container", lambda state: can_defeat_gohma(state, player))
+
+    # Forest Haven
+    set_rule_if_exists(
+        "Forest Haven - On Tree Branch",
+        lambda state: can_access_forest_haven(state, player)
+        and (
+            state.has("Grappling Hook", player)
+            or (
+                can_fly_with_deku_leaf_indoors(state, player)
+                and can_fly_with_deku_leaf_outdoors(state, player)
+                and state._tww_obscure_1(player)
+                and (
+                    (can_cut_grass(state, player) and state._tww_precise_1(player))
+                    or (has_magic_meter_upgrade(state, player) and state._tww_precise_2(player))
+                )
+            )
+        ),
+    )
+    set_rule_if_exists(
+        "Forest Haven - Small Island Chest",
+        lambda state: can_access_forest_haven(state, player)
+        and (
+            state.has("Grappling Hook", player)
+            or (
+                can_fly_with_deku_leaf_indoors(state, player)
+                and can_fly_with_deku_leaf_outdoors(state, player)
+                and state._tww_obscure_1(player)
+                and (
+                    (can_cut_grass(state, player) and state._tww_precise_1(player))
+                    or (has_magic_meter_upgrade(state, player) and state._tww_precise_2(player))
+                )
+            )
+        )
+        and can_fly_with_deku_leaf_outdoors(state, player)
+        and (can_cut_grass(state, player) or has_magic_meter_upgrade(state, player)),
+    )
+
+    # Forbidden Woods
+    set_rule_if_exists("Forbidden Woods - First Room", lambda state: True)
+    set_rule_if_exists(
+        "Forbidden Woods - Inside Hollow Tree's Mouth",
+        lambda state: (can_defeat_door_flowers(state, player) or can_defeat_boko_babas(state, player)),
+    )
+    set_rule_if_exists(
+        "Forbidden Woods - Climb to Top Using Boko Baba Bulbs",
+        lambda state: can_fly_with_deku_leaf_indoors(state, player) and can_defeat_door_flowers(state, player),
+    )
+    set_rule_if_exists(
+        "Forbidden Woods - Pot High Above Hollow Tree", lambda state: can_fly_with_deku_leaf_indoors(state, player)
+    )
+    set_rule_if_exists(
+        "Forbidden Woods - Hole in Tree",
+        lambda state: can_fly_with_deku_leaf_indoors(state, player) and can_defeat_boko_babas(state, player),
+    )
+    set_rule_if_exists(
+        "Forbidden Woods - Morth Pit",
+        lambda state: can_fly_with_deku_leaf_indoors(state, player)
+        and can_defeat_boko_babas(state, player)
+        and state.has("Grappling Hook", player),
+    )
+    set_rule_if_exists(
+        "Forbidden Woods - Vine Maze Left Chest",
+        lambda state: can_fly_with_deku_leaf_indoors(state, player)
+        and can_defeat_boko_babas(state, player)
+        and state.has("Grappling Hook", player),
+    )
+    set_rule_if_exists(
+        "Forbidden Woods - Vine Maze Right Chest",
+        lambda state: can_fly_with_deku_leaf_indoors(state, player)
+        and can_defeat_boko_babas(state, player)
+        and state.has("Grappling Hook", player),
+    )
+    set_rule_if_exists(
+        "Forbidden Woods - Highest Pot in Vine Maze",
+        lambda state: can_fly_with_deku_leaf_indoors(state, player)
+        and can_defeat_boko_babas(state, player)
+        and state.has("Grappling Hook", player),
+    )
+    set_rule_if_exists(
+        "Forbidden Woods - Tall Room Before Miniboss",
+        lambda state: can_fly_with_deku_leaf_indoors(state, player)
+        and can_defeat_boko_babas(state, player)
+        and state.has_all(["Grappling Hook", "FW Small Key"], player)
+        and (can_defeat_peahats(state, player) or state._tww_precise_2(player)),
+    )
+    set_rule_if_exists(
+        "Forbidden Woods - Mothula Miniboss Room", lambda state: can_defeat_winged_mothulas(state, player)
+    )
+    set_rule_if_exists(
+        "Forbidden Woods - Past Seeds Hanging by Vines",
+        lambda state: can_fly_with_deku_leaf_indoors(state, player)
+        and can_defeat_boko_babas(state, player)
+        and state.has_all(["Grappling Hook", "FW Small Key"], player)
+        and can_defeat_door_flowers(state, player)
+        and (can_destroy_seeds_hanging_by_vines(state, player) or state._tww_precise_1(player)),
+    )
+    set_rule_if_exists(
+        "Forbidden Woods - Chest Across Red Hanging Flower",
+        lambda state: can_fly_with_deku_leaf_indoors(state, player)
+        and can_defeat_boko_babas(state, player)
+        and state.has_all(["Grappling Hook", "Boomerang"], player),
+    )
+    set_rule_if_exists(
+        "Forbidden Woods - Tingle Statue Chest",
+        lambda state: can_fly_with_deku_leaf_indoors(state, player)
+        and state.has_all(["Grappling Hook", "Boomerang"], player),
+    )
+    set_rule_if_exists(
+        "Forbidden Woods - Chest in Locked Tree Trunk",
+        lambda state: can_fly_with_deku_leaf_indoors(state, player)
+        and can_defeat_boko_babas(state, player)
+        and state.has_all(["Grappling Hook", "Boomerang"], player),
+    )
+    set_rule_if_exists(
+        "Forbidden Woods - Big Key Chest",
+        lambda state: can_fly_with_deku_leaf_indoors(state, player)
+        and can_defeat_boko_babas(state, player)
+        and state.has_all(["Grappling Hook", "Boomerang"], player),
+    )
+    set_rule_if_exists(
+        "Forbidden Woods - Double Mothula Room",
+        lambda state: can_fly_with_deku_leaf_indoors(state, player)
+        and can_defeat_boko_babas(state, player)
+        and (can_defeat_door_flowers(state, player) or state.has("Grappling Hook", player))
+        and can_defeat_mothulas(state, player),
+    )
+    set_rule_if_exists(
+        "Forbidden Woods - Kalle Demos Heart Container", lambda state: can_defeat_kalle_demos(state, player)
+    )
+
+    # Greatfish Isle
+    set_rule_if_exists("Greatfish Isle - Hidden Chest", lambda state: can_fly_with_deku_leaf_outdoors(state, player))
+
+    # Tower of the Gods
+    set_rule_if_exists("Tower of the Gods - Chest Behind Bombable Walls", lambda state: state.has("Bombs", player))
+    set_rule_if_exists("Tower of the Gods - Pot Behind Bombable Walls", lambda state: state.has("Bombs", player))
+    set_rule_if_exists("Tower of the Gods - Hop Across Floating Boxes", lambda state: True)
+    set_rule_if_exists("Tower of the Gods - Light Two Torches", lambda state: state.has("Bombs", player))
+    set_rule_if_exists("Tower of the Gods - Skulls Room Chest", lambda state: state.has("Bombs", player))
+    set_rule_if_exists(
+        "Tower of the Gods - Shoot Eye Above Skulls Room Chest",
+        lambda state: state.has("Bombs", player) and has_heros_bow(state, player),
+    )
+    set_rule_if_exists(
+        "Tower of the Gods - Tingle Statue Chest",
+        lambda state: can_reach_tower_of_the_gods_second_floor(state, player) and has_tingle_bombs(state, player),
+    )
+    set_rule_if_exists(
+        "Tower of the Gods - First Chest Guarded by Armos Knights",
+        lambda state: can_reach_tower_of_the_gods_second_floor(state, player) and has_heros_bow(state, player),
+    )
+    set_rule_if_exists(
+        "Tower of the Gods - Stone Tablet",
+        lambda state: can_reach_tower_of_the_gods_second_floor(state, player) and state.has("Wind Waker", player),
+    )
+    set_rule_if_exists("Tower of the Gods - Darknut Miniboss Room", lambda state: can_defeat_darknuts(state, player))
+    set_rule_if_exists(
+        "Tower of the Gods - Second Chest Guarded by Armos Knights",
+        lambda state: can_reach_tower_of_the_gods_second_floor(state, player)
+        and state.has("Bombs", player)
+        and can_play_winds_requiem(state, player),
+    )
+    set_rule_if_exists(
+        "Tower of the Gods - Floating Platforms Room",
+        lambda state: can_reach_tower_of_the_gods_second_floor(state, player)
+        and (
+            has_heros_bow(state, player)
+            or (can_fly_with_deku_leaf_indoors(state, player) and state._tww_precise_1(player))
+            or (state.has("Hookshot", player) and state._tww_obscure_1(player))
+        ),
+    )
+    set_rule_if_exists(
+        "Tower of the Gods - Top of Floating Platforms Room",
+        lambda state: can_reach_tower_of_the_gods_second_floor(state, player) and has_heros_bow(state, player),
+    )
+    set_rule_if_exists(
+        "Tower of the Gods - Eastern Pot in Big Key Chest Room",
+        lambda state: can_reach_tower_of_the_gods_third_floor(state, player),
+    )
+    set_rule_if_exists(
+        "Tower of the Gods - Big Key Chest", lambda state: can_reach_tower_of_the_gods_third_floor(state, player)
+    )
+    set_rule_if_exists("Tower of the Gods - Gohdan Heart Container", lambda state: can_defeat_gohdan(state, player))
+
+    # Hyrule
+    set_rule_if_exists("Hyrule - Master Sword Chamber", lambda state: can_defeat_mighty_darknuts(state, player))
+
+    # Forsaken Fortress
+    set_rule_if_exists(
+        "Forsaken Fortress - Phantom Ganon", lambda state: can_reach_and_defeat_phantom_ganon(state, player)
+    )
+    set_rule_if_exists(
+        "Forsaken Fortress - Chest Outside Upper Jail Cell",
+        lambda state: can_get_inside_forsaken_fortress(state, player)
+        and (
+            can_fly_with_deku_leaf_indoors(state, player)
+            or state.has("Hookshot", player)
+            or state._tww_obscure_1(player)
+        ),
+    )
+    set_rule_if_exists(
+        "Forsaken Fortress - Chest Inside Lower Jail Cell",
+        lambda state: can_get_inside_forsaken_fortress(state, player),
+    )
+    set_rule_if_exists(
+        "Forsaken Fortress - Chest Guarded By Bokoblin", lambda state: can_get_inside_forsaken_fortress(state, player)
+    )
+    set_rule_if_exists(
+        "Forsaken Fortress - Chest on Bed", lambda state: can_get_inside_forsaken_fortress(state, player)
+    )
+    set_rule_if_exists(
+        "Forsaken Fortress - Helmaroc King Heart Container", lambda state: can_defeat_helmaroc_king(state, player)
+    )
+
+    # Mother and Child Isles
+    set_rule_if_exists(
+        "Mother and Child Isles - Inside Mother Isle", lambda state: can_play_ballad_of_gales(state, player)
+    )
+
+    # Fire Mountain
+    set_rule_if_exists("Fire Mountain - Cave - Chest", lambda state: can_defeat_magtails(state, player))
+    set_rule_if_exists("Fire Mountain - Lookout Platform Chest", lambda state: True)
+    set_rule_if_exists(
+        "Fire Mountain - Lookout Platform - Destroy the Cannons", lambda state: can_destroy_cannons(state, player)
+    )
+    set_rule_if_exists(
+        "Fire Mountain - Big Octo",
+        lambda state: can_defeat_big_octos(state, player) and state.has("Grappling Hook", player),
+    )
+
+    # Ice Ring Isle
+    set_rule_if_exists("Ice Ring Isle - Frozen Chest", lambda state: has_fire_arrows(state, player))
+    set_rule_if_exists("Ice Ring Isle - Cave - Chest", lambda state: True)
+    set_rule_if_exists("Ice Ring Isle - Inner Cave - Chest", lambda state: has_fire_arrows(state, player))
+
+    # Headstone Island
+    set_rule_if_exists("Headstone Island - Top of the Island", lambda state: state.has("Bait Bag", player))
+    set_rule_if_exists("Headstone Island - Submarine", lambda state: can_defeat_bombchus(state, player))
+
+    # Earth Temple
+    set_rule_if_exists(
+        "Earth Temple - Transparent Chest In Warp Pot Room", lambda state: can_play_command_melody(state, player)
+    )
+    set_rule_if_exists(
+        "Earth Temple - Behind Curtain In Warp Pot Room",
+        lambda state: can_play_command_melody(state, player)
+        and has_fire_arrows(state, player)
+        and state.has_any(["Boomerang", "Hookshot"], player),
+    )
+    set_rule_if_exists(
+        "Earth Temple - Transparent Chest in First Crypt",
+        lambda state: can_reach_earth_temple_right_path(state, player)
+        and state.has("Power Bracelets", player)
+        and (can_play_command_melody(state, player) or has_mirror_shield(state, player)),
+    )
+    set_rule_if_exists(
+        "Earth Temple - Chest Behind Destructible Walls",
+        lambda state: can_reach_earth_temple_right_path(state, player) and has_mirror_shield(state, player),
+    )
+    set_rule_if_exists(
+        "Earth Temple - Chest In Three Blocks Room",
+        lambda state: can_reach_earth_temple_left_path(state, player)
+        and has_fire_arrows(state, player)
+        and state.has("Power Bracelets", player)
+        and can_defeat_floormasters(state, player)
+        and (can_play_command_melody(state, player) or can_aim_mirror_shield(state, player)),
+    )
+    set_rule_if_exists(
+        "Earth Temple - Chest Behind Statues",
+        lambda state: can_reach_earth_temple_moblins_and_poes_room(state, player)
+        and (can_play_command_melody(state, player) or can_aim_mirror_shield(state, player)),
+    )
+    set_rule_if_exists(
+        "Earth Temple - Casket in Second Crypt",
+        lambda state: can_reach_earth_temple_moblins_and_poes_room(state, player),
+    )
+    set_rule_if_exists(
+        "Earth Temple - Stalfos Miniboss Room",
+        lambda state: can_defeat_stalfos(state, player) or state.has("Hookshot", player),
+    )
+    set_rule_if_exists(
+        "Earth Temple - Tingle Statue Chest",
+        lambda state: can_reach_earth_temple_basement(state, player) and has_tingle_bombs(state, player),
+    )
+    set_rule_if_exists(
+        "Earth Temple - End of Foggy Room With Floormasters",
+        lambda state: can_reach_earth_temple_redead_hub_room(state, player)
+        and (can_play_command_melody(state, player) or can_aim_mirror_shield(state, player)),
+    )
+    set_rule_if_exists(
+        "Earth Temple - Kill All Floormasters in Foggy Room",
+        lambda state: can_reach_earth_temple_redead_hub_room(state, player)
+        and (can_play_command_melody(state, player) or can_aim_mirror_shield(state, player))
+        and can_defeat_floormasters(state, player),
+    )
+    set_rule_if_exists(
+        "Earth Temple - Behind Curtain Next to Hammer Button",
+        lambda state: can_reach_earth_temple_redead_hub_room(state, player)
+        and (can_play_command_melody(state, player) or can_aim_mirror_shield(state, player))
+        and has_fire_arrows(state, player)
+        and state.has_any(["Boomerang", "Hookshot"], player),
+    )
+    set_rule_if_exists(
+        "Earth Temple - Chest in Third Crypt", lambda state: can_reach_earth_temple_third_crypt(state, player)
+    )
+    set_rule_if_exists(
+        "Earth Temple - Many Mirrors Room Right Chest",
+        lambda state: can_reach_earth_temple_many_mirrors_room(state, player)
+        and can_play_command_melody(state, player),
+    )
+    set_rule_if_exists(
+        "Earth Temple - Many Mirrors Room Left Chest",
+        lambda state: can_reach_earth_temple_many_mirrors_room(state, player)
+        and state.has("Power Bracelets", player)
+        and can_play_command_melody(state, player)
+        and can_aim_mirror_shield(state, player),
+    )
+    set_rule_if_exists(
+        "Earth Temple - Stalfos Crypt Room",
+        lambda state: can_reach_earth_temple_many_mirrors_room(state, player) and can_defeat_stalfos(state, player),
+    )
+    set_rule_if_exists(
+        "Earth Temple - Big Key Chest",
+        lambda state: can_reach_earth_temple_many_mirrors_room(state, player)
+        and state.has("Power Bracelets", player)
+        and can_play_command_melody(state, player)
+        and can_aim_mirror_shield(state, player)
+        and (
+            can_defeat_blue_bubbles(state, player)
+            or (has_heros_bow(state, player) and state._tww_obscure_1(player))
+            or (
+                (
+                    has_heros_sword(state, player)
+                    or has_any_master_sword(state, player)
+                    or state.has("Skull Hammer", player)
+                )
+                and state._tww_obscure_1(player)
+                and state._tww_precise_1(player)
+            )
+        )
+        and can_defeat_darknuts(state, player),
+    )
+    set_rule_if_exists("Earth Temple - Jalhalla Heart Container", lambda state: can_defeat_jalhalla(state, player))
+
+    # Wind Temple
+    set_rule_if_exists(
+        "Wind Temple - Chest Between Two Dirt Patches", lambda state: can_play_command_melody(state, player)
+    )
+    set_rule_if_exists(
+        "Wind Temple - Behind Stone Head in Hidden Upper Room",
+        lambda state: can_play_command_melody(state, player)
+        and state.has_all(["Iron Boots", "Hookshot"], player)
+        and can_fly_with_deku_leaf_indoors(state, player),
+    )
+    set_rule_if_exists(
+        "Wind Temple - Tingle Statue Chest",
+        lambda state: can_reach_wind_temple_kidnapping_room(state, player) and has_tingle_bombs(state, player),
+    )
+    set_rule_if_exists(
+        "Wind Temple - Chest Behind Stone Head",
+        lambda state: can_reach_wind_temple_kidnapping_room(state, player)
+        and state.has_all(["Iron Boots", "Hookshot"], player),
+    )
+    set_rule_if_exists(
+        "Wind Temple - Chest in Left Alcove",
+        lambda state: can_reach_wind_temple_kidnapping_room(state, player)
+        and state.has("Iron Boots", player)
+        and can_fan_with_deku_leaf(state, player),
+    )
+    set_rule_if_exists(
+        "Wind Temple - Big Key Chest",
+        lambda state: can_reach_wind_temple_kidnapping_room(state, player)
+        and state.has("Iron Boots", player)
+        and can_fan_with_deku_leaf(state, player)
+        and can_play_wind_gods_aria(state, player)
+        and can_defeat_darknuts(state, player),
+    )
+    set_rule_if_exists(
+        "Wind Temple - Chest In Many Cyclones Room",
+        lambda state: can_reach_wind_temple_kidnapping_room(state, player)
+        and (
+            (
+                state.has("Iron Boots", player)
+                and can_fan_with_deku_leaf(state, player)
+                and can_fly_with_deku_leaf_indoors(state, player)
+                and (can_cut_grass(state, player) or has_magic_meter_upgrade(state, player))
+            )
+            or (
+                state.has("Hookshot", player)
+                and can_defeat_blue_bubbles(state, player)
+                and can_fly_with_deku_leaf_indoors(state, player)
+            )
+            or (
+                state.has("Hookshot", player)
+                and can_fly_with_deku_leaf_indoors(state, player)
+                and state._tww_obscure_1(player)
+                and state._tww_precise_2(player)
+            )
+        ),
+    )
+    set_rule_if_exists(
+        "Wind Temple - Behind Stone Head in Many Cyclones Room",
+        lambda state: can_reach_end_of_wind_temple_many_cyclones_room(state, player) and state.has("Hookshot", player),
+    )
+    set_rule_if_exists(
+        "Wind Temple - Chest In Middle Of Hub Room", lambda state: can_open_wind_temple_upper_giant_grate(state, player)
+    )
+    set_rule_if_exists(
+        "Wind Temple - Spike Wall Room - First Chest",
+        lambda state: can_open_wind_temple_upper_giant_grate(state, player) and state.has("Iron Boots", player),
+    )
+    set_rule_if_exists(
+        "Wind Temple - Spike Wall Room - Destroy All Cracked Floors",
+        lambda state: can_open_wind_temple_upper_giant_grate(state, player) and state.has("Iron Boots", player),
+    )
+    set_rule_if_exists(
+        "Wind Temple - Wizzrobe Miniboss Room",
+        lambda state: can_defeat_darknuts(state, player) and can_remove_peahat_armor(state, player),
+    )
+    set_rule_if_exists(
+        "Wind Temple - Chest at Top of Hub Room", lambda state: can_activate_wind_temple_giant_fan(state, player)
+    )
+    set_rule_if_exists(
+        "Wind Temple - Chest Behind Seven Armos",
+        lambda state: can_activate_wind_temple_giant_fan(state, player) and can_defeat_armos(state, player),
+    )
+    set_rule_if_exists(
+        "Wind Temple - Kill All Enemies in Tall Basement Room",
+        lambda state: can_reach_wind_temple_tall_basement_room(state, player)
+        and can_defeat_stalfos(state, player)
+        and can_defeat_wizzrobes(state, player)
+        and can_defeat_morths(state, player),
+    )
+    set_rule_if_exists("Wind Temple - Molgera Heart Container", lambda state: can_defeat_molgera(state, player))
+
+    # Ganon's Tower
+    set_rule_if_exists(
+        "Ganon's Tower - Maze Chest",
+        lambda state: can_reach_ganons_tower_phantom_ganon_room(state, player)
+        and can_defeat_phantom_ganon(state, player),
+    )
+
+    # Mailbox
+    set_rule_if_exists(
+        "Mailbox - Letter from Hoskit's Girlfriend",
+        lambda state: state.has("Spoils Bag", player)
+        and can_farm_golden_feathers(state, player)
+        and can_play_song_of_passing(state, player),
+    )
+    set_rule_if_exists(
+        "Mailbox - Letter from Baito's Mother",
+        lambda state: state.has_all(["Delivery Bag", "Note to Mom"], player)
+        and can_play_song_of_passing(state, player),
+    )
+    set_rule_if_exists(
+        "Mailbox - Letter from Baito",
+        lambda state: state.has_all(["Delivery Bag", "Note to Mom"], player)
+        and state.can_reach_region("Jalhalla Boss Arena", player)
+        and can_defeat_jalhalla(state, player),
+    )
+    set_rule_if_exists("Mailbox - Letter from Komali's Father", lambda state: state.has("Farore's Pearl", player))
+    set_rule_if_exists("Mailbox - Letter Advertising Bombs in Beedle's Shop", lambda state: state.has("Bombs", player))
+    set_rule_if_exists(
+        "Mailbox - Letter Advertising Rock Spire Shop Ship", lambda state: has_any_wallet_upgrade(state, player)
+    )
+    # set_rule_if_exists(
+    #     "Mailbox - Beedle's Silver Membership Reward",
+    #     lambda state: (state.has_any(["Bait Bag", "Bombs", "Empty Bottle"], player) or has_heros_bow(state, player))
+    #     and can_play_song_of_passing(state, player),
+    # )
+    # set_rule_if_exists(
+    #     "Mailbox - Beedle's Gold Membership Reward",
+    #     lambda state: (state.has_any(["Bait Bag", "Bombs", "Empty Bottle"], player) or has_heros_bow(state, player))
+    #     and can_play_song_of_passing(state, player),
+    # )
+    set_rule_if_exists(
+        "Mailbox - Letter from Orca",
+        lambda state: state.can_reach_region("Kalle Demos Boss Arena", player)
+        and can_defeat_kalle_demos(state, player),
+    )
+    set_rule_if_exists(
+        "Mailbox - Letter from Grandma",
+        lambda state: state.has("Empty Bottle", player) and can_play_song_of_passing(state, player),
+    )
+    set_rule_if_exists(
+        "Mailbox - Letter from Aryll",
+        lambda state: state.can_reach_region("Helmaroc King Boss Arena", player)
+        and can_defeat_helmaroc_king(state, player)
+        and can_play_song_of_passing(state, player),
+    )
+    set_rule_if_exists(
+        "Mailbox - Letter from Tingle",
+        lambda state: has_any_wallet_upgrade(state, player)
+        and state.can_reach_region("Helmaroc King Boss Arena", player)
+        and can_defeat_helmaroc_king(state, player)
+        and can_play_song_of_passing(state, player),
+    )
+
+    # The Great Sea
+    set_rule_if_exists("The Great Sea - Beedle's Shop Ship - 20 Rupee Item", lambda state: True)
+    set_rule_if_exists("The Great Sea - Salvage Corp Gift", lambda state: True)
+    set_rule_if_exists("The Great Sea - Cyclos", lambda state: has_heros_bow(state, player))
+    set_rule_if_exists("The Great Sea - Goron Trading Reward", lambda state: state.has("Delivery Bag", player))
+    set_rule_if_exists(
+        "The Great Sea - Withered Trees",
+        lambda state: can_access_forest_haven(state, player)
+        and state.has("Empty Bottle", player)
+        and can_play_ballad_of_gales(state, player)
+        and state.can_reach_region("Cliff Plateau Isles Inner Cave", player),
+    )
+    set_rule_if_exists(
+        "The Great Sea - Ghost Ship",
+        lambda state: state.has("Ghost Ship Chart", player)
+        and can_play_ballad_of_gales(state, player)
+        and can_defeat_wizzrobes(state, player)
+        and can_defeat_redeads(state, player)
+        and can_defeat_stalfos(state, player),
+    )
+
+    # Private Oasis
+    set_rule_if_exists(
+        "Private Oasis - Chest at Top of Waterfall",
+        lambda state: state.has("Hookshot", player) or can_fly_with_deku_leaf_outdoors(state, player),
+    )
+    set_rule_if_exists(
+        "Private Oasis - Cabana Labyrinth - Lower Floor Chest", lambda state: state.has("Skull Hammer", player)
+    )
+    set_rule_if_exists(
+        "Private Oasis - Cabana Labyrinth - Upper Floor Chest",
+        lambda state: state.has("Skull Hammer", player) and can_play_winds_requiem(state, player),
+    )
+    set_rule_if_exists(
+        "Private Oasis - Big Octo",
+        lambda state: can_defeat_big_octos(state, player) and state.has("Grappling Hook", player),
+    )
+
+    # Spectacle Island
+    set_rule_if_exists("Spectacle Island - Barrel Shooting - First Prize", lambda state: True)
+    set_rule_if_exists("Spectacle Island - Barrel Shooting - Second Prize", lambda state: True)
+
+    # Needle Rock Isle
+    set_rule_if_exists("Needle Rock Isle - Chest", lambda state: state.has("Bait Bag", player))
+    set_rule_if_exists("Needle Rock Isle - Cave", lambda state: has_fire_arrows(state, player))
+    set_rule_if_exists(
+        "Needle Rock Isle - Golden Gunboat", lambda state: state.has_all(["Bombs", "Grappling Hook"], player)
+    )
+
+    # Angular Isles
+    set_rule_if_exists("Angular Isles - Peak", lambda state: True)
+    set_rule_if_exists(
+        "Angular Isles - Cave",
+        lambda state: can_aim_mirror_shield(state, player)
+        and (can_fly_with_deku_leaf_indoors(state, player) or state.has("Hookshot", player)),
+    )
+
+    # Boating Course
+    set_rule_if_exists("Boating Course - Raft", lambda state: True)
+    set_rule_if_exists(
+        "Boating Course - Cave",
+        lambda state: can_hit_diamond_switches_at_range(state, player)
+        and (can_defeat_miniblins_easily(state, player) or state._tww_precise_2(player)),
+    )
+
+    # Stone Watcher Island
+    set_rule_if_exists(
+        "Stone Watcher Island - Cave",
+        lambda state: can_defeat_armos(state, player)
+        and can_defeat_wizzrobes(state, player)
+        and can_defeat_darknuts(state, player)
+        and can_play_winds_requiem(state, player),
+    )
+    set_rule_if_exists("Stone Watcher Island - Lookout Platform Chest", lambda state: True)
+    set_rule_if_exists(
+        "Stone Watcher Island - Lookout Platform - Destroy the Cannons",
+        lambda state: can_destroy_cannons(state, player),
+    )
+
+    # Islet of Steel
+    set_rule_if_exists(
+        "Islet of Steel - Interior", lambda state: state.has("Bombs", player) and can_play_winds_requiem(state, player)
+    )
+    set_rule_if_exists(
+        "Islet of Steel - Lookout Platform - Defeat the Enemies",
+        lambda state: can_defeat_wizzrobes_at_range(state, player),
+    )
+
+    # Overlook Island
+    set_rule_if_exists(
+        "Overlook Island - Cave",
+        lambda state: can_defeat_stalfos(state, player)
+        and can_defeat_wizzrobes(state, player)
+        and can_defeat_red_chuchus(state, player)
+        and can_defeat_green_chuchus(state, player)
+        and can_defeat_keese(state, player)
+        and can_defeat_fire_keese(state, player)
+        and can_defeat_morths(state, player)
+        and can_defeat_kargarocs(state, player)
+        and can_defeat_darknuts(state, player)
+        and can_play_winds_requiem(state, player),
+    )
+
+    # Bird's Peak Rock
+    set_rule_if_exists("Bird's Peak Rock - Cave", lambda state: can_play_winds_requiem(state, player))
+
+    # Pawprint Isle
+    set_rule_if_exists("Pawprint Isle - Chuchu Cave - Chest", lambda state: True)
+    set_rule_if_exists(
+        "Pawprint Isle - Chuchu Cave - Behind Left Boulder", lambda state: can_move_boulders(state, player)
+    )
+    set_rule_if_exists(
+        "Pawprint Isle - Chuchu Cave - Behind Right Boulder", lambda state: can_move_boulders(state, player)
+    )
+    set_rule_if_exists(
+        "Pawprint Isle - Chuchu Cave - Scale the Wall", lambda state: state.has("Grappling Hook", player)
+    )
+    set_rule_if_exists(
+        "Pawprint Isle - Wizzrobe Cave",
+        lambda state: can_defeat_wizzrobes_at_range(state, player)
+        and can_defeat_fire_keese(state, player)
+        and can_defeat_magtails(state, player)
+        and can_defeat_red_chuchus(state, player)
+        and can_defeat_green_chuchus(state, player)
+        and can_defeat_yellow_chuchus(state, player)
+        and can_defeat_red_bubbles(state, player)
+        and can_remove_peahat_armor(state, player),
+    )
+    set_rule_if_exists("Pawprint Isle - Lookout Platform - Defeat the Enemies", lambda state: True)
+
+    # Thorned Fairy Island
+    set_rule_if_exists("Thorned Fairy Island - Great Fairy", lambda state: True)
+    set_rule_if_exists(
+        "Thorned Fairy Island - Northeastern Lookout Platform - Destroy the Cannons",
+        lambda state: can_destroy_cannons(state, player),
+    )
+    set_rule_if_exists(
+        "Thorned Fairy Island - Southwestern Lookout Platform - Defeat the Enemies",
+        lambda state: can_fly_with_deku_leaf_outdoors(state, player),
+    )
+
+    # Eastern Fairy Island
+    set_rule_if_exists("Eastern Fairy Island - Great Fairy", lambda state: True)
+    set_rule_if_exists(
+        "Eastern Fairy Island - Lookout Platform - Defeat the Cannons and Enemies",
+        lambda state: can_destroy_cannons(state, player),
+    )
+
+    # Western Fairy Island
+    set_rule_if_exists("Western Fairy Island - Great Fairy", lambda state: True)
+    set_rule_if_exists("Western Fairy Island - Lookout Platform", lambda state: True)
+
+    # Southern Fairy Island
+    set_rule_if_exists("Southern Fairy Island - Great Fairy", lambda state: True)
+    set_rule_if_exists(
+        "Southern Fairy Island - Lookout Platform - Destroy the Northwest Cannons",
+        lambda state: can_destroy_cannons(state, player) and can_fly_with_deku_leaf_outdoors(state, player),
+    )
+    set_rule_if_exists(
+        "Southern Fairy Island - Lookout Platform - Destroy the Southeast Cannons",
+        lambda state: can_destroy_cannons(state, player) and can_fly_with_deku_leaf_outdoors(state, player),
+    )
+
+    # Northern Fairy Island
+    set_rule_if_exists("Northern Fairy Island - Great Fairy", lambda state: True)
+    set_rule_if_exists("Northern Fairy Island - Submarine", lambda state: True)
+
+    # Tingle Island
+    set_rule_if_exists(
+        "Tingle Island - Ankle - Reward for All Tingle Statues",
+        lambda state: state.has_group_unique("Tingle Statues", player, 5),
+    )
+    set_rule_if_exists(
+        "Tingle Island - Big Octo",
+        lambda state: can_defeat_12_eye_big_octos(state, player) and state.has("Grappling Hook", player),
+    )
+
+    # Diamond Steppe Island
+    set_rule_if_exists("Diamond Steppe Island - Warp Maze Cave - First Chest", lambda state: True)
+    set_rule_if_exists("Diamond Steppe Island - Warp Maze Cave - Second Chest", lambda state: True)
+    set_rule_if_exists(
+        "Diamond Steppe Island - Big Octo",
+        lambda state: can_defeat_big_octos(state, player) and state.has("Grappling Hook", player),
+    )
+
+    # Bomb Island
+    set_rule_if_exists("Bomb Island - Cave", lambda state: can_stun_magtails(state, player))
+    set_rule_if_exists("Bomb Island - Lookout Platform - Defeat the Enemies", lambda state: True)
+    set_rule_if_exists("Bomb Island - Submarine", lambda state: True)
+
+    # Rock Spire Isle
+    set_rule_if_exists("Rock Spire Isle - Cave", lambda state: True)
+    set_rule_if_exists(
+        "Rock Spire Isle - Beedle's Special Shop Ship - 500 Rupee Item",
+        lambda state: has_any_wallet_upgrade(state, player),
+    )
+    set_rule_if_exists(
+        "Rock Spire Isle - Beedle's Special Shop Ship - 950 Rupee Item",
+        lambda state: has_any_wallet_upgrade(state, player),
+    )
+    set_rule_if_exists(
+        "Rock Spire Isle - Beedle's Special Shop Ship - 900 Rupee Item",
+        lambda state: has_any_wallet_upgrade(state, player),
+    )
+    set_rule_if_exists(
+        "Rock Spire Isle - Western Lookout Platform - Destroy the Cannons",
+        lambda state: can_destroy_cannons(state, player) and can_fly_with_deku_leaf_outdoors(state, player),
+    )
+    set_rule_if_exists(
+        "Rock Spire Isle - Eastern Lookout Platform - Destroy the Cannons",
+        lambda state: can_destroy_cannons(state, player) and can_fly_with_deku_leaf_outdoors(state, player),
+    )
+    set_rule_if_exists("Rock Spire Isle - Center Lookout Platform", lambda state: True)
+    set_rule_if_exists(
+        "Rock Spire Isle - Southeast Gunboat", lambda state: state.has_all(["Bombs", "Grappling Hook"], player)
+    )
+
+    # Shark Island
+    set_rule_if_exists("Shark Island - Cave", lambda state: can_defeat_miniblins(state, player))
+
+    # Cliff Plateau Isles
+    set_rule_if_exists(
+        "Cliff Plateau Isles - Cave",
+        lambda state: can_defeat_boko_babas(state, player)
+        or (state.has("Grappling Hook", player) and state._tww_obscure_1(player) and state._tww_precise_1(player)),
+    )
+    set_rule_if_exists("Cliff Plateau Isles - Highest Isle", lambda state: True)
+    set_rule_if_exists("Cliff Plateau Isles - Lookout Platform", lambda state: True)
+
+    # Crescent Moon Island
+    set_rule_if_exists("Crescent Moon Island - Chest", lambda state: True)
+    set_rule_if_exists("Crescent Moon Island - Submarine", lambda state: can_defeat_miniblins(state, player))
+
+    # Horseshoe Island
+    set_rule_if_exists(
+        "Horseshoe Island - Play Golf",
+        lambda state: can_fan_with_deku_leaf(state, player)
+        and (can_fly_with_deku_leaf_outdoors(state, player) or state.has("Hookshot", player)),
+    )
+    set_rule_if_exists(
+        "Horseshoe Island - Cave",
+        lambda state: can_defeat_mothulas(state, player) and can_defeat_winged_mothulas(state, player),
+    )
+    set_rule_if_exists("Horseshoe Island - Northwestern Lookout Platform", lambda state: True)
+    set_rule_if_exists("Horseshoe Island - Southeastern Lookout Platform", lambda state: True)
+
+    # Flight Control Platform
+    set_rule_if_exists(
+        "Flight Control Platform - Bird-Man Contest - First Prize",
+        lambda state: can_fly_with_deku_leaf_outdoors(state, player) and has_magic_meter_upgrade(state, player),
+    )
+    set_rule_if_exists(
+        "Flight Control Platform - Submarine",
+        lambda state: can_defeat_wizzrobes(state, player)
+        and can_defeat_red_chuchus(state, player)
+        and can_defeat_green_chuchus(state, player)
+        and can_defeat_miniblins(state, player)
+        and can_defeat_wizzrobes_at_range(state, player),
+    )
+
+    # Star Island
+    set_rule_if_exists("Star Island - Cave", lambda state: can_defeat_magtails(state, player))
+    set_rule_if_exists("Star Island - Lookout Platform", lambda state: True)
+
+    # Star Belt Archipelago
+    set_rule_if_exists("Star Belt Archipelago - Lookout Platform", lambda state: True)
+
+    # Five-Star Isles
+    set_rule_if_exists(
+        "Five-Star Isles - Lookout Platform - Destroy the Cannons", lambda state: can_destroy_cannons(state, player)
+    )
+    set_rule_if_exists("Five-Star Isles - Raft", lambda state: True)
+    set_rule_if_exists("Five-Star Isles - Submarine", lambda state: True)
+
+    # Seven-Star Isles
+    set_rule_if_exists("Seven-Star Isles - Center Lookout Platform", lambda state: True)
+    set_rule_if_exists("Seven-Star Isles - Northern Lookout Platform", lambda state: True)
+    set_rule_if_exists(
+        "Seven-Star Isles - Southern Lookout Platform", lambda state: can_defeat_wizzrobes_at_range(state, player)
+    )
+    set_rule_if_exists(
+        "Seven-Star Isles - Big Octo",
+        lambda state: can_defeat_12_eye_big_octos(state, player) and state.has("Grappling Hook", player),
+    )
+
+    # Cyclops Reef
+    set_rule_if_exists(
+        "Cyclops Reef - Destroy the Cannons and Gunboats",
+        lambda state: state.has("Bombs", player) and can_fly_with_deku_leaf_outdoors(state, player),
+    )
+    set_rule_if_exists("Cyclops Reef - Lookout Platform - Defeat the Enemies", lambda state: True)
+
+    # Two-Eye Reef
+    set_rule_if_exists(
+        "Two-Eye Reef - Destroy the Cannons and Gunboats",
+        lambda state: state.has("Bombs", player) and can_fly_with_deku_leaf_outdoors(state, player),
+    )
+    set_rule_if_exists("Two-Eye Reef - Lookout Platform", lambda state: True)
+    set_rule_if_exists("Two-Eye Reef - Big Octo Great Fairy", lambda state: can_defeat_big_octos(state, player))
+
+    # Three-Eye Reef
+    set_rule_if_exists(
+        "Three-Eye Reef - Destroy the Cannons and Gunboats",
+        lambda state: state.has("Bombs", player) and can_fly_with_deku_leaf_outdoors(state, player),
+    )
+
+    # Four-Eye Reef
+    set_rule_if_exists(
+        "Four-Eye Reef - Destroy the Cannons and Gunboats",
+        lambda state: state.has("Bombs", player) and can_fly_with_deku_leaf_outdoors(state, player),
+    )
+
+    # Five-Eye Reef
+    set_rule_if_exists(
+        "Five-Eye Reef - Destroy the Cannons",
+        lambda state: can_destroy_cannons(state, player) and can_fly_with_deku_leaf_outdoors(state, player),
+    )
+    set_rule_if_exists("Five-Eye Reef - Lookout Platform", lambda state: True)
+
+    # Six-Eye Reef
+    set_rule_if_exists(
+        "Six-Eye Reef - Destroy the Cannons and Gunboats",
+        lambda state: state.has("Bombs", player) and can_fly_with_deku_leaf_outdoors(state, player),
+    )
+    set_rule_if_exists(
+        "Six-Eye Reef - Lookout Platform - Destroy the Cannons", lambda state: can_destroy_cannons(state, player)
+    )
+    set_rule_if_exists("Six-Eye Reef - Submarine", lambda state: True)
+
+    # Sunken Treasure
+    set_rule_if_exists(
+        "Forsaken Fortress Sector - Sunken Treasure",
+        lambda state: state.has("Grappling Hook", player) and state._tww_has_chart_for_island(player, 1),
+    )
+    set_rule_if_exists(
+        "Star Island - Sunken Treasure",
+        lambda state: state.has("Grappling Hook", player) and state._tww_has_chart_for_island(player, 2),
+    )
+    set_rule_if_exists(
+        "Northern Fairy Island - Sunken Treasure",
+        lambda state: state.has("Grappling Hook", player) and state._tww_has_chart_for_island(player, 3),
+    )
+    set_rule_if_exists(
+        "Gale Isle - Sunken Treasure",
+        lambda state: state.has("Grappling Hook", player) and state._tww_has_chart_for_island(player, 4),
+    )
+    set_rule_if_exists(
+        "Crescent Moon Island - Sunken Treasure",
+        lambda state: state.has("Grappling Hook", player) and state._tww_has_chart_for_island(player, 5),
+    )
+    set_rule_if_exists(
+        "Seven-Star Isles - Sunken Treasure",
+        lambda state: state.has("Grappling Hook", player)
+        and state._tww_has_chart_for_island(player, 6)
+        and (state.has("Bombs", player) or state._tww_precise_1(player)),
+    )
+    set_rule_if_exists(
+        "Overlook Island - Sunken Treasure",
+        lambda state: state.has("Grappling Hook", player) and state._tww_has_chart_for_island(player, 7),
+    )
+    set_rule_if_exists(
+        "Four-Eye Reef - Sunken Treasure",
+        lambda state: state.has("Grappling Hook", player)
+        and state._tww_has_chart_for_island(player, 8)
+        and (
+            state.has("Bombs", player)
+            or state._tww_precise_1(player)
+            or (can_use_magic_armor(state, player) and state._tww_obscure_1(player))
+        ),
+    )
+    set_rule_if_exists(
+        "Mother and Child Isles - Sunken Treasure",
+        lambda state: state.has("Grappling Hook", player) and state._tww_has_chart_for_island(player, 9),
+    )
+    set_rule_if_exists(
+        "Spectacle Island - Sunken Treasure",
+        lambda state: state.has("Grappling Hook", player) and state._tww_has_chart_for_island(player, 10),
+    )
+    set_rule_if_exists(
+        "Windfall Island - Sunken Treasure",
+        lambda state: state.has("Grappling Hook", player) and state._tww_has_chart_for_island(player, 11),
+    )
+    set_rule_if_exists(
+        "Pawprint Isle - Sunken Treasure",
+        lambda state: state.has("Grappling Hook", player) and state._tww_has_chart_for_island(player, 12),
+    )
+    set_rule_if_exists(
+        "Dragon Roost Island - Sunken Treasure",
+        lambda state: state.has("Grappling Hook", player) and state._tww_has_chart_for_island(player, 13),
+    )
+    set_rule_if_exists(
+        "Flight Control Platform - Sunken Treasure",
+        lambda state: state.has("Grappling Hook", player) and state._tww_has_chart_for_island(player, 14),
+    )
+    set_rule_if_exists(
+        "Western Fairy Island - Sunken Treasure",
+        lambda state: state.has("Grappling Hook", player) and state._tww_has_chart_for_island(player, 15),
+    )
+    set_rule_if_exists(
+        "Rock Spire Isle - Sunken Treasure",
+        lambda state: state.has("Grappling Hook", player) and state._tww_has_chart_for_island(player, 16),
+    )
+    set_rule_if_exists(
+        "Tingle Island - Sunken Treasure",
+        lambda state: state.has("Grappling Hook", player) and state._tww_has_chart_for_island(player, 17),
+    )
+    set_rule_if_exists(
+        "Northern Triangle Island - Sunken Treasure",
+        lambda state: state.has("Grappling Hook", player) and state._tww_has_chart_for_island(player, 18),
+    )
+    set_rule_if_exists(
+        "Eastern Fairy Island - Sunken Treasure",
+        lambda state: state.has("Grappling Hook", player) and state._tww_has_chart_for_island(player, 19),
+    )
+    set_rule_if_exists(
+        "Fire Mountain - Sunken Treasure",
+        lambda state: state.has("Grappling Hook", player) and state._tww_has_chart_for_island(player, 20),
+    )
+    set_rule_if_exists(
+        "Star Belt Archipelago - Sunken Treasure",
+        lambda state: state.has("Grappling Hook", player) and state._tww_has_chart_for_island(player, 21),
+    )
+    set_rule_if_exists(
+        "Three-Eye Reef - Sunken Treasure",
+        lambda state: state.has("Grappling Hook", player)
+        and state._tww_has_chart_for_island(player, 22)
+        and (
+            state.has("Bombs", player)
+            or state._tww_precise_1(player)
+            or (can_use_magic_armor(state, player) and state._tww_obscure_1(player))
+        ),
+    )
+    set_rule_if_exists(
+        "Greatfish Isle - Sunken Treasure",
+        lambda state: state.has("Grappling Hook", player) and state._tww_has_chart_for_island(player, 23),
+    )
+    set_rule_if_exists(
+        "Cyclops Reef - Sunken Treasure",
+        lambda state: state.has("Grappling Hook", player)
+        and state._tww_has_chart_for_island(player, 24)
+        and (
+            state.has("Bombs", player)
+            or state._tww_precise_1(player)
+            or (can_use_magic_armor(state, player) and state._tww_obscure_1(player))
+        ),
+    )
+    set_rule_if_exists(
+        "Six-Eye Reef - Sunken Treasure",
+        lambda state: state.has("Grappling Hook", player)
+        and state._tww_has_chart_for_island(player, 25)
+        and (
+            state.has("Bombs", player)
+            or state._tww_precise_1(player)
+            or (can_use_magic_armor(state, player) and state._tww_obscure_1(player))
+        ),
+    )
+    set_rule_if_exists(
+        "Tower of the Gods Sector - Sunken Treasure",
+        lambda state: state.has("Grappling Hook", player) and state._tww_has_chart_for_island(player, 26),
+    )
+    set_rule_if_exists(
+        "Eastern Triangle Island - Sunken Treasure",
+        lambda state: state.has("Grappling Hook", player) and state._tww_has_chart_for_island(player, 27),
+    )
+    set_rule_if_exists(
+        "Thorned Fairy Island - Sunken Treasure",
+        lambda state: state.has("Grappling Hook", player) and state._tww_has_chart_for_island(player, 28),
+    )
+    set_rule_if_exists(
+        "Needle Rock Isle - Sunken Treasure",
+        lambda state: state.has("Grappling Hook", player) and state._tww_has_chart_for_island(player, 29),
+    )
+    set_rule_if_exists(
+        "Islet of Steel - Sunken Treasure",
+        lambda state: state.has("Grappling Hook", player) and state._tww_has_chart_for_island(player, 30),
+    )
+    set_rule_if_exists(
+        "Stone Watcher Island - Sunken Treasure",
+        lambda state: state.has("Grappling Hook", player) and state._tww_has_chart_for_island(player, 31),
+    )
+    set_rule_if_exists(
+        "Southern Triangle Island - Sunken Treasure",
+        lambda state: state.has("Grappling Hook", player)
+        and state._tww_has_chart_for_island(player, 32)
+        and (can_defeat_seahats(state, player) or state._tww_precise_1(player)),
+    )
+    set_rule_if_exists(
+        "Private Oasis - Sunken Treasure",
+        lambda state: state.has("Grappling Hook", player) and state._tww_has_chart_for_island(player, 33),
+    )
+    set_rule_if_exists(
+        "Bomb Island - Sunken Treasure",
+        lambda state: state.has("Grappling Hook", player) and state._tww_has_chart_for_island(player, 34),
+    )
+    set_rule_if_exists(
+        "Bird's Peak Rock - Sunken Treasure",
+        lambda state: state.has("Grappling Hook", player) and state._tww_has_chart_for_island(player, 35),
+    )
+    set_rule_if_exists(
+        "Diamond Steppe Island - Sunken Treasure",
+        lambda state: state.has("Grappling Hook", player) and state._tww_has_chart_for_island(player, 36),
+    )
+    set_rule_if_exists(
+        "Five-Eye Reef - Sunken Treasure",
+        lambda state: state.has("Grappling Hook", player)
+        and state._tww_has_chart_for_island(player, 37)
+        and can_destroy_cannons(state, player),
+    )
+    set_rule_if_exists(
+        "Shark Island - Sunken Treasure",
+        lambda state: state.has("Grappling Hook", player) and state._tww_has_chart_for_island(player, 38),
+    )
+    set_rule_if_exists(
+        "Southern Fairy Island - Sunken Treasure",
+        lambda state: state.has("Grappling Hook", player) and state._tww_has_chart_for_island(player, 39),
+    )
+    set_rule_if_exists(
+        "Ice Ring Isle - Sunken Treasure",
+        lambda state: state.has("Grappling Hook", player) and state._tww_has_chart_for_island(player, 40),
+    )
+    set_rule_if_exists(
+        "Forest Haven - Sunken Treasure",
+        lambda state: state.has("Grappling Hook", player) and state._tww_has_chart_for_island(player, 41),
+    )
+    set_rule_if_exists(
+        "Cliff Plateau Isles - Sunken Treasure",
+        lambda state: state.has("Grappling Hook", player) and state._tww_has_chart_for_island(player, 42),
+    )
+    set_rule_if_exists(
+        "Horseshoe Island - Sunken Treasure",
+        lambda state: state.has("Grappling Hook", player) and state._tww_has_chart_for_island(player, 43),
+    )
+    set_rule_if_exists(
+        "Outset Island - Sunken Treasure",
+        lambda state: state.has("Grappling Hook", player) and state._tww_has_chart_for_island(player, 44),
+    )
+    set_rule_if_exists(
+        "Headstone Island - Sunken Treasure",
+        lambda state: state.has("Grappling Hook", player) and state._tww_has_chart_for_island(player, 45),
+    )
+    set_rule_if_exists(
+        "Two-Eye Reef - Sunken Treasure",
+        lambda state: state.has("Grappling Hook", player)
+        and state._tww_has_chart_for_island(player, 46)
+        and (
+            state.has("Bombs", player)
+            or state._tww_precise_1(player)
+            or (can_use_magic_armor(state, player) and state._tww_obscure_1(player))
+        ),
+    )
+    set_rule_if_exists(
+        "Angular Isles - Sunken Treasure",
+        lambda state: state.has("Grappling Hook", player) and state._tww_has_chart_for_island(player, 47),
+    )
+    set_rule_if_exists(
+        "Boating Course - Sunken Treasure",
+        lambda state: state.has("Grappling Hook", player) and state._tww_has_chart_for_island(player, 48),
+    )
+    set_rule_if_exists(
+        "Five-Star Isles - Sunken Treasure",
+        lambda state: state.has("Grappling Hook", player) and state._tww_has_chart_for_island(player, 49),
+    )
+
+    set_rule_if_exists("Defeat Ganondorf", lambda state: can_reach_and_defeat_ganondorf(state, player))
+
+    world.multiworld.completion_condition[player] = lambda state: state.has("Victory", player)
diff --git a/worlds/tww/TWWClient.py b/worlds/tww/TWWClient.py
new file mode 100644
index 0000000000..84173659f5
--- /dev/null
+++ b/worlds/tww/TWWClient.py
@@ -0,0 +1,739 @@
+import asyncio
+import time
+import traceback
+from typing import TYPE_CHECKING, Any, Optional
+
+import dolphin_memory_engine
+
+import Utils
+from CommonClient import ClientCommandProcessor, CommonContext, get_base_parser, gui_enabled, logger, server_loop
+from NetUtils import ClientStatus
+
+from .Items import ITEM_TABLE, LOOKUP_ID_TO_NAME
+from .Locations import ISLAND_NAME_TO_SALVAGE_BIT, LOCATION_TABLE, TWWLocation, TWWLocationData, TWWLocationType
+from .randomizers.Charts import ISLAND_NUMBER_TO_NAME
+
+if TYPE_CHECKING:
+    import kvui
+
+CONNECTION_REFUSED_GAME_STATUS = (
+    "Dolphin failed to connect. Please load a randomized ROM for The Wind Waker. Trying again in 5 seconds..."
+)
+CONNECTION_REFUSED_SAVE_STATUS = (
+    "Dolphin failed to connect. Please load into the save file. Trying again in 5 seconds..."
+)
+CONNECTION_LOST_STATUS = (
+    "Dolphin connection was lost. Please restart your emulator and make sure The Wind Waker is running."
+)
+CONNECTION_CONNECTED_STATUS = "Dolphin connected successfully."
+CONNECTION_INITIAL_STATUS = "Dolphin connection has not been initiated."
+
+
+# This address is used to check/set the player's health for DeathLink.
+CURR_HEALTH_ADDR = 0x803C4C0A
+
+# These addresses are used for the Moblin's Letter check.
+LETTER_BASE_ADDR = 0x803C4C8E
+LETTER_OWND_ADDR = 0x803C4C98
+
+# These addresses are used to check flags for locations.
+CHARTS_BITFLD_ADDR = 0x803C4CFC
+BASE_CHESTS_BITFLD_ADDR = 0x803C4F88
+BASE_SWITCHES_BITFLD_ADDR = 0x803C4F8C
+BASE_PICKUPS_BITFLD_ADDR = 0x803C4F9C
+CURR_STAGE_CHESTS_BITFLD_ADDR = 0x803C5380
+CURR_STAGE_SWITCHES_BITFLD_ADDR = 0x803C5384
+CURR_STAGE_PICKUPS_BITFLD_ADDR = 0x803C5394
+
+# The expected index for the following item that should be received. Uses event bits 0x60 and 0x61.
+EXPECTED_INDEX_ADDR = 0x803C528C
+
+# These bytes contain whether the player has been rewarded for finding a particular Tingle statue.
+TINGLE_STATUE_1_ADDR = 0x803C523E  # 0x40 is the bit for the Dragon Tingle statue.
+TINGLE_STATUE_2_ADDR = 0x803C5249  # 0x0F are the bits for the remaining Tingle statues.
+
+# This address contains the current stage ID.
+CURR_STAGE_ID_ADDR = 0x803C53A4
+
+# This address is used to check the stage name to verify that the player is in-game before sending items.
+CURR_STAGE_NAME_ADDR = 0x803C9D3C
+
+# This is an array of length 0x10 where each element is a byte and contains item IDs for items to give the player.
+# 0xFF represents no item. The array is read and cleared every frame.
+GIVE_ITEM_ARRAY_ADDR = 0x803FE87C
+
+# This is the address that holds the player's slot name.
+# This way, the player does not have to manually authenticate their slot name.
+SLOT_NAME_ADDR = 0x803FE8A0
+
+# This address is the start of an array that we use to inform us of which charts lead where.
+# The array is of length 49, and each element is two bytes. The index represents the chart's original destination, and
+# the value represents the new destination.
+# The chart name is inferrable from the chart's original destination.
+CHARTS_MAPPING_ADDR = 0x803FE8E0
+
+# This address contains the most recent spawn ID from which the player spawned.
+MOST_RECENT_SPAWN_ID_ADDR = 0x803C9D44
+
+# This address contains the most recent room number the player spawned in.
+MOST_RECENT_ROOM_NUMBER_ADDR = 0x803C9D46
+
+# Values used to detect exiting onto the highest isle in Cliff Plateau Isles.
+# 42. Starting at 1 and going left to right, top to bottom, Cliff Plateau Isles is the 42nd square in the sea stage.
+CLIFF_PLATEAU_ISLES_ROOM_NUMBER = 0x2A
+CLIFF_PLATEAU_ISLES_HIGHEST_ISLE_SPAWN_ID = 1  # As a note, the lower isle's spawn ID is 2.
+# The dummy stage name used to identify the highest isle in Cliff Plateau Isles.
+CLIFF_PLATEAU_ISLES_HIGHEST_ISLE_DUMMY_STAGE_NAME = "CliPlaH"
+
+# Data storage key
+AP_VISITED_STAGE_NAMES_KEY_FORMAT = "tww_visited_stages_%i"
+
+
+class TWWCommandProcessor(ClientCommandProcessor):
+    """
+    Command Processor for The Wind Waker client commands.
+
+    This class handles commands specific to The Wind Waker.
+    """
+
+    def __init__(self, ctx: CommonContext):
+        """
+        Initialize the command processor with the provided context.
+
+        :param ctx: Context for the client.
+        """
+        super().__init__(ctx)
+
+    def _cmd_dolphin(self) -> None:
+        """
+        Display the current Dolphin emulator connection status.
+        """
+        if isinstance(self.ctx, TWWContext):
+            logger.info(f"Dolphin Status: {self.ctx.dolphin_status}")
+
+
+class TWWContext(CommonContext):
+    """
+    The context for The Wind Waker client.
+
+    This class manages all interactions with the Dolphin emulator and the Archipelago server for The Wind Waker.
+    """
+
+    command_processor = TWWCommandProcessor
+    game: str = "The Wind Waker"
+    items_handling: int = 0b111
+
+    def __init__(self, server_address: Optional[str], password: Optional[str]) -> None:
+        """
+        Initialize the TWW context.
+
+        :param server_address: Address of the Archipelago server.
+        :param password: Password for server authentication.
+        """
+
+        super().__init__(server_address, password)
+        self.dolphin_sync_task: Optional[asyncio.Task[None]] = None
+        self.dolphin_status: str = CONNECTION_INITIAL_STATUS
+        self.awaiting_rom: bool = False
+        self.has_send_death: bool = False
+
+        # Bitfields used for checking locations.
+        self.charts_bitfield: int
+        self.chests_bitfields: dict[int, int]
+        self.switches_bitfields: dict[int, int]
+        self.pickups_bitfields: dict[int, int]
+        self.curr_stage_chests_bitfield: int
+        self.curr_stage_switches_bitfield: int
+        self.curr_stage_pickups_bitfield: int
+
+        # Keep track of whether the player has yet received their first progressive magic meter.
+        self.received_magic: bool = False
+
+        # A dictionary that maps salvage locations to their sunken treasure bit.
+        self.salvage_locations_map: dict[str, int] = {}
+
+        # Name of the current stage as read from the game's memory. Sent to trackers whenever its value changes to
+        # facilitate automatically switching to the map of the current stage.
+        self.current_stage_name: str = ""
+
+        # Set of visited stages. A dictionary (used as a set) of all visited stages is set in the server's data storage
+        # and updated when the player visits a new stage for the first time. To track which stages are new and need to
+        # cause the server's data storage to update, the TWW AP Client keeps track of the visited stages in a set.
+        # Trackers can request the dictionary from data storage to see which stages the player has visited.
+        # It starts as `None` until it has been read from the server.
+        self.visited_stage_names: Optional[set[str]] = None
+
+        # Length of the item get array in memory.
+        self.len_give_item_array: int = 0x10
+
+    async def disconnect(self, allow_autoreconnect: bool = False) -> None:
+        """
+        Disconnect the client from the server and reset game state variables.
+
+        :param allow_autoreconnect: Allow the client to auto-reconnect to the server. Defaults to `False`.
+
+        """
+        self.auth = None
+        self.salvage_locations_map = {}
+        self.current_stage_name = ""
+        self.visited_stage_names = None
+        await super().disconnect(allow_autoreconnect)
+
+    async def server_auth(self, password_requested: bool = False) -> None:
+        """
+        Authenticate with the Archipelago server.
+
+        :param password_requested: Whether the server requires a password. Defaults to `False`.
+        """
+        if password_requested and not self.password:
+            await super().server_auth(password_requested)
+        if not self.auth:
+            if self.awaiting_rom:
+                return
+            self.awaiting_rom = True
+            logger.info("Awaiting connection to Dolphin to get player information.")
+            return
+        await self.send_connect()
+
+    def on_package(self, cmd: str, args: dict[str, Any]) -> None:
+        """
+        Handle incoming packages from the server.
+
+        :param cmd: The command received from the server.
+        :param args: The command arguments.
+        """
+        if cmd == "Connected":
+            self.update_salvage_locations_map()
+            if "death_link" in args["slot_data"]:
+                Utils.async_start(self.update_death_link(bool(args["slot_data"]["death_link"])))
+            # Request the connected slot's dictionary (used as a set) of visited stages.
+            visited_stages_key = AP_VISITED_STAGE_NAMES_KEY_FORMAT % self.slot
+            Utils.async_start(self.send_msgs([{"cmd": "Get", "keys": [visited_stages_key]}]))
+        elif cmd == "Retrieved":
+            requested_keys_dict = args["keys"]
+            # Read the connected slot's dictionary (used as a set) of visited stages.
+            if self.slot is not None:
+                visited_stages_key = AP_VISITED_STAGE_NAMES_KEY_FORMAT % self.slot
+                if visited_stages_key in requested_keys_dict:
+                    visited_stages = requested_keys_dict[visited_stages_key]
+                    # If it has not been set before, the value in the response will be `None`.
+                    visited_stage_names = set() if visited_stages is None else set(visited_stages.keys())
+                    # If the current stage name is not in the set, send a message to update the dictionary on the
+                    # server.
+                    current_stage_name = self.current_stage_name
+                    if current_stage_name and current_stage_name not in visited_stage_names:
+                        visited_stage_names.add(current_stage_name)
+                        Utils.async_start(self.update_visited_stages(current_stage_name))
+                    self.visited_stage_names = visited_stage_names
+
+    def on_deathlink(self, data: dict[str, Any]) -> None:
+        """
+        Handle a DeathLink event.
+
+        :param data: The data associated with the DeathLink event.
+        """
+        super().on_deathlink(data)
+        _give_death(self)
+
+    def make_gui(self) -> type["kvui.GameManager"]:
+        """
+        Initialize the GUI for The Wind Waker client.
+
+        :return: The client's GUI.
+        """
+        ui = super().make_gui()
+        ui.base_title = "Archipelago The Wind Waker Client"
+        return ui
+
+    async def update_visited_stages(self, newly_visited_stage_name: str) -> None:
+        """
+        Update the server's data storage of the visited stage names to include the newly visited stage name.
+
+        :param newly_visited_stage_name: The name of the stage recently visited.
+        """
+        if self.slot is not None:
+            visited_stages_key = AP_VISITED_STAGE_NAMES_KEY_FORMAT % self.slot
+            await self.send_msgs(
+                [
+                    {
+                        "cmd": "Set",
+                        "key": visited_stages_key,
+                        "default": {},
+                        "want_reply": False,
+                        "operations": [{"operation": "update", "value": {newly_visited_stage_name: True}}],
+                    }
+                ]
+            )
+
+    def update_salvage_locations_map(self) -> None:
+        """
+        Update the client's mapping of salvage locations to their bitfield bit.
+
+        This is necessary for the client to handle randomized charts correctly.
+        """
+        self.salvage_locations_map = {}
+        for offset in range(49):
+            island_name = ISLAND_NUMBER_TO_NAME[offset + 1]
+            salvage_bit = ISLAND_NAME_TO_SALVAGE_BIT[island_name]
+
+            shuffled_island_number = read_short(CHARTS_MAPPING_ADDR + offset * 2)
+            shuffled_island_name = ISLAND_NUMBER_TO_NAME[shuffled_island_number]
+            salvage_location_name = f"{shuffled_island_name} - Sunken Treasure"
+
+            self.salvage_locations_map[salvage_location_name] = salvage_bit
+
+
+def read_short(console_address: int) -> int:
+    """
+    Read a 2-byte short from Dolphin memory.
+
+    :param console_address: Address to read from.
+    :return: The value read from memory.
+    """
+    return int.from_bytes(dolphin_memory_engine.read_bytes(console_address, 2), byteorder="big")
+
+
+def write_short(console_address: int, value: int) -> None:
+    """
+    Write a 2-byte short to Dolphin memory.
+
+    :param console_address: Address to write to.
+    :param value: Value to write.
+    """
+    dolphin_memory_engine.write_bytes(console_address, value.to_bytes(2, byteorder="big"))
+
+
+def read_string(console_address: int, strlen: int) -> str:
+    """
+    Read a string from Dolphin memory.
+
+    :param console_address: Address to start reading from.
+    :param strlen: Length of the string to read.
+    :return: The string.
+    """
+    return dolphin_memory_engine.read_bytes(console_address, strlen).split(b"\0", 1)[0].decode()
+
+
+def _give_death(ctx: TWWContext) -> None:
+    """
+    Trigger the player's death in-game by setting their current health to zero.
+
+    :param ctx: The Wind Waker client context.
+    """
+    if (
+        ctx.slot is not None
+        and dolphin_memory_engine.is_hooked()
+        and ctx.dolphin_status == CONNECTION_CONNECTED_STATUS
+        and check_ingame()
+    ):
+        ctx.has_send_death = True
+        write_short(CURR_HEALTH_ADDR, 0)
+
+
+def _give_item(ctx: TWWContext, item_name: str) -> bool:
+    """
+    Give an item to the player in-game.
+
+    :param ctx: The Wind Waker client context.
+    :param item_name: Name of the item to give.
+    :return: Whether the item was successfully given.
+    """
+    if not check_ingame() or dolphin_memory_engine.read_byte(CURR_STAGE_ID_ADDR) == 0xFF:
+        return False
+
+    item_id = ITEM_TABLE[item_name].item_id
+
+    # Loop through the item array, placing the item in an empty slot.
+    for idx in range(ctx.len_give_item_array):
+        slot = dolphin_memory_engine.read_byte(GIVE_ITEM_ARRAY_ADDR + idx)
+        if slot == 0xFF:
+            # Special case: Use a different item ID for the second progressive magic meter.
+            if item_name == "Progressive Magic Meter":
+                if ctx.received_magic:
+                    item_id = 0xB2
+                else:
+                    ctx.received_magic = True
+            dolphin_memory_engine.write_byte(GIVE_ITEM_ARRAY_ADDR + idx, item_id)
+            return True
+
+    # If unable to place the item in the array, return `False`.
+    return False
+
+
+async def give_items(ctx: TWWContext) -> None:
+    """
+    Give the player all outstanding items they have yet to receive.
+
+    :param ctx: The Wind Waker client context.
+    """
+    if check_ingame() and dolphin_memory_engine.read_byte(CURR_STAGE_ID_ADDR) != 0xFF:
+        # Read the expected index of the player, which is the index of the next item they're expecting to receive.
+        # The expected index starts at 0 for a fresh save file.
+        expected_idx = read_short(EXPECTED_INDEX_ADDR)
+
+        # Check if there are new items.
+        received_items = ctx.items_received
+        if len(received_items) <= expected_idx:
+            # There are no new items.
+            return
+
+        # Loop through items to give.
+        # Give the player all items at an index greater than or equal to the expected index.
+        for idx, item in enumerate(received_items[expected_idx:], start=expected_idx):
+            # Attempt to give the item and increment the expected index.
+            while not _give_item(ctx, LOOKUP_ID_TO_NAME[item.item]):
+                await asyncio.sleep(0.01)
+
+            # Increment the expected index.
+            write_short(EXPECTED_INDEX_ADDR, idx + 1)
+
+
+def check_special_location(location_name: str, data: TWWLocationData) -> bool:
+    """
+    Check that the player has checked a given location.
+    This function handles locations that require special logic.
+
+    :param location_name: The name of the location.
+    :param data: The data associated with the location.
+    :raises NotImplementedError: If an unknown location name is provided.
+    """
+    checked = False
+
+    # For "Windfall Island - Lenzo's House - Become Lenzo's Assistant"
+    # 0x6 is delivered the final picture for Lenzo, 0x7 is a day has passed since becoming his assistant
+    # Either is fine for sending the check, so check both conditions.
+    if location_name == "Windfall Island - Lenzo's House - Become Lenzo's Assistant":
+        checked = (
+            dolphin_memory_engine.read_byte(data.address) & 0x6 == 0x6
+            or dolphin_memory_engine.read_byte(data.address) & 0x7 == 0x7
+        )
+
+    # The "Windfall Island - Maggie - Delivery Reward" flag remains unknown.
+    # However, as a temporary workaround, we can check if the player had Moblin's letter at some point, but it's no
+    # longer in their Delivery Bag.
+    elif location_name == "Windfall Island - Maggie - Delivery Reward":
+        was_moblins_owned = (dolphin_memory_engine.read_word(LETTER_OWND_ADDR) >> 15) & 1
+        dbag_contents = [dolphin_memory_engine.read_byte(LETTER_BASE_ADDR + offset) for offset in range(8)]
+        checked = was_moblins_owned and 0x9B not in dbag_contents
+
+    # For Letter from Hoskit's Girlfriend, we need to check two bytes.
+    # 0x1 = Golden Feathers delivered, 0x2 = Mail sent by Hoskit's Girlfriend, 0x3 = Mail read by Link
+    elif location_name == "Mailbox - Letter from Hoskit's Girlfriend":
+        checked = dolphin_memory_engine.read_byte(data.address) & 0x3 == 0x3
+
+    # For Letter from Baito's Mother, we need to check two bytes.
+    # 0x1 = Note to Mom sent, 0x2 = Mail sent by Baito's Mother, 0x3 = Mail read by Link
+    elif location_name == "Mailbox - Letter from Baito's Mother":
+        checked = dolphin_memory_engine.read_byte(data.address) & 0x3 == 0x3
+
+    # For Letter from Grandma, we need to check two bytes.
+    # 0x1 = Grandma saved, 0x2 = Mail sent by Grandma, 0x3 = Mail read by Link
+    elif location_name == "Mailbox - Letter from Grandma":
+        checked = dolphin_memory_engine.read_byte(data.address) & 0x3 == 0x3
+
+    # We check if the bits for turning all five statues are set for the Ankle's reward.
+    # For some reason, the bit for the Dragon Tingle Statue is separate from the rest.
+    elif location_name == "Tingle Island - Ankle - Reward for All Tingle Statues":
+        dragon_tingle_statue_rewarded = dolphin_memory_engine.read_byte(TINGLE_STATUE_1_ADDR) & 0x40 == 0x40
+        other_tingle_statues_rewarded = dolphin_memory_engine.read_byte(TINGLE_STATUE_2_ADDR) & 0x0F == 0x0F
+        checked = dragon_tingle_statue_rewarded and other_tingle_statues_rewarded
+
+    else:
+        raise NotImplementedError(f"Unknown special location: {location_name}")
+
+    return checked
+
+
+def check_regular_location(ctx: TWWContext, curr_stage_id: int, data: TWWLocationData) -> bool:
+    """
+    Check that the player has checked a given location.
+    This function handles locations that only require checking that a particular bit is set.
+
+    The check looks at the saved data for the stage at which the location is located and the data for the current stage.
+    In the latter case, this data includes data that has not yet been written to the saved data.
+
+    :param ctx: The Wind Waker client context.
+    :param curr_stage_id: The current stage at which the player is.
+    :param data: The data associated with the location.
+    :raises NotImplementedError: If a location with an unknown type is provided.
+    """
+    checked = False
+
+    # Check the saved bitfields for the stage.
+    if data.type == TWWLocationType.CHEST:
+        checked = bool((ctx.chests_bitfields[data.stage_id] >> data.bit) & 1)
+    elif data.type == TWWLocationType.SWTCH:
+        checked = bool((ctx.switches_bitfields[data.stage_id] >> data.bit) & 1)
+    elif data.type == TWWLocationType.PCKUP:
+        checked = bool((ctx.pickups_bitfields[data.stage_id] >> data.bit) & 1)
+    else:
+        raise NotImplementedError(f"Unknown location type: {data.type}")
+
+    # If the location is in the current stage, check the bitfields for the current stage as well.
+    if not checked and curr_stage_id == data.stage_id:
+        if data.type == TWWLocationType.CHEST:
+            checked = bool((ctx.curr_stage_chests_bitfield >> data.bit) & 1)
+        elif data.type == TWWLocationType.SWTCH:
+            checked = bool((ctx.curr_stage_switches_bitfield >> data.bit) & 1)
+        elif data.type == TWWLocationType.PCKUP:
+            checked = bool((ctx.curr_stage_pickups_bitfield >> data.bit) & 1)
+        else:
+            raise NotImplementedError(f"Unknown location type: {data.type}")
+
+    return checked
+
+
+async def check_locations(ctx: TWWContext) -> None:
+    """
+    Iterate through all locations and check whether the player has checked each location.
+
+    Update the server with all newly checked locations since the last update. If the player has completed the goal,
+    notify the server.
+
+    :param ctx: The Wind Waker client context.
+    """
+    # Read the bitfield for sunken treasure locations.
+    ctx.charts_bitfield = int.from_bytes(dolphin_memory_engine.read_bytes(CHARTS_BITFLD_ADDR, 8), byteorder="big")
+
+    # Read the bitfields once before the loop to speed things up a bit.
+    ctx.chests_bitfields = {}
+    ctx.switches_bitfields = {}
+    ctx.pickups_bitfields = {}
+    for stage_id in range(0xE):
+        chest_bitfield_addr = BASE_CHESTS_BITFLD_ADDR + (0x24 * stage_id)
+        switches_bitfield_addr = BASE_SWITCHES_BITFLD_ADDR + (0x24 * stage_id)
+        pickups_bitfield_addr = BASE_PICKUPS_BITFLD_ADDR + (0x24 * stage_id)
+
+        ctx.chests_bitfields[stage_id] = int(dolphin_memory_engine.read_word(chest_bitfield_addr))
+        ctx.switches_bitfields[stage_id] = int.from_bytes(
+            dolphin_memory_engine.read_bytes(switches_bitfield_addr, 10), byteorder="big"
+        )
+        ctx.pickups_bitfields[stage_id] = int(dolphin_memory_engine.read_word(pickups_bitfield_addr))
+
+    ctx.curr_stage_chests_bitfield = int(dolphin_memory_engine.read_word(CURR_STAGE_CHESTS_BITFLD_ADDR))
+    ctx.curr_stage_switches_bitfield = int.from_bytes(
+        dolphin_memory_engine.read_bytes(CURR_STAGE_SWITCHES_BITFLD_ADDR, 10), byteorder="big"
+    )
+    ctx.curr_stage_pickups_bitfield = int(dolphin_memory_engine.read_word(CURR_STAGE_PICKUPS_BITFLD_ADDR))
+
+    # We check which locations are currently checked on the current stage.
+    curr_stage_id = dolphin_memory_engine.read_byte(CURR_STAGE_ID_ADDR)
+
+    # Loop through all locations to see if each has been checked.
+    for location, data in LOCATION_TABLE.items():
+        checked = False
+        if data.type == TWWLocationType.CHART:
+            assert location in ctx.salvage_locations_map, f'Location "{location}" salvage bit not set!'
+            salvage_bit = ctx.salvage_locations_map[location]
+            checked = bool((ctx.charts_bitfield >> salvage_bit) & 1)
+        elif data.type == TWWLocationType.BOCTO:
+            assert data.address is not None
+            checked = bool((read_short(data.address) >> data.bit) & 1)
+        elif data.type == TWWLocationType.EVENT:
+            checked = bool((dolphin_memory_engine.read_byte(data.address) >> data.bit) & 1)
+        elif data.type == TWWLocationType.SPECL:
+            checked = check_special_location(location, data)
+        else:
+            checked = check_regular_location(ctx, curr_stage_id, data)
+
+        if checked:
+            if data.code is None:
+                if not ctx.finished_game:
+                    await ctx.send_msgs([{"cmd": "StatusUpdate", "status": ClientStatus.CLIENT_GOAL}])
+                    ctx.finished_game = True
+            else:
+                ctx.locations_checked.add(TWWLocation.get_apid(data.code))
+
+    # Send the list of newly-checked locations to the server.
+    locations_checked = ctx.locations_checked.difference(ctx.checked_locations)
+    if locations_checked:
+        await ctx.send_msgs([{"cmd": "LocationChecks", "locations": locations_checked}])
+
+
+async def check_current_stage_changed(ctx: TWWContext) -> None:
+    """
+    Check if the player has moved to a new stage.
+    If so, update all trackers with the new stage name.
+    If the stage has never been visited, additionally update the server.
+
+    :param ctx: The Wind Waker client context.
+    """
+    new_stage_name = read_string(CURR_STAGE_NAME_ADDR, 8)
+
+    # Special handling is required for the Cliff Plateau Isles Inner Cave exit, which exits out onto the sea stage
+    # rather than a unique stage.
+    if (
+        new_stage_name == "sea"
+        and dolphin_memory_engine.read_byte(MOST_RECENT_ROOM_NUMBER_ADDR) == CLIFF_PLATEAU_ISLES_ROOM_NUMBER
+        and read_short(MOST_RECENT_SPAWN_ID_ADDR) == CLIFF_PLATEAU_ISLES_HIGHEST_ISLE_SPAWN_ID
+    ):
+        new_stage_name = CLIFF_PLATEAU_ISLES_HIGHEST_ISLE_DUMMY_STAGE_NAME
+
+    current_stage_name = ctx.current_stage_name
+    if new_stage_name != current_stage_name:
+        ctx.current_stage_name = new_stage_name
+        # Send a Bounced message containing the new stage name to all trackers connected to the current slot.
+        data_to_send = {"tww_stage_name": new_stage_name}
+        message = {
+            "cmd": "Bounce",
+            "slots": [ctx.slot],
+            "data": data_to_send,
+        }
+        await ctx.send_msgs([message])
+
+        # If the stage has never been visited before, update the server's data storage to indicate that it has been
+        # visited.
+        visited_stage_names = ctx.visited_stage_names
+        if visited_stage_names is not None and new_stage_name not in visited_stage_names:
+            visited_stage_names.add(new_stage_name)
+            await ctx.update_visited_stages(new_stage_name)
+
+
+async def check_alive() -> bool:
+    """
+    Check if the player is currently alive in-game.
+
+    :return: `True` if the player is alive, otherwise `False`.
+    """
+    cur_health = read_short(CURR_HEALTH_ADDR)
+    return cur_health > 0
+
+
+async def check_death(ctx: TWWContext) -> None:
+    """
+    Check if the player is currently dead in-game.
+    If DeathLink is on, notify the server of the player's death.
+
+    :return: `True` if the player is dead, otherwise `False`.
+    """
+    if ctx.slot is not None and check_ingame():
+        cur_health = read_short(CURR_HEALTH_ADDR)
+        if cur_health <= 0:
+            if not ctx.has_send_death and time.time() >= ctx.last_death_link + 3:
+                ctx.has_send_death = True
+                await ctx.send_death(ctx.player_names[ctx.slot] + " ran out of hearts.")
+        else:
+            ctx.has_send_death = False
+
+
+def check_ingame() -> bool:
+    """
+    Check if the player is currently in-game.
+
+    :return: `True` if the player is in-game, otherwise `False`.
+    """
+    return read_string(CURR_STAGE_NAME_ADDR, 8) not in ["", "sea_T", "Name"]
+
+
+async def dolphin_sync_task(ctx: TWWContext) -> None:
+    """
+    The task loop for managing the connection to Dolphin.
+
+    While connected, read the emulator's memory to look for any relevant changes made by the player in the game.
+
+    :param ctx: The Wind Waker client context.
+    """
+    logger.info("Starting Dolphin connector. Use /dolphin for status information.")
+    sleep_time = 0.0
+    while not ctx.exit_event.is_set():
+        if sleep_time > 0.0:
+            try:
+                # ctx.watcher_event gets set when receiving ReceivedItems or LocationInfo, or when shutting down.
+                await asyncio.wait_for(ctx.watcher_event.wait(), sleep_time)
+            except asyncio.TimeoutError:
+                pass
+            sleep_time = 0.0
+        ctx.watcher_event.clear()
+
+        try:
+            if dolphin_memory_engine.is_hooked() and ctx.dolphin_status == CONNECTION_CONNECTED_STATUS:
+                if not check_ingame():
+                    # Reset the give item array while not in the game.
+                    dolphin_memory_engine.write_bytes(GIVE_ITEM_ARRAY_ADDR, bytes([0xFF] * ctx.len_give_item_array))
+                    sleep_time = 0.1
+                    continue
+                if ctx.slot is not None:
+                    if "DeathLink" in ctx.tags:
+                        await check_death(ctx)
+                    await give_items(ctx)
+                    await check_locations(ctx)
+                    await check_current_stage_changed(ctx)
+                else:
+                    if not ctx.auth:
+                        ctx.auth = read_string(SLOT_NAME_ADDR, 0x40)
+                    if ctx.awaiting_rom:
+                        await ctx.server_auth()
+                sleep_time = 0.1
+            else:
+                if ctx.dolphin_status == CONNECTION_CONNECTED_STATUS:
+                    logger.info("Connection to Dolphin lost, reconnecting...")
+                    ctx.dolphin_status = CONNECTION_LOST_STATUS
+                logger.info("Attempting to connect to Dolphin...")
+                dolphin_memory_engine.hook()
+                if dolphin_memory_engine.is_hooked():
+                    if dolphin_memory_engine.read_bytes(0x80000000, 6) != b"GZLE99":
+                        logger.info(CONNECTION_REFUSED_GAME_STATUS)
+                        ctx.dolphin_status = CONNECTION_REFUSED_GAME_STATUS
+                        dolphin_memory_engine.un_hook()
+                        sleep_time = 5
+                    else:
+                        logger.info(CONNECTION_CONNECTED_STATUS)
+                        ctx.dolphin_status = CONNECTION_CONNECTED_STATUS
+                        ctx.locations_checked = set()
+                else:
+                    logger.info("Connection to Dolphin failed, attempting again in 5 seconds...")
+                    ctx.dolphin_status = CONNECTION_LOST_STATUS
+                    await ctx.disconnect()
+                    sleep_time = 5
+                    continue
+        except Exception:
+            dolphin_memory_engine.un_hook()
+            logger.info("Connection to Dolphin failed, attempting again in 5 seconds...")
+            logger.error(traceback.format_exc())
+            ctx.dolphin_status = CONNECTION_LOST_STATUS
+            await ctx.disconnect()
+            sleep_time = 5
+            continue
+
+
+def main(connect: Optional[str] = None, password: Optional[str] = None) -> None:
+    """
+    Run the main async loop for the Wind Waker client.
+
+    :param connect: Address of the Archipelago server.
+    :param password: Password for server authentication.
+    """
+    Utils.init_logging("The Wind Waker Client")
+
+    async def _main(connect: Optional[str], password: Optional[str]) -> None:
+        ctx = TWWContext(connect, password)
+        ctx.server_task = asyncio.create_task(server_loop(ctx), name="ServerLoop")
+        if gui_enabled:
+            ctx.run_gui()
+        ctx.run_cli()
+        await asyncio.sleep(1)
+
+        ctx.dolphin_sync_task = asyncio.create_task(dolphin_sync_task(ctx), name="DolphinSync")
+
+        await ctx.exit_event.wait()
+        # Wake the sync task, if it is currently sleeping, so it can start shutting down when it sees that the
+        # exit_event is set.
+        ctx.watcher_event.set()
+        ctx.server_address = None
+
+        await ctx.shutdown()
+
+        if ctx.dolphin_sync_task:
+            await ctx.dolphin_sync_task
+
+    import colorama
+
+    colorama.init()
+    asyncio.run(_main(connect, password))
+    colorama.deinit()
+
+
+if __name__ == "__main__":
+    parser = get_base_parser()
+    args = parser.parse_args()
+    main(args.connect, args.password)
diff --git a/worlds/tww/__init__.py b/worlds/tww/__init__.py
new file mode 100644
index 0000000000..36ed77f9c9
--- /dev/null
+++ b/worlds/tww/__init__.py
@@ -0,0 +1,598 @@
+import os
+import zipfile
+from base64 import b64encode
+from collections.abc import Mapping
+from typing import Any, ClassVar
+
+import yaml
+
+from BaseClasses import Item
+from BaseClasses import ItemClassification as IC
+from BaseClasses import MultiWorld, Region, Tutorial
+from Options import Toggle
+from worlds.AutoWorld import WebWorld, World
+from worlds.Files import APContainer, AutoPatchRegister
+from worlds.generic.Rules import add_item_rule
+from worlds.LauncherComponents import Component, SuffixIdentifier, Type, components, icon_paths, launch_subprocess
+
+from .Items import ISLAND_NUMBER_TO_CHART_NAME, ITEM_TABLE, TWWItem, item_name_groups
+from .Locations import LOCATION_TABLE, TWWFlag, TWWLocation
+from .Options import TWWOptions, tww_option_groups
+from .Presets import tww_options_presets
+from .randomizers.Charts import ISLAND_NUMBER_TO_NAME, ChartRandomizer
+from .randomizers.Dungeons import Dungeon, create_dungeons
+from .randomizers.Entrances import ALL_EXITS, BOSS_EXIT_TO_DUNGEON, MINIBOSS_EXIT_TO_DUNGEON, EntranceRandomizer
+from .randomizers.ItemPool import generate_itempool
+from .randomizers.RequiredBosses import RequiredBossesRandomizer
+from .Rules import set_rules
+
+VERSION: tuple[int, int, int] = (3, 0, 0)
+
+
+def run_client() -> None:
+    """
+    Launch the The Wind Waker client.
+    """
+    print("Running The Wind Waker Client")
+    from .TWWClient import main
+
+    launch_subprocess(main, name="TheWindWakerClient")
+
+
+components.append(
+    Component(
+        "The Wind Waker Client",
+        func=run_client,
+        component_type=Type.CLIENT,
+        file_identifier=SuffixIdentifier(".aptww"),
+        icon="The Wind Waker",
+    )
+)
+icon_paths["The Wind Waker"] = "ap:worlds.tww/assets/icon.png"
+
+
+class TWWContainer(APContainer, metaclass=AutoPatchRegister):
+    """
+    This class defines the container file for The Wind Waker.
+    """
+
+    game: str = "The Wind Waker"
+    patch_file_ending: str = ".aptww"
+
+    def __init__(self, *args: Any, **kwargs: Any) -> None:
+        if "data" in kwargs:
+            self.data = kwargs["data"]
+            del kwargs["data"]
+
+        super().__init__(*args, **kwargs)
+
+    def write_contents(self, opened_zipfile: zipfile.ZipFile) -> None:
+        """
+        Write the contents of the container file.
+        """
+        super().write_contents(opened_zipfile)
+
+        # Record the data for the game under the key `plando`.
+        opened_zipfile.writestr("plando", b64encode(bytes(yaml.safe_dump(self.data, sort_keys=False), "utf-8")))
+
+
+class TWWWeb(WebWorld):
+    """
+    This class handles the web interface for The Wind Waker.
+
+    The web interface includes the setup guide and the options page for generating YAMLs.
+    """
+
+    tutorials = [
+        Tutorial(
+            "Multiworld Setup Guide",
+            "A guide to setting up the Archipelago The Wind Waker software on your computer.",
+            "English",
+            "setup_en.md",
+            "setup/en",
+            ["tanjo3", "Lunix"],
+        )
+    ]
+    theme = "ocean"
+    options_presets = tww_options_presets
+    option_groups = tww_option_groups
+    rich_text_options_doc = True
+
+
+class TWWWorld(World):
+    """
+    Legend has it that whenever evil has appeared, a hero named Link has arisen to defeat it. The legend continues on
+    the surface of a vast and mysterious sea as Link sets sail in his most epic, awe-inspiring adventure yet. Aided by a
+    magical conductor's baton called the Wind Waker, he will face unimaginable monsters, explore puzzling dungeons, and
+    meet a cast of unforgettable characters as he searches for his kidnapped sister.
+    """
+
+    options_dataclass = TWWOptions
+    options: TWWOptions
+
+    game: ClassVar[str] = "The Wind Waker"
+    topology_present: bool = True
+
+    item_name_to_id: ClassVar[dict[str, int]] = {
+        name: TWWItem.get_apid(data.code) for name, data in ITEM_TABLE.items() if data.code is not None
+    }
+    location_name_to_id: ClassVar[dict[str, int]] = {
+        name: TWWLocation.get_apid(data.code) for name, data in LOCATION_TABLE.items() if data.code is not None
+    }
+
+    item_name_groups: ClassVar[dict[str, set[str]]] = item_name_groups
+
+    required_client_version: tuple[int, int, int] = (0, 5, 1)
+
+    web: ClassVar[TWWWeb] = TWWWeb()
+
+    origin_region_name: str = "The Great Sea"
+
+    create_items = generate_itempool
+
+    logic_rematch_bosses_skipped: bool
+    logic_in_swordless_mode: bool
+    logic_in_required_bosses_mode: bool
+    logic_obscure_1: bool
+    logic_obscure_2: bool
+    logic_obscure_3: bool
+    logic_precise_1: bool
+    logic_precise_2: bool
+    logic_precise_3: bool
+    logic_tuner_logic_enabled: bool
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+
+        self.progress_locations: set[str] = set()
+        self.nonprogress_locations: set[str] = set()
+
+        self.dungeon_local_item_names: set[str] = set()
+        self.dungeon_specific_item_names: set[str] = set()
+        self.dungeons: dict[str, Dungeon] = {}
+
+        self.item_classification_overrides: dict[str, IC] = {}
+
+        self.useful_pool: list[str] = []
+        self.filler_pool: list[str] = []
+
+        self.charts = ChartRandomizer(self)
+        self.entrances = EntranceRandomizer(self)
+        self.boss_reqs = RequiredBossesRandomizer(self)
+
+    def _determine_item_classification_overrides(self) -> None:
+        """
+        Determine item classification overrides. The classification of an item may be affected by which options are
+        enabled or disabled.
+        """
+        options = self.options
+        item_classification_overrides = self.item_classification_overrides
+
+        # Override certain items to be filler depending on user options.
+        # TODO: Calculate filler items dynamically
+        override_as_filler = []
+        if not options.progression_dungeons:
+            override_as_filler.extend(item_name_groups["Small Keys"] | item_name_groups["Big Keys"])
+            override_as_filler.extend(("Command Melody", "Earth God's Lyric", "Wind God's Aria"))
+        if not options.progression_short_sidequests:
+            override_as_filler.extend(("Maggie's Letter", "Moblin's Letter"))
+        if not (options.progression_short_sidequests or options.progression_long_sidequests):
+            override_as_filler.append("Progressive Picto Box")
+        if not options.progression_spoils_trading:
+            override_as_filler.append("Spoils Bag")
+        if not options.progression_triforce_charts:
+            override_as_filler.extend(item_name_groups["Triforce Charts"])
+        if not options.progression_treasure_charts:
+            override_as_filler.extend(item_name_groups["Treasure Charts"])
+        if not options.progression_misc:
+            override_as_filler.extend(item_name_groups["Tingle Statues"])
+
+        for item_name in override_as_filler:
+            item_classification_overrides[item_name] = IC.filler
+
+        # Override certain items to be useful depending on user options.
+        # TODO: Calculate useful items dynamically
+        override_as_useful = []
+        if not options.progression_big_octos_gunboats:
+            override_as_useful.append("Quiver Capacity Upgrade")
+        if options.sword_mode in ("swords_optional", "swordless"):
+            override_as_useful.append("Progressive Sword")
+        if not options.enable_tuner_logic:
+            override_as_useful.append("Tingle Tuner")
+
+        for item_name in override_as_useful:
+            item_classification_overrides[item_name] = IC.useful
+
+    def _determine_progress_and_nonprogress_locations(self) -> tuple[set[str], set[str]]:
+        """
+        Determine which locations are progress and nonprogress in the world based on the player's options.
+
+        :return: A tuple of two sets, the first containing the names of the progress locations and the second containing
+        the names of the nonprogress locations.
+        """
+
+        def add_flag(option: Toggle, flag: TWWFlag) -> TWWFlag:
+            return flag if option else TWWFlag.ALWAYS
+
+        options = self.options
+
+        enabled_flags = TWWFlag.ALWAYS
+        enabled_flags |= add_flag(options.progression_dungeons, TWWFlag.DUNGEON | TWWFlag.BOSS)
+        enabled_flags |= add_flag(options.progression_tingle_chests, TWWFlag.TNGL_CT)
+        enabled_flags |= add_flag(options.progression_dungeon_secrets, TWWFlag.DG_SCRT)
+        enabled_flags |= add_flag(options.progression_puzzle_secret_caves, TWWFlag.PZL_CVE)
+        enabled_flags |= add_flag(options.progression_combat_secret_caves, TWWFlag.CBT_CVE)
+        enabled_flags |= add_flag(options.progression_savage_labyrinth, TWWFlag.SAVAGE)
+        enabled_flags |= add_flag(options.progression_great_fairies, TWWFlag.GRT_FRY)
+        enabled_flags |= add_flag(options.progression_short_sidequests, TWWFlag.SHRT_SQ)
+        enabled_flags |= add_flag(options.progression_long_sidequests, TWWFlag.LONG_SQ)
+        enabled_flags |= add_flag(options.progression_spoils_trading, TWWFlag.SPOILS)
+        enabled_flags |= add_flag(options.progression_minigames, TWWFlag.MINIGME)
+        enabled_flags |= add_flag(options.progression_battlesquid, TWWFlag.SPLOOSH)
+        enabled_flags |= add_flag(options.progression_free_gifts, TWWFlag.FREE_GF)
+        enabled_flags |= add_flag(options.progression_mail, TWWFlag.MAILBOX)
+        enabled_flags |= add_flag(options.progression_platforms_rafts, TWWFlag.PLTFRMS)
+        enabled_flags |= add_flag(options.progression_submarines, TWWFlag.SUBMRIN)
+        enabled_flags |= add_flag(options.progression_eye_reef_chests, TWWFlag.EYE_RFS)
+        enabled_flags |= add_flag(options.progression_big_octos_gunboats, TWWFlag.BG_OCTO)
+        enabled_flags |= add_flag(options.progression_expensive_purchases, TWWFlag.XPENSVE)
+        enabled_flags |= add_flag(options.progression_island_puzzles, TWWFlag.ISLND_P)
+        enabled_flags |= add_flag(options.progression_misc, TWWFlag.MISCELL)
+
+        progress_locations: set[str] = set()
+        nonprogress_locations: set[str] = set()
+        for location, data in LOCATION_TABLE.items():
+            if data.flags & enabled_flags == data.flags:
+                progress_locations.add(location)
+            else:
+                nonprogress_locations.add(location)
+        assert progress_locations.isdisjoint(nonprogress_locations)
+
+        return progress_locations, nonprogress_locations
+
+    @staticmethod
+    def _get_classification_name(classification: IC) -> str:
+        """
+        Return a string representation of the item's highest-order classification.
+
+        :param classification: The item's classification.
+        :return: A string representation of the item's highest classification. The order of classification is
+        progression > trap > useful > filler.
+        """
+
+        if IC.progression in classification:
+            return "progression"
+        elif IC.trap in classification:
+            return "trap"
+        elif IC.useful in classification:
+            return "useful"
+        else:
+            return "filler"
+
+    def generate_early(self) -> None:
+        """
+        Run before any general steps of the MultiWorld other than options.
+        """
+        options = self.options
+
+        # Only randomize secret cave inner entrances if both puzzle secret caves and combat secret caves are enabled.
+        if not (options.progression_puzzle_secret_caves and options.progression_combat_secret_caves):
+            options.randomize_secret_cave_inner_entrances.value = False
+
+        # Determine which locations are progression and which are not from options.
+        self.progress_locations, self.nonprogress_locations = self._determine_progress_and_nonprogress_locations()
+
+        for dungeon_item in ["randomize_smallkeys", "randomize_bigkeys", "randomize_mapcompass"]:
+            option = getattr(options, dungeon_item)
+            if option == "local":
+                options.local_items.value |= self.item_name_groups[option.item_name_group]
+            elif option.in_dungeon:
+                self.dungeon_local_item_names |= self.item_name_groups[option.item_name_group]
+                if option == "dungeon":
+                    self.dungeon_specific_item_names |= self.item_name_groups[option.item_name_group]
+                else:
+                    options.local_items.value |= self.dungeon_local_item_names
+
+        # Resolve logic options and set them onto the world instance for faster lookup in logic rules.
+        self.logic_rematch_bosses_skipped = bool(options.skip_rematch_bosses.value)
+        self.logic_in_swordless_mode = options.sword_mode in ("swords_optional", "swordless")
+        self.logic_in_required_bosses_mode = bool(options.required_bosses.value)
+        self.logic_obscure_3 = options.logic_obscurity == "very_hard"
+        self.logic_obscure_2 = self.logic_obscure_3 or options.logic_obscurity == "hard"
+        self.logic_obscure_1 = self.logic_obscure_2 or options.logic_obscurity == "normal"
+        self.logic_precise_3 = options.logic_precision == "very_hard"
+        self.logic_precise_2 = self.logic_precise_3 or options.logic_precision == "hard"
+        self.logic_precise_1 = self.logic_precise_2 or options.logic_precision == "normal"
+        self.logic_tuner_logic_enabled = bool(options.enable_tuner_logic.value)
+
+        # Determine any item classification overrides based on user options.
+        self._determine_item_classification_overrides()
+
+    def create_regions(self) -> None:
+        """
+        Create and connect regions for the The Wind Waker world.
+
+        This method first randomizes the charts and picks the required bosses if these options are enabled.
+        It then loops through all the world's progress locations and creates the locations, assigning dungeon locations
+        to their respective dungeons.
+        Finally, the flags for sunken treasure locations are updated as appropriate, and the entrances are randomized
+        if that option is enabled.
+        """
+        multiworld = self.multiworld
+        player = self.player
+        options = self.options
+
+        # "The Great Sea" region contains all locations that are not in a randomizable region.
+        great_sea_region = Region("The Great Sea", player, multiworld)
+        multiworld.regions.append(great_sea_region)
+
+        # Add all randomizable regions.
+        for _exit in ALL_EXITS:
+            multiworld.regions.append(Region(_exit.unique_name, player, multiworld))
+
+        # Set up sunken treasure locations, randomizing the charts if necessary.
+        self.charts.setup_progress_sunken_treasure_locations()
+
+        # Select required bosses.
+        if options.required_bosses:
+            self.boss_reqs.randomize_required_bosses()
+            self.progress_locations -= self.boss_reqs.banned_locations
+            self.nonprogress_locations |= self.boss_reqs.banned_locations
+
+        # Create the dungeon classes.
+        create_dungeons(self)
+
+        # Assign each location to their region.
+        # Progress locations are sorted for deterministic results.
+        for location_name in sorted(self.progress_locations):
+            data = LOCATION_TABLE[location_name]
+
+            region = self.get_region(data.region)
+            location = TWWLocation(player, location_name, region, data)
+
+            # Additionally, assign dungeon locations to the appropriate dungeon.
+            if region.name in self.dungeons:
+                location.dungeon = self.dungeons[region.name]
+            elif region.name in MINIBOSS_EXIT_TO_DUNGEON and not options.randomize_miniboss_entrances:
+                location.dungeon = self.dungeons[MINIBOSS_EXIT_TO_DUNGEON[region.name]]
+            elif region.name in BOSS_EXIT_TO_DUNGEON and not options.randomize_boss_entrances:
+                location.dungeon = self.dungeons[BOSS_EXIT_TO_DUNGEON[region.name]]
+            elif location.name in [
+                "Forsaken Fortress - Phantom Ganon",
+                "Forsaken Fortress - Chest Outside Upper Jail Cell",
+                "Forsaken Fortress - Chest Inside Lower Jail Cell",
+                "Forsaken Fortress - Chest Guarded By Bokoblin",
+                "Forsaken Fortress - Chest on Bed",
+            ]:
+                location.dungeon = self.dungeons["Forsaken Fortress"]
+            region.locations.append(location)
+
+        # Correct the flags of the sunken treasure locations if the charts are randomized.
+        self.charts.update_chart_location_flags()
+
+        # Connect the regions in the multiworld. Randomize entrances to exits if the option is set.
+        self.entrances.randomize_entrances()
+
+    def set_rules(self) -> None:
+        """
+        Set access and item rules on locations.
+        """
+        # Set the access rules for all progression locations.
+        set_rules(self)
+
+        # Ban the Bait Bag slot from having bait.
+        # Beedle's shop does not work correctly if the same item is in multiple slots in the same shop.
+        if "The Great Sea - Beedle's Shop Ship - 20 Rupee Item" in self.progress_locations:
+            beedle_20 = self.get_location("The Great Sea - Beedle's Shop Ship - 20 Rupee Item")
+            add_item_rule(beedle_20, lambda item: item.name not in ["All-Purpose Bait", "Hyoi Pear"])
+
+        # For the same reason, the same item should not appear more than once on the Rock Spire Isle shop ship.
+        # All non-TWW items use the same item (Father's Letter), so at most one non-TWW item can appear in the shop.
+        # The rest must be (unique, but not necessarily local) TWW items.
+        locations = [f"Rock Spire Isle - Beedle's Special Shop Ship - {v} Rupee Item" for v in [500, 950, 900]]
+        if all(loc in self.progress_locations for loc in locations):
+            rock_spire_shop_ship_locations = [self.get_location(location_name) for location_name in locations]
+
+            for i in range(len(rock_spire_shop_ship_locations)):
+                curr_loc = rock_spire_shop_ship_locations[i]
+                other_locs = rock_spire_shop_ship_locations[:i] + rock_spire_shop_ship_locations[i + 1:]
+
+                add_item_rule(
+                    curr_loc,
+                    lambda item, locations=other_locs: (
+                        item.game == "The Wind Waker"
+                        and all(location.item is None or item.name != location.item.name for location in locations)
+                    )
+                    or (
+                        item.game != "The Wind Waker"
+                        and all(
+                            location.item is None or location.item.game == "The Wind Waker" for location in locations
+                        )
+                    ),
+                )
+
+    @classmethod
+    def stage_set_rules(cls, multiworld: MultiWorld) -> None:
+        """
+        Class method used to modify the rules for The Wind Waker dungeon locations.
+
+        :param multiworld: The MultiWorld.
+        """
+        from .randomizers.Dungeons import modify_dungeon_location_rules
+
+        # Set additional rules on dungeon locations as necessary.
+        modify_dungeon_location_rules(multiworld)
+
+    @classmethod
+    def stage_pre_fill(cls, multiworld: MultiWorld) -> None:
+        """
+        Class method used to correctly place dungeon items for The Wind Waker worlds.
+
+        :param multiworld: The MultiWorld.
+        """
+        from .randomizers.Dungeons import fill_dungeons_restrictive
+
+        fill_dungeons_restrictive(multiworld)
+
+    def generate_output(self, output_directory: str) -> None:
+        """
+        Create the output APTWW file that is used to randomize the ISO.
+
+        :param output_directory: The output directory for the APTWW file.
+        """
+        multiworld = self.multiworld
+        player = self.player
+
+        # Determine the current arrangement for charts.
+        # Create a list where the original island number is the index, and the value is the new island number.
+        # Without randomized charts, this array would be just an ordered list of the numbers 1 to 49.
+        # With randomized charts, the new island number is where the chart for the original island now leads.
+        chart_name_to_island_number = {
+            chart_name: island_number for island_number, chart_name in self.charts.island_number_to_chart_name.items()
+        }
+        charts_mapping: list[int] = []
+        for i in range(1, 49 + 1):
+            original_chart_name = ISLAND_NUMBER_TO_CHART_NAME[i]
+            new_island_number = chart_name_to_island_number[original_chart_name]
+            charts_mapping.append(new_island_number)
+
+        # Output seed name and slot number to seed RNG in randomizer client.
+        output_data = {
+            "Version": list(VERSION),
+            "Seed": multiworld.seed_name,
+            "Slot": player,
+            "Name": self.player_name,
+            "Options": self.options.as_dict(*self.options_dataclass.type_hints),
+            "Required Bosses": self.boss_reqs.required_boss_item_locations,
+            "Locations": {},
+            "Entrances": {},
+            "Charts": charts_mapping,
+        }
+
+        # Output which item has been placed at each location.
+        output_locations = output_data["Locations"]
+        locations = multiworld.get_locations(player)
+        for location in locations:
+            if location.name != "Defeat Ganondorf":
+                if location.item:
+                    item_info = {
+                        "player": location.item.player,
+                        "name": location.item.name,
+                        "game": location.item.game,
+                        "classification": self._get_classification_name(location.item.classification),
+                    }
+                else:
+                    item_info = {"name": "Nothing", "game": "The Wind Waker", "classification": "filler"}
+                output_locations[location.name] = item_info
+
+        # Output the mapping of entrances to exits.
+        output_entrances = output_data["Entrances"]
+        for zone_entrance, zone_exit in self.entrances.done_entrances_to_exits.items():
+            output_entrances[zone_entrance.entrance_name] = zone_exit.unique_name
+
+        # Output the plando details to file.
+        aptww = TWWContainer(
+            path=os.path.join(
+                output_directory, f"{multiworld.get_out_file_name_base(player)}{TWWContainer.patch_file_ending}"
+            ),
+            player=player,
+            player_name=self.player_name,
+            data=output_data,
+        )
+        aptww.write()
+
+    def extend_hint_information(self, hint_data: dict[int, dict[int, str]]) -> None:
+        """
+        Fill in additional information text into locations, displayed when hinted.
+
+        :param hint_data: A dictionary of mapping a player ID to a dictionary mapping location IDs to the extra hint
+        information text. This dictionary should be modified as a side-effect of this method.
+        """
+        # Create a mapping of island names to numbers for sunken treasure hints.
+        island_name_to_number = {v: k for k, v in ISLAND_NUMBER_TO_NAME.items()}
+
+        hint_data[self.player] = {}
+        for location in self.multiworld.get_locations(self.player):
+            if location.address is not None and location.item is not None:
+                # Regardless of ER settings, always hint at the outermost entrance for every "interior" location.
+                zone_exit = self.entrances.get_zone_exit_for_item_location(location.name)
+                if zone_exit is not None:
+                    outermost_entrance = self.entrances.get_outermost_entrance_for_exit(zone_exit)
+                    assert outermost_entrance is not None and outermost_entrance.island_name is not None
+                    hint_data[self.player][location.address] = outermost_entrance.island_name
+
+                # Hint at which chart leads to the sunken treasure for these locations.
+                if location.name.endswith(" - Sunken Treasure"):
+                    island_name = location.name.removesuffix(" - Sunken Treasure")
+                    island_number = island_name_to_number[island_name]
+                    chart_name = self.charts.island_number_to_chart_name[island_number]
+                    hint_data[self.player][location.address] = chart_name
+
+    def create_item(self, name: str) -> TWWItem:
+        """
+        Create an item for this world type and player.
+
+        :param name: The name of the item to create.
+        :raises KeyError: If an invalid item name is provided.
+        """
+        if name in ITEM_TABLE:
+            return TWWItem(name, self.player, ITEM_TABLE[name], self.item_classification_overrides.get(name))
+        raise KeyError(f"Invalid item name: {name}")
+
+    def get_filler_item_name(self, strict: bool = True) -> str:
+        """
+        This method is called when the item pool needs to be filled with additional items to match the location count.
+
+        :param strict: Whether the item should be one strictly classified as filler. Defaults to `True`.
+        :return: The name of a filler item from this world.
+        """
+        # If there are still useful items to place, place those first.
+        if not strict and len(self.useful_pool) > 0:
+            return self.useful_pool.pop()
+
+        # If there are still vanilla filler items to place, place those first.
+        if len(self.filler_pool) > 0:
+            return self.filler_pool.pop()
+
+        # Use the same weights for filler items used in the base randomizer.
+        filler_consumables = ["Yellow Rupee", "Red Rupee", "Purple Rupee", "Joy Pendant"]
+        filler_weights = [3, 7, 10, 3]
+        if not strict:
+            filler_consumables.append("Orange Rupee")
+            filler_weights.append(15)
+        return self.multiworld.random.choices(filler_consumables, weights=filler_weights, k=1)[0]
+
+    def get_pre_fill_items(self) -> list[Item]:
+        """
+        Return items that need to be collected when creating a fresh `all_state` but don't exist in the multiworld's
+        item pool.
+
+        :return: A list of pre-fill items.
+        """
+        res = []
+        if self.dungeon_local_item_names:
+            for dungeon in self.dungeons.values():
+                for item in dungeon.all_items:
+                    if item.name in self.dungeon_local_item_names:
+                        res.append(item)
+        return res
+
+    def fill_slot_data(self) -> Mapping[str, Any]:
+        """
+        Return the `slot_data` field that will be in the `Connected` network package.
+
+        This is a way the generator can give custom data to the client.
+        The client will receive this as JSON in the `Connected` response.
+
+        :return: A dictionary to be sent to the client when it connects to the server.
+        """
+        slot_data = self.options.as_dict(*self.options_dataclass.type_hints)
+
+        # Add entrances to `slot_data`. This is the same data that is written to the .aptww file.
+        entrances = {
+            zone_entrance.entrance_name: zone_exit.unique_name
+            for zone_entrance, zone_exit in self.entrances.done_entrances_to_exits.items()
+        }
+        slot_data["entrances"] = entrances
+
+        return slot_data
diff --git a/worlds/tww/assets/icon.ico b/worlds/tww/assets/icon.ico
new file mode 100644
index 0000000000..e1e9ab32e4
Binary files /dev/null and b/worlds/tww/assets/icon.ico differ
diff --git a/worlds/tww/assets/icon.png b/worlds/tww/assets/icon.png
new file mode 100644
index 0000000000..a67e99a92d
Binary files /dev/null and b/worlds/tww/assets/icon.png differ
diff --git a/worlds/tww/docs/en_The Wind Waker.md b/worlds/tww/docs/en_The Wind Waker.md
new file mode 100644
index 0000000000..4d6e999cf9
--- /dev/null
+++ b/worlds/tww/docs/en_The Wind Waker.md	
@@ -0,0 +1,120 @@
+# The Wind Waker
+
+## Where is the options page?
+
+The [player options page for this game](../player-options) contains all the options you need to configure and export a
+config file.
+
+## What does randomization do to this game?
+
+Items get shuffled between the different locations in the game, so each playthrough is unique. Randomized locations
+include chests, items received from NPC, and treasure salvaged from the ocean floor. The randomizer also includes
+quality-of-life features such as a fully opened world, removing many cutscenes, increased sailing speed, and more.
+
+## Which locations get shuffled?
+
+Only locations put into logic by the world's settings will be randomized. The remaining locations in the game will have
+a yellow Rupee, which includes a message that the location is not randomized.
+
+## What is the goal of The Wind Waker?
+
+Reach and defeat Ganondorf atop Ganon's Tower. This will require all eight shards of the Triforce of Courage, the
+fully-powered Master Sword (unless it's swordless mode), Light Arrows, and any other items necessary to reach Ganondorf.
+
+## What does another world's item look like in TWW?
+
+Items belonging to other non-TWW worlds are represented by Father's Letter (the letter Medli gives you to give to
+Komali), an unused item in the randomizer.
+
+## When the player receives an item, what happens?
+
+When the player receives an item, it will automatically be added to Link's inventory. Unlike many other Zelda
+randomizers, Link **will not** hold the item above his head.
+
+## I need help! What do I do?
+
+Refer to the [FAQ](https://lagolunatic.github.io/wwrando/faq/) first. Then, try the troubleshooting steps in the
+[setup guide](/tutorial/The%20Wind%20Waker/setup/en). If you are still stuck, please ask in the Wind Waker channel in
+the Archipelago server.
+
+## Known issues
+
+- Randomized freestanding rupees, spoils, and bait will also be given to the player picking up the item. The item will
+  be sent properly, but the collecting player will receive an extra copy.
+- Demo items (items which are held over Link's head) which are **not** randomized, such as rupees from salvages from
+  random light rings or rewards from minigames, will not work.
+- Item get messages for progressive items received on locations that send earlier than intended will be incorrect. This
+  does not affect gameplay.
+- The Heart Piece count in item get messages will be off by one. This does not affect gameplay.
+- It has been reported that item links can be buggy. Nothing game-breaking, but do be aware of it.
+
+Feel free to report any other issues or suggest improvements in the Wind Waker channel in the Archipelago server!
+
+## Tips and Tricks
+
+### Where are dungeon secrets found in the dungeons?
+
+[This document](https://docs.google.com/document/d/1LrjGr6W9970XEA-pzl8OhwnqMqTbQaxCX--M-kdsLos/edit?usp=sharing) has
+images of each of the dungeon secrets.
+
+### What exactly do the obscure and precise difficulty options do?
+
+The `logic_obscurity` and `logic_precision` options modify the randomizer's logic to put various tricks and techniques
+into logic.
+[This document](https://docs.google.com/spreadsheets/d/14ToE1SvNr9yRRqU4GK2qxIsuDUs9Edegik3wUbLtzH8/edit?usp=sharing)
+neatly lists the changes that are made. The options are progressive, so, for instance, hard obscure difficulty includes
+both normal and hard obscure tricks. Some changes require a combination of both options. For example, to put having the
+Forsaken Fortress cannons blow the door up for you into logic requires both obscure and precise difficulty to be set to
+at least normal.
+
+### What are the different options presets?
+
+A few presets are available on the [player options page](../player-options) for your convenience.
+
+- **Tournament S7**: These are (as close to as possible) the settings used in the WWR Racing Server's
+  [Season 7 Tournament](https://docs.google.com/document/d/1mJj7an-DvpYilwNt-DdlFOy1fz5_NMZaPZvHeIekplc).
+  The preset features 3 required bosses and hard obscurity difficulty, and while the list of enabled progression options
+  may seem intimidating, the preset also excludes several locations.
+- **Miniblins 2025**: These are (as close to as possible) the settings used in the WWR Racing Server's
+  [2025 Season of Minblins](https://docs.google.com/document/d/19vT68eU6PepD2BD2ZjR9ikElfqs8pXfqQucZ-TcscV8). This
+  preset is great if you're new to Wind Waker! There aren't too many locations in the world, and you only need to
+  complete two dungeons. You also start with many convenience items, such as double magic, a capacity upgrade for your
+  bow and bombs, and six hearts.
+- **Mixed Pools**: These are the settings used in the WWR Racing Server's
+  [Mixed Pools Co-op Tournament](https://docs.google.com/document/d/1YGPTtEgP978TIi0PUAD792OtZbE2jBQpI8XCAy63qpg). This
+  preset features full entrance rando and includes many locations behind a randomized entrance. There are also a bunch
+  of overworld locations, as these settings were intended to be played in a two-person co-op team. The preset also has 6
+  required bosses, but since entrance pools are randomized, the bosses could be found anywhere! Check your Sea Chart to
+  find out which island the bosses are on.
+
+## Planned Features
+
+- Dynamic CTMC based on enabled options
+- Hint implementation from base randomizer (hint placement options and hint types)
+- Integration with Archipelago's hint system (e.g., auction hints)
+- EnergyLink support
+- Swift Sail logic as an option
+- Continued bugfixes
+
+## Credits
+
+This randomizer would not be possible without the help from:
+
+- BigSharkZ: (icon artwork)
+- Celeste (Maëlle): (logic and typo fixes, additional programming)
+- Chavu: (logic difficulty document)
+- CrainWWR: (multiworld and Dolphin memory assistance, additional programming)
+- Cyb3R: (reference for `TWWClient`)
+- DeamonHunter: (additional programming)
+- Dev5ter: (initial TWW AP implmentation)
+- Gamma / SageOfMirrors: (additional programming)
+- LagoLunatic: (base randomizer, additional assistance)
+- Lunix: (Linux support, additional programming)
+- Mysteryem: (tracker support, additional programming)
+- Necrofitz: (additional documentation)
+- Ouro: (tracker support)
+- tal (matzahTalSoup): (dungeon secrets guide)
+- Tubamann: (additional programming)
+
+The Archipelago logo © 2022 by Krista Corkos and Christopher Wilson, licensed under
+[CC BY-NC 4.0](http://creativecommons.org/licenses/by-nc/4.0/).
diff --git a/worlds/tww/docs/setup_en.md b/worlds/tww/docs/setup_en.md
new file mode 100644
index 0000000000..fa22b48bf8
--- /dev/null
+++ b/worlds/tww/docs/setup_en.md
@@ -0,0 +1,67 @@
+# Setup Guide for The Wind Waker Archipelago
+
+Welcome to The Wind Waker Archipelago! This guide will help you set up the randomizer and play your first multiworld.
+If you're playing The Wind Waker, you must follow a few simple steps to get started.
+
+## Requirements
+
+You'll need the following components to be able to play with The Wind Waker:
+* Install [Dolphin Emulator](https://dolphin-emu.org/download/). **We recommend using the latest release.**
+    * For Linux users, you can use the flatpak package
+    [available on Flathub](https://flathub.org/apps/org.DolphinEmu.dolphin-emu).
+* The 2.5.0 version of the [TWW AP Randomizer Build](https://github.com/tanjo3/wwrando/releases/tag/ap_2.5.0).
+* A The Wind Waker ISO (North American version), probably named "Legend of Zelda, The - The Wind Waker (USA).iso".
+
+Optionally, you can also download:
+* [Wind Waker Tracker](https://github.com/Mysteryem/ww-poptracker/releases/latest)
+  * Requires [PopTracker](https://github.com/black-sliver/PopTracker/releases)
+* [Custom Wind Waker Player Models](https://github.com/Sage-of-Mirrors/Custom-Wind-Waker-Player-Models)
+
+## Setting Up a YAML
+
+All players playing The Wind Waker must provide the room host with a YAML file containing the settings for their world.
+Visit the [The Wind Waker options page](/games/The%20Wind%20Waker/player-options) to generate a YAML with your desired
+options. Only locations categorized under the options enabled under "Progression Locations" will be randomized in your
+world. Once you're happy with your settings, provide the room host with your YAML file and proceed to the next step.
+
+## Connecting to a Room
+
+The multiworld host will provide you a link to download your `aptww` file or a zip file containing everyone's files. The
+`aptww` file should be named `P#_<name>_XXXXX.aptww`, where `#` is your player ID, `<name>` is your player name, and
+`XXXXX` is the room ID. The host should also provide you with the room's server name and port number.
+
+Once you do, follow these steps to connect to the room:
+1. Run the TWW AP Randomizer Build. If this is the first time you've opened the randomizer, you'll need to specify the
+path to your The Wind Waker ISO and the output folder for the randomized ISO. These will be saved for the next time you
+open the program.
+2. Modify any cosmetic convenience tweaks and player customization options as desired.
+3. For the APTWW file, browse and locate the path to your `aptww` file.
+4. Click `Randomize` at the bottom-right. This randomizes the ISO and puts it in the output folder you specified. The
+file will be named `TWW AP_YYYYY_P# (<name>).iso`, where `YYYYY` is the seed name, `#` is your player ID, and `<name>`
+is your player (slot) name. Verify that the values are correct for the multiworld.
+5. Open Dolphin and use it to open the randomized ISO.
+6. Start `ArchipelagoLauncher.exe` (without `.exe` on Linux) and choose `The Wind Waker Client`, which will open the
+text client. If Dolphin is not already open, or you have yet to start a new file, you will be prompted to do so.
+    * Once you've opened the ISO in Dolphin, the client should say "Dolphin connected successfully.".
+7. Connect to the room by entering the server name and port number at the top and pressing `Connect`. For rooms hosted
+on the website, this will be `archipelago.gg:<port>`, where `<port>` is the port number. If a game is hosted from the
+`ArchipelagoServer.exe` (without `.exe` on Linux), the port number will default to `38281` but may be changed in the
+`host.yaml`.
+8. If you've opened a ROM corresponding to the multiworld to which you are connected, it should authenticate your slot
+name automatically when you start a new save file.
+
+## Troubleshooting
+
+* Ensure you are running the same version of Archipelago on which the multiworld was generated.
+* Ensure `tww.apworld` is not in your Archipelago installation's `custom_worlds` folder.
+* Ensure you are using the correct randomizer build for the version of Archipelago you are using. The build should
+provide an error message directing you to the correct version. You can also look at the release notes of TWW AP builds
+[here](https://github.com/tanjo3/wwrando/releases) to see which versions of Archipelago each build is compatible with.
+* If you encounter issues with authenticating, ensure that the randomized ROM is open in Dolphin and corresponds to the
+multiworld to which you are connecting.
+* Ensure that you do not have any Dolphin cheats or codes enabled. Some cheats or codes can unexpectedly interfere with
+emulation and make troubleshooting errors difficult.
+* If you get an error message, ensure that `Enable Emulated Memory Size Override` in Dolphin (under `Options` >
+`Configuration` > `Advanced`) is **disabled**.
+* If you run with a custom GC boot menu, you'll need to skip it by going to `Options` > `Configuration` > `GameCube`
+and checking `Skip Main Menu`.
diff --git a/worlds/tww/randomizers/Charts.py b/worlds/tww/randomizers/Charts.py
new file mode 100644
index 0000000000..695f2dc0d2
--- /dev/null
+++ b/worlds/tww/randomizers/Charts.py
@@ -0,0 +1,125 @@
+from typing import TYPE_CHECKING
+
+from ..Items import ISLAND_NUMBER_TO_CHART_NAME
+from ..Locations import TWWFlag, TWWLocation
+
+if TYPE_CHECKING:
+    from .. import TWWWorld
+
+ISLAND_NUMBER_TO_NAME: dict[int, str] = {
+    1: "Forsaken Fortress Sector",
+    2: "Star Island",
+    3: "Northern Fairy Island",
+    4: "Gale Isle",
+    5: "Crescent Moon Island",
+    6: "Seven-Star Isles",
+    7: "Overlook Island",
+    8: "Four-Eye Reef",
+    9: "Mother and Child Isles",
+    10: "Spectacle Island",
+    11: "Windfall Island",
+    12: "Pawprint Isle",
+    13: "Dragon Roost Island",
+    14: "Flight Control Platform",
+    15: "Western Fairy Island",
+    16: "Rock Spire Isle",
+    17: "Tingle Island",
+    18: "Northern Triangle Island",
+    19: "Eastern Fairy Island",
+    20: "Fire Mountain",
+    21: "Star Belt Archipelago",
+    22: "Three-Eye Reef",
+    23: "Greatfish Isle",
+    24: "Cyclops Reef",
+    25: "Six-Eye Reef",
+    26: "Tower of the Gods Sector",
+    27: "Eastern Triangle Island",
+    28: "Thorned Fairy Island",
+    29: "Needle Rock Isle",
+    30: "Islet of Steel",
+    31: "Stone Watcher Island",
+    32: "Southern Triangle Island",
+    33: "Private Oasis",
+    34: "Bomb Island",
+    35: "Bird's Peak Rock",
+    36: "Diamond Steppe Island",
+    37: "Five-Eye Reef",
+    38: "Shark Island",
+    39: "Southern Fairy Island",
+    40: "Ice Ring Isle",
+    41: "Forest Haven",
+    42: "Cliff Plateau Isles",
+    43: "Horseshoe Island",
+    44: "Outset Island",
+    45: "Headstone Island",
+    46: "Two-Eye Reef",
+    47: "Angular Isles",
+    48: "Boating Course",
+    49: "Five-Star Isles",
+}
+
+
+class ChartRandomizer:
+    """
+    This class handles the randomization of charts.
+    Each chart points to a specific island on the map, and this randomizer shuffles these mappings.
+
+    :param world: The Wind Waker game world.
+    """
+
+    def __init__(self, world: "TWWWorld") -> None:
+        self.world = world
+        self.multiworld = world.multiworld
+
+        self.island_number_to_chart_name = ISLAND_NUMBER_TO_CHART_NAME.copy()
+
+    def setup_progress_sunken_treasure_locations(self) -> None:
+        """
+        Create the locations for sunken treasure locations and update them as progression and non-progression
+        appropriately. If the option is enabled, randomize which charts point to which sector.
+        """
+        options = self.world.options
+
+        original_item_names = list(self.island_number_to_chart_name.values())
+
+        # Shuffles the list of island numbers if charts are randomized.
+        # The shuffled island numbers determine which sector each chart points to.
+        shuffled_island_numbers = list(self.island_number_to_chart_name.keys())
+        if options.randomize_charts:
+            self.world.random.shuffle(shuffled_island_numbers)
+
+        for original_item_name in reversed(original_item_names):
+            # Assign each chart to its new island.
+            shuffled_island_number = shuffled_island_numbers.pop()
+            self.island_number_to_chart_name[shuffled_island_number] = original_item_name
+
+            # Additionally, determine if that location is a progress location or not.
+            island_name = ISLAND_NUMBER_TO_NAME[shuffled_island_number]
+            island_location = f"{island_name} - Sunken Treasure"
+            if options.progression_triforce_charts or options.progression_treasure_charts:
+                if original_item_name.startswith("Triforce Chart "):
+                    if options.progression_triforce_charts:
+                        self.world.progress_locations.add(island_location)
+                        self.world.nonprogress_locations.remove(island_location)
+                else:
+                    if options.progression_treasure_charts:
+                        self.world.progress_locations.add(island_location)
+                        self.world.nonprogress_locations.remove(island_location)
+            else:
+                self.world.nonprogress_locations.add(island_location)
+
+    def update_chart_location_flags(self) -> None:
+        """
+        Update the flags for sunken treasure locations based on the current chart mappings.
+        """
+        for shuffled_island_number, item_name in self.island_number_to_chart_name.items():
+            island_name = ISLAND_NUMBER_TO_NAME[shuffled_island_number]
+            island_location_str = f"{island_name} - Sunken Treasure"
+
+            if island_location_str in self.world.progress_locations:
+                island_location = self.world.get_location(island_location_str)
+                assert isinstance(island_location, TWWLocation)
+                if item_name.startswith("Triforce Chart "):
+                    island_location.flags = TWWFlag.TRI_CHT
+                else:
+                    island_location.flags = TWWFlag.TRE_CHT
diff --git a/worlds/tww/randomizers/Dungeons.py b/worlds/tww/randomizers/Dungeons.py
new file mode 100644
index 0000000000..3a009f78f7
--- /dev/null
+++ b/worlds/tww/randomizers/Dungeons.py
@@ -0,0 +1,284 @@
+from typing import TYPE_CHECKING, Any, Optional
+
+from BaseClasses import CollectionState, Item, Location, MultiWorld
+from Fill import fill_restrictive
+from worlds.generic.Rules import add_item_rule
+
+from ..Items import item_factory
+
+if TYPE_CHECKING:
+    from .. import TWWWorld
+
+
+class Dungeon:
+    """
+    This class represents a dungeon in The Wind Waker, including its dungeon items.
+
+    :param name: The name of the dungeon.
+    :param big_key: The big key item for the dungeon.
+    :param small_keys: A list of small key items for the dungeon.
+    :param dungeon_items: A list of other items specific to the dungeon.
+    :param player: The ID of the player associated with the dungeon.
+    """
+
+    def __init__(
+        self,
+        name: str,
+        big_key: Optional[Item],
+        small_keys: list[Item],
+        dungeon_items: list[Item],
+        player: int,
+    ):
+        self.name = name
+        self.big_key = big_key
+        self.small_keys = small_keys
+        self.dungeon_items = dungeon_items
+        self.player = player
+
+    @property
+    def keys(self) -> list[Item]:
+        """
+        Retrieve all the keys for the dungeon.
+
+        :return: A list of Small Keys and the Big Key (if it exists).
+        """
+        return self.small_keys + ([self.big_key] if self.big_key else [])
+
+    @property
+    def all_items(self) -> list[Item]:
+        """
+        Retrieve all items associated with the dungeon.
+
+        :return: A list of all items associated with the dungeon.
+        """
+        return self.dungeon_items + self.keys
+
+    def __eq__(self, other: Any) -> bool:
+        """
+        Check equality between this dungeon and another object.
+
+        :param other: The object to compare.
+        :return: `True` if the other object is a Dungeon with the same name and player, `False` otherwise.
+        """
+        if isinstance(other, Dungeon):
+            return self.name == other.name and self.player == other.player
+        return False
+
+    def __repr__(self) -> str:
+        """
+        Provide a string representation of the dungeon.
+
+        :return: A string representing the dungeon.
+        """
+        return self.__str__()
+
+    def __str__(self) -> str:
+        """
+        Convert the dungeon to a human-readable string.
+
+        :return: A string in the format "<name> (Player <player>)".
+        """
+        return f"{self.name} (Player {self.player})"
+
+
+def create_dungeons(world: "TWWWorld") -> None:
+    """
+    Create and assign dungeons to the given world based on game options.
+
+    :param world: The Wind Waker game world.
+    """
+    player = world.player
+    options = world.options
+
+    def make_dungeon(name: str, big_key: Optional[Item], small_keys: list[Item], dungeon_items: list[Item]) -> Dungeon:
+        dungeon = Dungeon(name, big_key, small_keys, dungeon_items, player)
+        for item in dungeon.all_items:
+            item.dungeon = dungeon
+        return dungeon
+
+    if options.progression_dungeons:
+        if not options.required_bosses or "Dragon Roost Cavern" in world.boss_reqs.required_dungeons:
+            world.dungeons["Dragon Roost Cavern"] = make_dungeon(
+                "Dragon Roost Cavern",
+                item_factory("DRC Big Key", world),
+                item_factory(["DRC Small Key"] * 4, world),
+                item_factory(["DRC Dungeon Map", "DRC Compass"], world),
+            )
+
+        if not options.required_bosses or "Forbidden Woods" in world.boss_reqs.required_dungeons:
+            world.dungeons["Forbidden Woods"] = make_dungeon(
+                "Forbidden Woods",
+                item_factory("FW Big Key", world),
+                item_factory(["FW Small Key"] * 1, world),
+                item_factory(["FW Dungeon Map", "FW Compass"], world),
+            )
+
+        if not options.required_bosses or "Tower of the Gods" in world.boss_reqs.required_dungeons:
+            world.dungeons["Tower of the Gods"] = make_dungeon(
+                "Tower of the Gods",
+                item_factory("TotG Big Key", world),
+                item_factory(["TotG Small Key"] * 2, world),
+                item_factory(["TotG Dungeon Map", "TotG Compass"], world),
+            )
+
+        if not options.required_bosses or "Forsaken Fortress" in world.boss_reqs.required_dungeons:
+            world.dungeons["Forsaken Fortress"] = make_dungeon(
+                "Forsaken Fortress",
+                None,
+                [],
+                item_factory(["FF Dungeon Map", "FF Compass"], world),
+            )
+
+        if not options.required_bosses or "Earth Temple" in world.boss_reqs.required_dungeons:
+            world.dungeons["Earth Temple"] = make_dungeon(
+                "Earth Temple",
+                item_factory("ET Big Key", world),
+                item_factory(["ET Small Key"] * 3, world),
+                item_factory(["ET Dungeon Map", "ET Compass"], world),
+            )
+
+        if not options.required_bosses or "Wind Temple" in world.boss_reqs.required_dungeons:
+            world.dungeons["Wind Temple"] = make_dungeon(
+                "Wind Temple",
+                item_factory("WT Big Key", world),
+                item_factory(["WT Small Key"] * 2, world),
+                item_factory(["WT Dungeon Map", "WT Compass"], world),
+            )
+
+
+def get_dungeon_item_pool(multiworld: MultiWorld) -> list[Item]:
+    """
+    Retrieve the item pool for all The Wind Waker dungeons in the multiworld.
+
+    :param multiworld: The MultiWorld instance.
+    :return: List of dungeon items across all The Wind Waker dungeons.
+    """
+    return [
+        item for world in multiworld.get_game_worlds("The Wind Waker") for item in get_dungeon_item_pool_player(world)
+    ]
+
+
+def get_dungeon_item_pool_player(world: "TWWWorld") -> list[Item]:
+    """
+    Retrieve the item pool for all dungeons specific to a player.
+
+    :param world: The Wind Waker game world.
+    :return: List of items in the player's dungeons.
+    """
+    return [item for dungeon in world.dungeons.values() for item in dungeon.all_items]
+
+
+def get_unfilled_dungeon_locations(multiworld: MultiWorld) -> list[Location]:
+    """
+    Retrieve all unfilled The Wind Waker dungeon locations in the multiworld.
+
+    :param multiworld: The MultiWorld instance.
+    :return: List of unfilled The Wind Waker dungeon locations.
+    """
+    return [
+        location
+        for world in multiworld.get_game_worlds("The Wind Waker")
+        for location in multiworld.get_locations(world.player)
+        if location.dungeon and not location.item
+    ]
+
+
+def modify_dungeon_location_rules(multiworld: MultiWorld) -> None:
+    """
+    Modify the rules for The Wind Waker dungeon locations based on specific player-requested constraints.
+
+    :param multiworld: The MultiWorld instance.
+    """
+    localized: set[tuple[int, str]] = set()
+    dungeon_specific: set[tuple[int, str]] = set()
+    for subworld in multiworld.get_game_worlds("The Wind Waker"):
+        player = subworld.player
+        if player not in multiworld.groups:
+            localized |= {(player, item_name) for item_name in subworld.dungeon_local_item_names}
+            dungeon_specific |= {(player, item_name) for item_name in subworld.dungeon_specific_item_names}
+
+    if localized:
+        in_dungeon_items = [item for item in get_dungeon_item_pool(multiworld) if (item.player, item.name) in localized]
+        if in_dungeon_items:
+            locations = [location for location in get_unfilled_dungeon_locations(multiworld)]
+
+            for location in locations:
+                if dungeon_specific:
+                    # Special case: If Dragon Roost Cavern has its own small keys, then ensure the first chest isn't the
+                    # Big Key. This is to avoid placing the Big Key there during fill and resulting in a costly swap.
+                    if location.name == "Dragon Roost Cavern - First Room":
+                        add_item_rule(
+                            location,
+                            lambda item: item.name != "DRC Big Key"
+                            or (item.player, "DRC Small Key") in dungeon_specific,
+                        )
+
+                    # Add item rule to ensure dungeon items are in their own dungeon when they should be.
+                    add_item_rule(
+                        location,
+                        lambda item, dungeon=location.dungeon: not (item.player, item.name) in dungeon_specific
+                        or item.dungeon is dungeon,
+                    )
+
+
+def fill_dungeons_restrictive(multiworld: MultiWorld) -> None:
+    """
+    Correctly fill The Wind Waker dungeons in the multiworld.
+
+    :param multiworld: The MultiWorld instance.
+    """
+    localized: set[tuple[int, str]] = set()
+    dungeon_specific: set[tuple[int, str]] = set()
+    for subworld in multiworld.get_game_worlds("The Wind Waker"):
+        player = subworld.player
+        if player not in multiworld.groups:
+            localized |= {(player, item_name) for item_name in subworld.dungeon_local_item_names}
+            dungeon_specific |= {(player, item_name) for item_name in subworld.dungeon_specific_item_names}
+
+    if localized:
+        in_dungeon_items = [item for item in get_dungeon_item_pool(multiworld) if (item.player, item.name) in localized]
+        if in_dungeon_items:
+            locations = [location for location in get_unfilled_dungeon_locations(multiworld)]
+            multiworld.random.shuffle(locations)
+
+            # Dungeon-locked items have to be placed first so as not to run out of space for dungeon-locked items.
+            # Subsort in the order Big Key, Small Key, Other before placing dungeon items.
+            sort_order = {"Big Key": 3, "Small Key": 2}
+            in_dungeon_items.sort(
+                key=lambda item: sort_order.get(item.type, 1)
+                + (5 if (item.player, item.name) in dungeon_specific else 0)
+            )
+
+            # Construct a partial `all_state` that contains only the items from `get_pre_fill_items` that aren't in a
+            # dungeon.
+            in_dungeon_player_ids = {item.player for item in in_dungeon_items}
+            all_state_base = CollectionState(multiworld)
+            for item in multiworld.itempool:
+                multiworld.worlds[item.player].collect(all_state_base, item)
+            pre_fill_items = []
+            for player in in_dungeon_player_ids:
+                pre_fill_items += multiworld.worlds[player].get_pre_fill_items()
+            for item in in_dungeon_items:
+                try:
+                    pre_fill_items.remove(item)
+                except ValueError:
+                    # `pre_fill_items` should be a subset of `in_dungeon_items`, but just in case.
+                    pass
+            for item in pre_fill_items:
+                multiworld.worlds[item.player].collect(all_state_base, item)
+            all_state_base.sweep_for_advancements()
+
+            # Remove the completion condition so that minimal-accessibility words place keys correctly.
+            for player in (item.player for item in in_dungeon_items):
+                if all_state_base.has("Victory", player):
+                    all_state_base.remove(multiworld.worlds[player].create_item("Victory"))
+
+            fill_restrictive(
+                multiworld,
+                all_state_base,
+                locations,
+                in_dungeon_items,
+                lock=True,
+                allow_excluded=True,
+                name="TWW Dungeon Items",
+            )
diff --git a/worlds/tww/randomizers/Entrances.py b/worlds/tww/randomizers/Entrances.py
new file mode 100644
index 0000000000..6a0683972a
--- /dev/null
+++ b/worlds/tww/randomizers/Entrances.py
@@ -0,0 +1,878 @@
+from collections import defaultdict
+from collections.abc import Generator
+from dataclasses import dataclass
+from typing import TYPE_CHECKING, ClassVar, Optional
+
+from Fill import FillError
+from Options import OptionError
+
+from .. import Macros
+from ..Locations import LOCATION_TABLE, TWWFlag, split_location_name_by_zone
+
+if TYPE_CHECKING:
+    from .. import TWWWorld
+
+
+@dataclass(frozen=True)
+class ZoneEntrance:
+    """
+    A data class that encapsulates information about a zone entrance.
+    """
+
+    entrance_name: str
+    island_name: Optional[str] = None
+    nested_in: Optional["ZoneExit"] = None
+
+    @property
+    def is_nested(self) -> bool:
+        """
+        Determine if this entrance is nested within another entrance.
+
+        :return: `True` if the entrance is nested, `False` otherwise.
+        """
+        return self.nested_in is not None
+
+    def __repr__(self) -> str:
+        """
+        Provide a string representation of the zone exit.
+
+        :return: A string representing the zone exit.
+        """
+        return f"ZoneEntrance('{self.entrance_name}')"
+
+    all: ClassVar[dict[str, "ZoneEntrance"]] = {}
+
+    def __post_init__(self) -> None:
+        ZoneEntrance.all[self.entrance_name] = self
+
+        # Must be an island entrance XOR must be a nested entrance.
+        assert (self.island_name is None) ^ (self.nested_in is None)
+
+
+@dataclass(frozen=True)
+class ZoneExit:
+    """
+    A data class that encapsulates information about a zone exit.
+    """
+
+    unique_name: str
+    zone_name: Optional[str] = None
+
+    def __repr__(self) -> str:
+        """
+        Provide a string representation of the zone exit.
+
+        :return: A string representing the zone exit.
+        """
+        return f"ZoneExit('{self.unique_name}')"
+
+    all: ClassVar[dict[str, "ZoneExit"]] = {}
+
+    def __post_init__(self) -> None:
+        ZoneExit.all[self.unique_name] = self
+
+
+DUNGEON_ENTRANCES: list[ZoneEntrance] = [
+    ZoneEntrance("Dungeon Entrance on Dragon Roost Island", "Dragon Roost Island"),
+    ZoneEntrance("Dungeon Entrance in Forest Haven Sector", "Forest Haven"),
+    ZoneEntrance("Dungeon Entrance in Tower of the Gods Sector", "Tower of the Gods Sector"),
+    ZoneEntrance("Dungeon Entrance on Headstone Island", "Headstone Island"),
+    ZoneEntrance("Dungeon Entrance on Gale Isle", "Gale Isle"),
+]
+DUNGEON_EXITS: list[ZoneExit] = [
+    ZoneExit("Dragon Roost Cavern", "Dragon Roost Cavern"),
+    ZoneExit("Forbidden Woods", "Forbidden Woods"),
+    ZoneExit("Tower of the Gods", "Tower of the Gods"),
+    ZoneExit("Earth Temple", "Earth Temple"),
+    ZoneExit("Wind Temple", "Wind Temple"),
+]
+
+MINIBOSS_ENTRANCES: list[ZoneEntrance] = [
+    ZoneEntrance("Miniboss Entrance in Forbidden Woods", nested_in=ZoneExit.all["Forbidden Woods"]),
+    ZoneEntrance("Miniboss Entrance in Tower of the Gods", nested_in=ZoneExit.all["Tower of the Gods"]),
+    ZoneEntrance("Miniboss Entrance in Earth Temple", nested_in=ZoneExit.all["Earth Temple"]),
+    ZoneEntrance("Miniboss Entrance in Wind Temple", nested_in=ZoneExit.all["Wind Temple"]),
+    ZoneEntrance("Miniboss Entrance in Hyrule Castle", "Tower of the Gods Sector"),
+]
+MINIBOSS_EXITS: list[ZoneExit] = [
+    ZoneExit("Forbidden Woods Miniboss Arena"),
+    ZoneExit("Tower of the Gods Miniboss Arena"),
+    ZoneExit("Earth Temple Miniboss Arena"),
+    ZoneExit("Wind Temple Miniboss Arena"),
+    ZoneExit("Master Sword Chamber"),
+]
+
+BOSS_ENTRANCES: list[ZoneEntrance] = [
+    ZoneEntrance("Boss Entrance in Dragon Roost Cavern", nested_in=ZoneExit.all["Dragon Roost Cavern"]),
+    ZoneEntrance("Boss Entrance in Forbidden Woods", nested_in=ZoneExit.all["Forbidden Woods"]),
+    ZoneEntrance("Boss Entrance in Tower of the Gods", nested_in=ZoneExit.all["Tower of the Gods"]),
+    ZoneEntrance("Boss Entrance in Forsaken Fortress", "Forsaken Fortress Sector"),
+    ZoneEntrance("Boss Entrance in Earth Temple", nested_in=ZoneExit.all["Earth Temple"]),
+    ZoneEntrance("Boss Entrance in Wind Temple", nested_in=ZoneExit.all["Wind Temple"]),
+]
+BOSS_EXITS: list[ZoneExit] = [
+    ZoneExit("Gohma Boss Arena"),
+    ZoneExit("Kalle Demos Boss Arena"),
+    ZoneExit("Gohdan Boss Arena"),
+    ZoneExit("Helmaroc King Boss Arena"),
+    ZoneExit("Jalhalla Boss Arena"),
+    ZoneExit("Molgera Boss Arena"),
+]
+
+SECRET_CAVE_ENTRANCES: list[ZoneEntrance] = [
+    ZoneEntrance("Secret Cave Entrance on Outset Island", "Outset Island"),
+    ZoneEntrance("Secret Cave Entrance on Dragon Roost Island", "Dragon Roost Island"),
+    ZoneEntrance("Secret Cave Entrance on Fire Mountain", "Fire Mountain"),
+    ZoneEntrance("Secret Cave Entrance on Ice Ring Isle", "Ice Ring Isle"),
+    ZoneEntrance("Secret Cave Entrance on Private Oasis", "Private Oasis"),
+    ZoneEntrance("Secret Cave Entrance on Needle Rock Isle", "Needle Rock Isle"),
+    ZoneEntrance("Secret Cave Entrance on Angular Isles", "Angular Isles"),
+    ZoneEntrance("Secret Cave Entrance on Boating Course", "Boating Course"),
+    ZoneEntrance("Secret Cave Entrance on Stone Watcher Island", "Stone Watcher Island"),
+    ZoneEntrance("Secret Cave Entrance on Overlook Island", "Overlook Island"),
+    ZoneEntrance("Secret Cave Entrance on Bird's Peak Rock", "Bird's Peak Rock"),
+    ZoneEntrance("Secret Cave Entrance on Pawprint Isle", "Pawprint Isle"),
+    ZoneEntrance("Secret Cave Entrance on Pawprint Isle Side Isle", "Pawprint Isle"),
+    ZoneEntrance("Secret Cave Entrance on Diamond Steppe Island", "Diamond Steppe Island"),
+    ZoneEntrance("Secret Cave Entrance on Bomb Island", "Bomb Island"),
+    ZoneEntrance("Secret Cave Entrance on Rock Spire Isle", "Rock Spire Isle"),
+    ZoneEntrance("Secret Cave Entrance on Shark Island", "Shark Island"),
+    ZoneEntrance("Secret Cave Entrance on Cliff Plateau Isles", "Cliff Plateau Isles"),
+    ZoneEntrance("Secret Cave Entrance on Horseshoe Island", "Horseshoe Island"),
+    ZoneEntrance("Secret Cave Entrance on Star Island", "Star Island"),
+]
+SECRET_CAVE_EXITS: list[ZoneExit] = [
+    ZoneExit("Savage Labyrinth", zone_name="Outset Island"),
+    ZoneExit("Dragon Roost Island Secret Cave", zone_name="Dragon Roost Island"),
+    ZoneExit("Fire Mountain Secret Cave", zone_name="Fire Mountain"),
+    ZoneExit("Ice Ring Isle Secret Cave", zone_name="Ice Ring Isle"),
+    ZoneExit("Cabana Labyrinth", zone_name="Private Oasis"),
+    ZoneExit("Needle Rock Isle Secret Cave", zone_name="Needle Rock Isle"),
+    ZoneExit("Angular Isles Secret Cave", zone_name="Angular Isles"),
+    ZoneExit("Boating Course Secret Cave", zone_name="Boating Course"),
+    ZoneExit("Stone Watcher Island Secret Cave", zone_name="Stone Watcher Island"),
+    ZoneExit("Overlook Island Secret Cave", zone_name="Overlook Island"),
+    ZoneExit("Bird's Peak Rock Secret Cave", zone_name="Bird's Peak Rock"),
+    ZoneExit("Pawprint Isle Chuchu Cave", zone_name="Pawprint Isle"),
+    ZoneExit("Pawprint Isle Wizzrobe Cave"),
+    ZoneExit("Diamond Steppe Island Warp Maze Cave", zone_name="Diamond Steppe Island"),
+    ZoneExit("Bomb Island Secret Cave", zone_name="Bomb Island"),
+    ZoneExit("Rock Spire Isle Secret Cave", zone_name="Rock Spire Isle"),
+    ZoneExit("Shark Island Secret Cave", zone_name="Shark Island"),
+    ZoneExit("Cliff Plateau Isles Secret Cave", zone_name="Cliff Plateau Isles"),
+    ZoneExit("Horseshoe Island Secret Cave", zone_name="Horseshoe Island"),
+    ZoneExit("Star Island Secret Cave", zone_name="Star Island"),
+]
+
+SECRET_CAVE_INNER_ENTRANCES: list[ZoneEntrance] = [
+    ZoneEntrance("Inner Entrance in Ice Ring Isle Secret Cave", nested_in=ZoneExit.all["Ice Ring Isle Secret Cave"]),
+    ZoneEntrance(
+        "Inner Entrance in Cliff Plateau Isles Secret Cave", nested_in=ZoneExit.all["Cliff Plateau Isles Secret Cave"]
+    ),
+]
+SECRET_CAVE_INNER_EXITS: list[ZoneExit] = [
+    ZoneExit("Ice Ring Isle Inner Cave"),
+    ZoneExit("Cliff Plateau Isles Inner Cave"),
+]
+
+FAIRY_FOUNTAIN_ENTRANCES: list[ZoneEntrance] = [
+    ZoneEntrance("Fairy Fountain Entrance on Outset Island", "Outset Island"),
+    ZoneEntrance("Fairy Fountain Entrance on Thorned Fairy Island", "Thorned Fairy Island"),
+    ZoneEntrance("Fairy Fountain Entrance on Eastern Fairy Island", "Eastern Fairy Island"),
+    ZoneEntrance("Fairy Fountain Entrance on Western Fairy Island", "Western Fairy Island"),
+    ZoneEntrance("Fairy Fountain Entrance on Southern Fairy Island", "Southern Fairy Island"),
+    ZoneEntrance("Fairy Fountain Entrance on Northern Fairy Island", "Northern Fairy Island"),
+]
+FAIRY_FOUNTAIN_EXITS: list[ZoneExit] = [
+    ZoneExit("Outset Fairy Fountain"),
+    ZoneExit("Thorned Fairy Fountain", zone_name="Thorned Fairy Island"),
+    ZoneExit("Eastern Fairy Fountain", zone_name="Eastern Fairy Island"),
+    ZoneExit("Western Fairy Fountain", zone_name="Western Fairy Island"),
+    ZoneExit("Southern Fairy Fountain", zone_name="Southern Fairy Island"),
+    ZoneExit("Northern Fairy Fountain", zone_name="Northern Fairy Island"),
+]
+
+DUNGEON_INNER_EXITS: list[ZoneExit] = (
+    MINIBOSS_EXITS
+    + BOSS_EXITS
+)
+
+ALL_ENTRANCES: list[ZoneEntrance] = (
+    DUNGEON_ENTRANCES
+    + MINIBOSS_ENTRANCES
+    + BOSS_ENTRANCES
+    + SECRET_CAVE_ENTRANCES
+    + SECRET_CAVE_INNER_ENTRANCES
+    + FAIRY_FOUNTAIN_ENTRANCES
+)
+ALL_EXITS: list[ZoneExit] = (
+    DUNGEON_EXITS
+    + MINIBOSS_EXITS
+    + BOSS_EXITS
+    + SECRET_CAVE_EXITS
+    + SECRET_CAVE_INNER_EXITS
+    + FAIRY_FOUNTAIN_EXITS
+)
+
+ENTRANCE_RANDOMIZABLE_ITEM_LOCATION_TYPES: list[TWWFlag] = [
+    TWWFlag.DUNGEON,
+    TWWFlag.PZL_CVE,
+    TWWFlag.CBT_CVE,
+    TWWFlag.SAVAGE,
+    TWWFlag.GRT_FRY,
+]
+ITEM_LOCATION_NAME_TO_EXIT_OVERRIDES: dict[str, ZoneExit] = {
+  "Forbidden Woods - Mothula Miniboss Room":           ZoneExit.all["Forbidden Woods Miniboss Arena"],
+  "Tower of the Gods - Darknut Miniboss Room":         ZoneExit.all["Tower of the Gods Miniboss Arena"],
+  "Earth Temple - Stalfos Miniboss Room":              ZoneExit.all["Earth Temple Miniboss Arena"],
+  "Wind Temple - Wizzrobe Miniboss Room":              ZoneExit.all["Wind Temple Miniboss Arena"],
+  "Hyrule - Master Sword Chamber":                     ZoneExit.all["Master Sword Chamber"],
+
+  "Dragon Roost Cavern - Gohma Heart Container":       ZoneExit.all["Gohma Boss Arena"],
+  "Forbidden Woods - Kalle Demos Heart Container":     ZoneExit.all["Kalle Demos Boss Arena"],
+  "Tower of the Gods - Gohdan Heart Container":        ZoneExit.all["Gohdan Boss Arena"],
+  "Forsaken Fortress - Helmaroc King Heart Container": ZoneExit.all["Helmaroc King Boss Arena"],
+  "Earth Temple - Jalhalla Heart Container":           ZoneExit.all["Jalhalla Boss Arena"],
+  "Wind Temple - Molgera Heart Container":             ZoneExit.all["Molgera Boss Arena"],
+
+  "Pawprint Isle - Wizzrobe Cave":                     ZoneExit.all["Pawprint Isle Wizzrobe Cave"],
+
+  "Ice Ring Isle - Inner Cave - Chest":                ZoneExit.all["Ice Ring Isle Inner Cave"],
+  "Cliff Plateau Isles - Highest Isle":                ZoneExit.all["Cliff Plateau Isles Inner Cave"],
+
+  "Outset Island - Great Fairy":                       ZoneExit.all["Outset Fairy Fountain"],
+}
+
+MINIBOSS_EXIT_TO_DUNGEON: dict[str, str] = {
+    "Forbidden Woods Miniboss Arena":   "Forbidden Woods",
+    "Tower of the Gods Miniboss Arena": "Tower of the Gods",
+    "Earth Temple Miniboss Arena":      "Earth Temple",
+    "Wind Temple Miniboss Arena":       "Wind Temple",
+}
+
+BOSS_EXIT_TO_DUNGEON: dict[str, str] = {
+    "Gohma Boss Arena":         "Dragon Roost Cavern",
+    "Kalle Demos Boss Arena":   "Forbidden Woods",
+    "Gohdan Boss Arena":        "Tower of the Gods",
+    "Helmaroc King Boss Arena": "Forsaken Fortress",
+    "Jalhalla Boss Arena":      "Earth Temple",
+    "Molgera Boss Arena":       "Wind Temple",
+}
+
+VANILLA_ENTRANCES_TO_EXITS: dict[str, str] = {
+    "Dungeon Entrance on Dragon Roost Island": "Dragon Roost Cavern",
+    "Dungeon Entrance in Forest Haven Sector": "Forbidden Woods",
+    "Dungeon Entrance in Tower of the Gods Sector": "Tower of the Gods",
+    "Dungeon Entrance on Headstone Island": "Earth Temple",
+    "Dungeon Entrance on Gale Isle": "Wind Temple",
+
+    "Miniboss Entrance in Forbidden Woods": "Forbidden Woods Miniboss Arena",
+    "Miniboss Entrance in Tower of the Gods": "Tower of the Gods Miniboss Arena",
+    "Miniboss Entrance in Earth Temple": "Earth Temple Miniboss Arena",
+    "Miniboss Entrance in Wind Temple": "Wind Temple Miniboss Arena",
+    "Miniboss Entrance in Hyrule Castle": "Master Sword Chamber",
+
+    "Boss Entrance in Dragon Roost Cavern": "Gohma Boss Arena",
+    "Boss Entrance in Forbidden Woods": "Kalle Demos Boss Arena",
+    "Boss Entrance in Tower of the Gods": "Gohdan Boss Arena",
+    "Boss Entrance in Forsaken Fortress": "Helmaroc King Boss Arena",
+    "Boss Entrance in Earth Temple": "Jalhalla Boss Arena",
+    "Boss Entrance in Wind Temple": "Molgera Boss Arena",
+
+    "Secret Cave Entrance on Outset Island": "Savage Labyrinth",
+    "Secret Cave Entrance on Dragon Roost Island": "Dragon Roost Island Secret Cave",
+    "Secret Cave Entrance on Fire Mountain": "Fire Mountain Secret Cave",
+    "Secret Cave Entrance on Ice Ring Isle": "Ice Ring Isle Secret Cave",
+    "Secret Cave Entrance on Private Oasis": "Cabana Labyrinth",
+    "Secret Cave Entrance on Needle Rock Isle": "Needle Rock Isle Secret Cave",
+    "Secret Cave Entrance on Angular Isles": "Angular Isles Secret Cave",
+    "Secret Cave Entrance on Boating Course": "Boating Course Secret Cave",
+    "Secret Cave Entrance on Stone Watcher Island": "Stone Watcher Island Secret Cave",
+    "Secret Cave Entrance on Overlook Island": "Overlook Island Secret Cave",
+    "Secret Cave Entrance on Bird's Peak Rock": "Bird's Peak Rock Secret Cave",
+    "Secret Cave Entrance on Pawprint Isle": "Pawprint Isle Chuchu Cave",
+    "Secret Cave Entrance on Pawprint Isle Side Isle": "Pawprint Isle Wizzrobe Cave",
+    "Secret Cave Entrance on Diamond Steppe Island": "Diamond Steppe Island Warp Maze Cave",
+    "Secret Cave Entrance on Bomb Island": "Bomb Island Secret Cave",
+    "Secret Cave Entrance on Rock Spire Isle": "Rock Spire Isle Secret Cave",
+    "Secret Cave Entrance on Shark Island": "Shark Island Secret Cave",
+    "Secret Cave Entrance on Cliff Plateau Isles": "Cliff Plateau Isles Secret Cave",
+    "Secret Cave Entrance on Horseshoe Island": "Horseshoe Island Secret Cave",
+    "Secret Cave Entrance on Star Island": "Star Island Secret Cave",
+
+    "Inner Entrance in Ice Ring Isle Secret Cave": "Ice Ring Isle Inner Cave",
+    "Inner Entrance in Cliff Plateau Isles Secret Cave": "Cliff Plateau Isles Inner Cave",
+
+    "Fairy Fountain Entrance on Outset Island": "Outset Fairy Fountain",
+    "Fairy Fountain Entrance on Thorned Fairy Island": "Thorned Fairy Fountain",
+    "Fairy Fountain Entrance on Eastern Fairy Island": "Eastern Fairy Fountain",
+    "Fairy Fountain Entrance on Western Fairy Island": "Western Fairy Fountain",
+    "Fairy Fountain Entrance on Southern Fairy Island": "Southern Fairy Fountain",
+    "Fairy Fountain Entrance on Northern Fairy Island": "Northern Fairy Fountain",
+}
+
+
+class EntranceRandomizer:
+    """
+    This class handles the logic for The Wind Waker entrance randomizer.
+
+    We reference the logic from the base randomizer with some modifications to suit it for Archipelago.
+    Reference: https://github.com/LagoLunatic/wwrando/blob/master/randomizers/entrances.py
+
+    :param world: The Wind Waker game world.
+    """
+
+    def __init__(self, world: "TWWWorld"):
+        self.world = world
+        self.multiworld = world.multiworld
+        self.player = world.player
+
+        self.item_location_to_containing_zone_exit: dict[str, ZoneExit] = {}
+        self.zone_exit_to_logically_dependent_item_locations: dict[ZoneExit, list[str]] = defaultdict(list)
+        self.register_mappings_between_item_locations_and_zone_exits()
+
+        self.done_entrances_to_exits: dict[ZoneEntrance, ZoneExit] = {}
+        self.done_exits_to_entrances: dict[ZoneExit, ZoneEntrance] = {}
+
+        for entrance_name, exit_name in VANILLA_ENTRANCES_TO_EXITS.items():
+            zone_entrance = ZoneEntrance.all[entrance_name]
+            zone_exit = ZoneExit.all[exit_name]
+            self.done_entrances_to_exits[zone_entrance] = zone_exit
+            self.done_exits_to_entrances[zone_exit] = zone_entrance
+
+        self.banned_exits: list[ZoneExit] = []
+        self.islands_with_a_banned_dungeon: set[str] = set()
+
+    def randomize_entrances(self) -> None:
+        """
+        Randomize entrances for The Wind Waker.
+        """
+        self.init_banned_exits()
+
+        for relevant_entrances, relevant_exits in self.get_all_entrance_sets_to_be_randomized():
+            self.randomize_one_set_of_entrances(relevant_entrances, relevant_exits)
+
+        self.finalize_all_randomized_sets_of_entrances()
+
+    def init_banned_exits(self) -> None:
+        """
+        Initialize the list of banned exits for the randomizer.
+
+        Dungeon exits in banned dungeons should be prohibited from being randomized.
+        Additionally, if dungeon entrances are not randomized, we can now note which island holds these banned dungeons.
+        """
+        options = self.world.options
+
+        if options.required_bosses:
+            for zone_exit in BOSS_EXITS:
+                assert zone_exit.unique_name.endswith(" Boss Arena")
+                boss_name = zone_exit.unique_name.removesuffix(" Boss Arena")
+                if boss_name in self.world.boss_reqs.banned_bosses:
+                    self.banned_exits.append(zone_exit)
+            for zone_exit in DUNGEON_EXITS:
+                dungeon_name = zone_exit.unique_name
+                if dungeon_name in self.world.boss_reqs.banned_dungeons:
+                    self.banned_exits.append(zone_exit)
+            for zone_exit in MINIBOSS_EXITS:
+                if zone_exit == ZoneExit.all["Master Sword Chamber"]:
+                    # Hyrule cannot be chosen as a banned dungeon.
+                    continue
+                assert zone_exit.unique_name.endswith(" Miniboss Arena")
+                dungeon_name = zone_exit.unique_name.removesuffix(" Miniboss Arena")
+                if dungeon_name in self.world.boss_reqs.banned_dungeons:
+                    self.banned_exits.append(zone_exit)
+
+        if not options.randomize_dungeon_entrances:
+            # If dungeon entrances are not randomized, `islands_with_a_banned_dungeon` can be initialized early since
+            # it's preset and won't be updated later since we won't randomize the dungeon entrances.
+            for en in DUNGEON_ENTRANCES:
+                if self.done_entrances_to_exits[en].unique_name in self.world.boss_reqs.banned_dungeons:
+                    assert en.island_name is not None
+                    self.islands_with_a_banned_dungeon.add(en.island_name)
+
+    def randomize_one_set_of_entrances(
+        self, relevant_entrances: list[ZoneEntrance], relevant_exits: list[ZoneExit]
+    ) -> None:
+        """
+        Randomize a single set of entrances and their corresponding exits.
+
+        :param relevant_entrances: A list of entrances to be randomized.
+        :param relevant_exits: A list of exits corresponding to the entrances.
+        """
+        # Keep miniboss and boss entrances vanilla in non-required bosses' dungeons.
+        for zone_entrance in relevant_entrances.copy():
+            zone_exit = self.done_entrances_to_exits[zone_entrance]
+            if zone_exit in self.banned_exits and zone_exit in DUNGEON_INNER_EXITS:
+                relevant_entrances.remove(zone_entrance)
+            else:
+                del self.done_entrances_to_exits[zone_entrance]
+        for zone_exit in relevant_exits.copy():
+            if zone_exit in self.banned_exits and zone_exit in DUNGEON_INNER_EXITS:
+                relevant_exits.remove(zone_exit)
+            else:
+                del self.done_exits_to_entrances[zone_exit]
+
+        self.multiworld.random.shuffle(relevant_entrances)
+
+        # We calculate which exits are terminal (the end of a nested chain) per set instead of for all entrances.
+        # This is so that, for example, Ice Ring Isle counts as terminal when its inner cave is not being randomized.
+        non_terminal_exits = []
+        for en in relevant_entrances:
+            if en.nested_in is not None and en.nested_in not in non_terminal_exits:
+                non_terminal_exits.append(en.nested_in)
+        terminal_exits = {ex for ex in relevant_exits if ex not in non_terminal_exits}
+
+        remaining_entrances = relevant_entrances.copy()
+        remaining_exits = relevant_exits.copy()
+
+        nonprogress_entrances, nonprogress_exits = self.split_nonprogress_entrances_and_exits(
+            remaining_entrances, remaining_exits
+        )
+        if nonprogress_entrances:
+            for en in nonprogress_entrances:
+                remaining_entrances.remove(en)
+            for ex in nonprogress_exits:
+                remaining_exits.remove(ex)
+            self.randomize_one_set_of_exits(nonprogress_entrances, nonprogress_exits, terminal_exits)
+
+        self.randomize_one_set_of_exits(remaining_entrances, remaining_exits, terminal_exits)
+
+    def check_if_one_exit_is_progress(self, zone_exit: ZoneExit) -> bool:
+        """
+        Determine if the zone exit leads to progress locations in the world.
+
+        :param zone_exit: The zone exit to check.
+        :return: Whether the zone exit leads to progress locations.
+        """
+        locs_for_exit = self.zone_exit_to_logically_dependent_item_locations[zone_exit]
+        assert locs_for_exit, f"Could not find any item locations corresponding to zone exit: {zone_exit.unique_name}"
+
+        # Banned required bosses mode dungeons still technically count as progress locations, so filter them out
+        # separately first.
+        nonbanned_locs = [loc for loc in locs_for_exit if loc not in self.world.boss_reqs.banned_locations]
+        progress_locs = [loc for loc in nonbanned_locs if loc not in self.world.nonprogress_locations]
+        return bool(progress_locs)
+
+    def split_nonprogress_entrances_and_exits(
+        self, relevant_entrances: list[ZoneEntrance], relevant_exits: list[ZoneExit]
+    ) -> tuple[list[ZoneEntrance], list[ZoneExit]]:
+        """
+        Splits the entrance and exit lists into two pairs: ones that should be considered nonprogress on this seed (will
+        never lead to any progress items) and ones that should be regarded as potentially required.
+
+        This is so we can effectively randomize these two pairs separately without convoluted logic to ensure they don't
+        connect.
+
+        :param relevant_entrances: A list of entrances.
+        :param relevant_exits: A list of exits corresponding to the entrances.
+        :raises FillError: If the number of randomizable entrances does not equal the number of randomizable exits.
+        """
+        nonprogress_exits = [ex for ex in relevant_exits if not self.check_if_one_exit_is_progress(ex)]
+        nonprogress_entrances = [
+            en
+            for en in relevant_entrances
+            if en.nested_in is not None
+            and (
+                (en.nested_in in nonprogress_exits)
+                # The area this entrance is nested in is not randomized, but we still need to determine whether it's
+                # progression.
+                or (en.nested_in not in relevant_exits and not self.check_if_one_exit_is_progress(en.nested_in))
+            )
+        ]
+
+        # At this point, `nonprogress_entrances` includes only the inner entrances nested inside the main exits, not any
+        # island entrances on the sea. So, we need to select `N` random island entrances to allow all of the nonprogress
+        # exits to be accessible, where `N` is the difference between the number of entrances and exits we currently
+        # have.
+        possible_island_entrances = [en for en in relevant_entrances if en.island_name is not None]
+
+        # We need special logic to handle Forsaken Fortress, as it is the only island entrance inside a dungeon.
+        ff_boss_entrance = ZoneEntrance.all["Boss Entrance in Forsaken Fortress"]
+        if ff_boss_entrance in possible_island_entrances:
+            if self.world.options.progression_dungeons:
+                if "Forsaken Fortress" in self.world.boss_reqs.banned_dungeons:
+                    ff_progress = False
+                else:
+                    ff_progress = True
+            else:
+                ff_progress = False
+
+            if ff_progress:
+                # If it's progress, don't allow it to be randomly chosen to lead to nonprogress exits.
+                possible_island_entrances.remove(ff_boss_entrance)
+            else:
+                # If it's not progress, manually mark it as such, and don't allow it to be chosen randomly.
+                nonprogress_entrances.append(ff_boss_entrance)
+                possible_island_entrances.remove(ff_boss_entrance)
+
+        num_island_entrances_needed = len(nonprogress_exits) - len(nonprogress_entrances)
+        if num_island_entrances_needed > len(possible_island_entrances):
+            raise FillError("Not enough island entrances left to split entrances.")
+
+        for _ in range(num_island_entrances_needed):
+            # Note: `relevant_entrances` is already shuffled, so we can just take the first result from
+            # `possible_island_entrances`—it's the same as picking one randomly.
+            nonprogress_island_entrance = possible_island_entrances.pop(0)
+            nonprogress_entrances.append(nonprogress_island_entrance)
+
+        assert len(nonprogress_entrances) == len(nonprogress_exits)
+
+        return nonprogress_entrances, nonprogress_exits
+
+    def randomize_one_set_of_exits(
+        self, relevant_entrances: list[ZoneEntrance], relevant_exits: list[ZoneExit], terminal_exits: set[ZoneExit]
+    ) -> None:
+        """
+        Randomize a single set of entrances and their corresponding exits.
+
+        :param relevant_entrances: A list of entrances to be randomized.
+        :param relevant_exits: A list of exits corresponding to the entrances.
+        :param terminal_exits: A set of exits which do not contain any entrances.
+        :raises FillError: If there are no valid exits to assign to an entrance.
+        """
+        options = self.world.options
+
+        remaining_entrances = relevant_entrances.copy()
+        remaining_exits = relevant_exits.copy()
+
+        doing_banned = False
+        if any(ex in self.banned_exits for ex in relevant_exits):
+            doing_banned = True
+
+        if options.required_bosses and not doing_banned:
+            # Prioritize entrances that share an island with an entrance randomized to lead into a
+            # required-bosses-mode-banned dungeon. (e.g., DRI, Pawprint, Outset, TotG sector.)
+            # This is because we need to prevent these islands from having a required boss or anything that could lead
+            # to a required boss. If we don't do this first, we can get backed into a corner where there is no other
+            # option left.
+            entrances_not_on_unique_islands = []
+            for zone_entrance in relevant_entrances:
+                if zone_entrance.is_nested:
+                    continue
+                if zone_entrance.island_name in self.islands_with_a_banned_dungeon:
+                    # This island was already used on a previous call to `randomize_one_set_of_exits`.
+                    entrances_not_on_unique_islands.append(zone_entrance)
+                    continue
+            for zone_entrance in entrances_not_on_unique_islands:
+                remaining_entrances.remove(zone_entrance)
+            remaining_entrances = entrances_not_on_unique_islands + remaining_entrances
+
+        while remaining_entrances:
+            # Filter out boss entrances that aren't yet accessible from the sea.
+            # We don't want to connect these to anything yet or we risk creating an infinite loop.
+            possible_remaining_entrances = [
+                en for en in remaining_entrances if self.get_outermost_entrance_for_entrance(en) is not None
+            ]
+            zone_entrance = possible_remaining_entrances.pop(0)
+            remaining_entrances.remove(zone_entrance)
+
+            possible_remaining_exits = remaining_exits.copy()
+
+            if len(possible_remaining_entrances) == 0 and len(remaining_entrances) > 0:
+                # If this is the last entrance we have left to attach exits to, we can't place a terminal exit here.
+                # Terminal exits do not create another entrance, so one would leave us with no possible way to continue
+                # placing the remaining exits on future loops.
+                possible_remaining_exits = [ex for ex in possible_remaining_exits if ex not in terminal_exits]
+
+            if options.required_bosses and zone_entrance.island_name is not None and not doing_banned:
+                # Prevent required bosses (and non-terminal exits, which could lead to required bosses) from appearing
+                # on islands where we already placed a banned boss or dungeon.
+                # This can happen with DRI and Pawprint, as these islands have two entrances. This would be bad because
+                # the required bosses mode's dungeon markers only tell you what island the required dungeons are on, not
+                # which of the two entrances to enter.
+                # So, if a banned dungeon is placed on DRI's main entrance, we will have to fill DRI's pit entrance with
+                # either a miniboss or one of the caves that does not have a nested entrance inside. We allow multiple
+                # banned and required dungeons on a single island.
+                if zone_entrance.island_name in self.islands_with_a_banned_dungeon:
+                    possible_remaining_exits = [
+                        ex
+                        for ex in possible_remaining_exits
+                        if ex in terminal_exits and ex not in (DUNGEON_EXITS + BOSS_EXITS)
+                    ]
+
+            if not possible_remaining_exits:
+                raise FillError(f"No valid exits to place for entrance: {zone_entrance.entrance_name}")
+
+            zone_exit = self.multiworld.random.choice(possible_remaining_exits)
+            remaining_exits.remove(zone_exit)
+
+            self.done_entrances_to_exits[zone_entrance] = zone_exit
+            self.done_exits_to_entrances[zone_exit] = zone_entrance
+
+            if zone_exit in self.banned_exits:
+                # Keep track of which islands have a required bosses mode banned dungeon to avoid marker overlap.
+                if zone_exit in DUNGEON_EXITS + BOSS_EXITS:
+                    # We only keep track of dungeon exits and boss exits, not miniboss exits.
+                    # Banned miniboss exits can share an island with required dungeons/bosses.
+                    outer_entrance = self.get_outermost_entrance_for_entrance(zone_entrance)
+
+                    # Because we filter above so that we always assign entrances from the sea inwards, we can assume
+                    # that when we assign an entrance, it has a path back to the sea.
+                    # If we're assigning a non-terminal entrance, any nested entrances will get assigned after this one,
+                    # and we'll run through this code again (so we can reason based on `zone_exit` only instead of
+                    # having to recurse through the nested exits to find banned dungeons/bosses).
+                    assert outer_entrance and outer_entrance.island_name is not None
+                    self.islands_with_a_banned_dungeon.add(outer_entrance.island_name)
+
+    def finalize_all_randomized_sets_of_entrances(self) -> None:
+        """
+        Finalize all randomized entrance sets.
+
+        For all entrance-exit pairs, this function adds a connection with the appropriate access rule to the world.
+        """
+
+        def get_access_rule(entrance: ZoneEntrance) -> str:
+            snake_case_region = entrance.entrance_name.lower().replace("'", "").replace(" ", "_")
+            return getattr(Macros, f"can_access_{snake_case_region}")
+
+        # Connect each entrance-exit pair in the multiworld with the access rule for the entrance.
+        # The Great Sea is the parent_region for many entrances, so get it in advance.
+        great_sea_region = self.world.get_region("The Great Sea")
+        for zone_entrance, zone_exit in self.done_entrances_to_exits.items():
+            # Get the parent region of the entrance.
+            if zone_entrance.island_name is not None:
+                # Entrances with an `island_name` are found in The Great Sea.
+                parent_region = great_sea_region
+            else:
+                # All other entrances must be nested within some other region.
+                parent_region = self.world.get_region(zone_entrance.nested_in.unique_name)
+            exit_region_name = zone_exit.unique_name
+            exit_region = self.world.get_region(exit_region_name)
+            parent_region.connect(
+                exit_region,
+                # The default name uses the "parent_region -> connecting_region", but the parent_region would not be
+                # useful for spoiler paths or debugging, so use the entrance name at the start.
+                f"{zone_entrance.entrance_name} -> {exit_region_name}",
+                rule=lambda state, rule=get_access_rule(zone_entrance): rule(state, self.player),
+            )
+
+        if __debug__ and self.world.options.required_bosses:
+            # Ensure we didn't accidentally place a banned boss and a required boss on the same island.
+            banned_island_names = set(
+                self.get_entrance_zone_for_boss(boss_name) for boss_name in self.world.boss_reqs.banned_bosses
+            )
+            required_island_names = set(
+                self.get_entrance_zone_for_boss(boss_name) for boss_name in self.world.boss_reqs.required_bosses
+            )
+            assert not banned_island_names & required_island_names
+
+    def register_mappings_between_item_locations_and_zone_exits(self) -> None:
+        """
+        Map item locations to their corresponding zone exits.
+        """
+        for loc_name in list(LOCATION_TABLE.keys()):
+            zone_exit = self.get_zone_exit_for_item_location(loc_name)
+            if zone_exit is not None:
+                self.item_location_to_containing_zone_exit[loc_name] = zone_exit
+                self.zone_exit_to_logically_dependent_item_locations[zone_exit].append(loc_name)
+
+            if loc_name == "The Great Sea - Withered Trees":
+                # This location isn't inside a zone exit, but it does logically require the player to be able to reach
+                # a different item location inside one.
+                sub_zone_exit = self.get_zone_exit_for_item_location("Cliff Plateau Isles - Highest Isle")
+                if sub_zone_exit is not None:
+                    self.zone_exit_to_logically_dependent_item_locations[sub_zone_exit].append(loc_name)
+
+    def get_all_entrance_sets_to_be_randomized(
+        self,
+    ) -> Generator[tuple[list[ZoneEntrance], list[ZoneExit]], None, None]:
+        """
+        Retrieve all entrance-exit pairs that need to be randomized.
+
+        :raises OptionError: If an invalid randomization option is set in the world's options.
+        :return: A generator that yields sets of entrances and exits to be randomized.
+        """
+        options = self.world.options
+
+        dungeons = bool(options.randomize_dungeon_entrances)
+        minibosses = bool(options.randomize_miniboss_entrances)
+        bosses = bool(options.randomize_boss_entrances)
+        secret_caves = bool(options.randomize_secret_cave_entrances)
+        inner_caves = bool(options.randomize_secret_cave_inner_entrances)
+        fountains = bool(options.randomize_fairy_fountain_entrances)
+
+        mix_entrances = options.mix_entrances
+        if mix_entrances == "separate_pools":
+            if dungeons:
+                yield self.get_one_entrance_set(dungeons=dungeons)
+            if minibosses:
+                yield self.get_one_entrance_set(minibosses=minibosses)
+            if bosses:
+                yield self.get_one_entrance_set(bosses=bosses)
+            if secret_caves:
+                yield self.get_one_entrance_set(caves=secret_caves)
+            if inner_caves:
+                yield self.get_one_entrance_set(inner_caves=inner_caves)
+            if fountains:
+                yield self.get_one_entrance_set(fountains=fountains)
+        elif mix_entrances == "mix_pools":
+            yield self.get_one_entrance_set(
+                dungeons=dungeons,
+                minibosses=minibosses,
+                bosses=bosses,
+                caves=secret_caves,
+                inner_caves=inner_caves,
+                fountains=fountains,
+            )
+        else:
+            raise OptionError(f"Invalid entrance randomization option: {mix_entrances}")
+
+    def get_one_entrance_set(
+        self,
+        *,
+        dungeons: bool = False,
+        caves: bool = False,
+        minibosses: bool = False,
+        bosses: bool = False,
+        inner_caves: bool = False,
+        fountains: bool = False,
+    ) -> tuple[list[ZoneEntrance], list[ZoneExit]]:
+        """
+        Retrieve a single set of entrance-exit pairs that need to be randomized.
+
+        :param dungeons: Whether to include dungeon entrances and exits. Defaults to `False`.
+        :param caves: Whether to include secret cave entrances and exits. Defaults to `False`.
+        :param minibosses: Whether to include miniboss entrances and exits. Defaults to `False`.
+        :param bosses: Whether to include boss entrances and exits. Defaults to `False`.
+        :param inner_caves: Whether to include inner cave entrances and exits. Defaults to `False`.
+        :param fountains: Whether to include fairy fountain entrances and exits. Defaults to `False`.
+        :return: A tuple of lists of entrances and exits that should be randomized together.
+        """
+        relevant_entrances: list[ZoneEntrance] = []
+        relevant_exits: list[ZoneExit] = []
+        if dungeons:
+            relevant_entrances += DUNGEON_ENTRANCES
+            relevant_exits += DUNGEON_EXITS
+        if minibosses:
+            relevant_entrances += MINIBOSS_ENTRANCES
+            relevant_exits += MINIBOSS_EXITS
+        if bosses:
+            relevant_entrances += BOSS_ENTRANCES
+            relevant_exits += BOSS_EXITS
+        if caves:
+            relevant_entrances += SECRET_CAVE_ENTRANCES
+            relevant_exits += SECRET_CAVE_EXITS
+        if inner_caves:
+            relevant_entrances += SECRET_CAVE_INNER_ENTRANCES
+            relevant_exits += SECRET_CAVE_INNER_EXITS
+        if fountains:
+            relevant_entrances += FAIRY_FOUNTAIN_ENTRANCES
+            relevant_exits += FAIRY_FOUNTAIN_EXITS
+        return relevant_entrances, relevant_exits
+
+    def get_outermost_entrance_for_exit(self, zone_exit: ZoneExit) -> Optional[ZoneEntrance]:
+        """
+        Unrecurses nested dungeons to determine a given exit's outermost (island) entrance.
+
+        :param zone_exit: The given exit.
+        :return: The outermost (island) entrance for the exit, or `None` if entrances have yet to be randomized.
+        """
+        zone_entrance = self.done_exits_to_entrances[zone_exit]
+        return self.get_outermost_entrance_for_entrance(zone_entrance)
+
+    def get_outermost_entrance_for_entrance(self, zone_entrance: ZoneEntrance) -> Optional[ZoneEntrance]:
+        """
+        Unrecurses nested dungeons to determine a given entrance's outermost (island) entrance.
+
+        :param zone_exit: The given entrance.
+        :return: The outermost (island) entrance for the entrance, or `None` if entrances have yet to be randomized.
+        """
+        seen_entrances = self.get_all_entrances_on_path_to_entrance(zone_entrance)
+        if seen_entrances is None:
+            # Undecided.
+            return None
+        outermost_entrance = seen_entrances[-1]
+        return outermost_entrance
+
+    def get_all_entrances_on_path_to_entrance(self, zone_entrance: ZoneEntrance) -> Optional[list[ZoneEntrance]]:
+        """
+        Unrecurses nested dungeons to build a list of all entrances leading to a given entrance.
+
+        :param zone_exit: The given entrance.
+        :return: A list of entrances leading to the given entrance, or `None` if entrances have yet to be randomized.
+        """
+        seen_entrances: list[ZoneEntrance] = []
+        while zone_entrance.is_nested:
+            if zone_entrance in seen_entrances:
+                path_str = ", ".join([e.entrance_name for e in seen_entrances])
+                raise FillError(f"Entrances are in an infinite loop: {path_str}")
+            seen_entrances.append(zone_entrance)
+            if zone_entrance.nested_in not in self.done_exits_to_entrances:
+                # Undecided.
+                return None
+            zone_entrance = self.done_exits_to_entrances[zone_entrance.nested_in]
+        seen_entrances.append(zone_entrance)
+        return seen_entrances
+
+    def is_item_location_behind_randomizable_entrance(self, location_name: str) -> bool:
+        """
+        Determine if the location is behind a randomizable entrance.
+
+        :param location_name: The location to check.
+        :return: `True` if the location is behind a randomizable entrance, `False` otherwise.
+        """
+        loc_zone_name, _ = split_location_name_by_zone(location_name)
+        if loc_zone_name in ["Ganon's Tower", "Mailbox"]:
+            # Ganon's Tower and the handful of Mailbox locations that depend on beating dungeon bosses are considered
+            # "Dungeon" location types by the logic, but the entrance randomizer does not need to consider them.
+            # Although the mail locations are technically locked behind dungeons, we can still ignore them here because
+            # if all of the locations in the dungeon itself are nonprogress, then any mail depending on that dungeon
+            # should also be enforced as nonprogress by other parts of the code.
+            return False
+
+        types = LOCATION_TABLE[location_name].flags
+        is_boss = TWWFlag.BOSS in types
+        if loc_zone_name == "Forsaken Fortress" and not is_boss:
+            # Special case. FF is a dungeon that is not randomized, except for the boss arena.
+            return False
+
+        is_big_octo = TWWFlag.BG_OCTO in types
+        if is_big_octo:
+            # The Big Octo Great Fairy is the only Great Fairy location that is not also a Fairy Fountain.
+            return False
+
+        # In the general case, we check if the location has a type corresponding to exits that can be randomized.
+        if any(t in types for t in ENTRANCE_RANDOMIZABLE_ITEM_LOCATION_TYPES):
+            return True
+
+        return False
+
+    def get_zone_exit_for_item_location(self, location_name: str) -> Optional[ZoneExit]:
+        """
+        Retrieve the zone exit for a given location.
+
+        :param location_name: The name of the location.
+        :raises Exception: If a location exit override should be used instead.
+        :return: The zone exit for the location or `None` if the location is not behind a randomizable entrance.
+        """
+        if not self.is_item_location_behind_randomizable_entrance(location_name):
+            return None
+
+        zone_exit = ITEM_LOCATION_NAME_TO_EXIT_OVERRIDES.get(location_name, None)
+        if zone_exit is not None:
+            return zone_exit
+
+        loc_zone_name, _ = split_location_name_by_zone(location_name)
+        possible_exits = [ex for ex in ZoneExit.all.values() if ex.zone_name == loc_zone_name]
+        if len(possible_exits) == 0:
+            return None
+        elif len(possible_exits) == 1:
+            return possible_exits[0]
+        else:
+            raise Exception(
+                f"Multiple zone exits share the same zone name: {loc_zone_name!r}. "
+                "Use a location exit override instead."
+            )
+
+    def get_entrance_zone_for_boss(self, boss_name: str) -> str:
+        """
+        Retrieve the entrance zone for a given boss.
+
+        :param boss_name: The name of the boss.
+        :return: The name of the island on which the boss is located.
+        """
+        boss_arena_name = f"{boss_name} Boss Arena"
+        zone_exit = ZoneExit.all[boss_arena_name]
+        outermost_entrance = self.get_outermost_entrance_for_exit(zone_exit)
+        assert outermost_entrance is not None and outermost_entrance.island_name is not None
+        return outermost_entrance.island_name
diff --git a/worlds/tww/randomizers/ItemPool.py b/worlds/tww/randomizers/ItemPool.py
new file mode 100644
index 0000000000..86c02f3932
--- /dev/null
+++ b/worlds/tww/randomizers/ItemPool.py
@@ -0,0 +1,205 @@
+from typing import TYPE_CHECKING
+
+from BaseClasses import ItemClassification as IC
+from Fill import FillError
+
+from ..Items import ITEM_TABLE, item_factory
+from ..Options import DungeonItem
+from .Dungeons import get_dungeon_item_pool_player
+
+if TYPE_CHECKING:
+    from .. import TWWWorld
+
+VANILLA_DUNGEON_ITEM_LOCATIONS: dict[str, list[str]] = {
+    "DRC Small Key": [
+        "Dragon Roost Cavern - First Room",
+        "Dragon Roost Cavern - Boarded Up Chest",
+        "Dragon Roost Cavern - Rat Room Boarded Up Chest",
+        "Dragon Roost Cavern - Bird's Nest",
+    ],
+    "FW Small Key": [
+        "Forbidden Woods - Vine Maze Right Chest"
+    ],
+    "TotG Small Key": [
+        "Tower of the Gods - Hop Across Floating Boxes",
+        "Tower of the Gods - Floating Platforms Room"
+    ],
+    "ET Small Key": [
+        "Earth Temple - Transparent Chest in First Crypt",
+        "Earth Temple - Casket in Second Crypt",
+        "Earth Temple - End of Foggy Room With Floormasters",
+    ],
+    "WT Small Key": [
+        "Wind Temple - Spike Wall Room - First Chest",
+        "Wind Temple - Chest Behind Seven Armos"
+    ],
+
+    "DRC Big Key":  ["Dragon Roost Cavern - Big Key Chest"],
+    "FW Big Key":   ["Forbidden Woods - Big Key Chest"],
+    "TotG Big Key": ["Tower of the Gods - Big Key Chest"],
+    "ET Big Key":   ["Earth Temple - Big Key Chest"],
+    "WT Big Key":   ["Wind Temple - Big Key Chest"],
+
+    "DRC Dungeon Map":  ["Dragon Roost Cavern - Alcove With Water Jugs"],
+    "FW Dungeon Map":   ["Forbidden Woods - First Room"],
+    "TotG Dungeon Map": ["Tower of the Gods - Chest Behind Bombable Walls"],
+    "FF Dungeon Map":   ["Forsaken Fortress - Chest Outside Upper Jail Cell"],
+    "ET Dungeon Map":   ["Earth Temple - Transparent Chest In Warp Pot Room"],
+    "WT Dungeon Map":   ["Wind Temple - Chest In Many Cyclones Room"],
+
+    "DRC Compass":  ["Dragon Roost Cavern - Rat Room"],
+    "FW Compass":   ["Forbidden Woods - Vine Maze Left Chest"],
+    "TotG Compass": ["Tower of the Gods - Skulls Room Chest"],
+    "FF Compass":   ["Forsaken Fortress - Chest Guarded By Bokoblin"],
+    "ET Compass":   ["Earth Temple - Chest In Three Blocks Room"],
+    "WT Compass":   ["Wind Temple - Chest In Middle Of Hub Room"],
+}
+
+
+def generate_itempool(world: "TWWWorld") -> None:
+    """
+    Generate the item pool for the world.
+
+    :param world: The Wind Waker game world.
+    """
+    multiworld = world.multiworld
+
+    # Get the core pool of items.
+    pool, precollected_items = get_pool_core(world)
+
+    # Add precollected items to the multiworld's `precollected_items` list.
+    for item in precollected_items:
+        multiworld.push_precollected(item_factory(item, world))
+
+    # Place a "Victory" item on "Defeat Ganondorf" for the spoiler log.
+    world.get_location("Defeat Ganondorf").place_locked_item(item_factory("Victory", world))
+
+    # Create the pool of the remaining shuffled items.
+    items = item_factory(pool, world)
+    world.random.shuffle(items)
+
+    multiworld.itempool += items
+
+    # Dungeon items should already be created, so handle those separately.
+    handle_dungeon_items(world)
+
+
+def get_pool_core(world: "TWWWorld") -> tuple[list[str], list[str]]:
+    """
+    Get the core pool of items and precollected items for the world.
+
+    :param world: The Wind Waker game world.
+    :return: A tuple of the item pool and precollected items.
+    """
+    pool: list[str] = []
+    precollected_items: list[str] = []
+
+    # Split items into three different pools: progression, useful, and filler.
+    progression_pool: list[str] = []
+    useful_pool: list[str] = []
+    filler_pool: list[str] = []
+    for item, data in ITEM_TABLE.items():
+        if data.type == "Item":
+            adjusted_classification = world.item_classification_overrides.get(item)
+            classification = data.classification if adjusted_classification is None else adjusted_classification
+
+            if classification & IC.progression:
+                progression_pool.extend([item] * data.quantity)
+            elif classification & IC.useful:
+                useful_pool.extend([item] * data.quantity)
+            else:
+                filler_pool.extend([item] * data.quantity)
+
+    # Assign useful and filler items to item pools in the world.
+    world.random.shuffle(useful_pool)
+    world.random.shuffle(filler_pool)
+    world.useful_pool = useful_pool
+    world.filler_pool = filler_pool
+
+    # Add filler items to place into excluded locations.
+    pool.extend([world.get_filler_item_name() for _ in world.options.exclude_locations])
+
+    # The remaining of items left to place should be the same as the number of non-excluded locations in the world.
+    nonexcluded_locations = [
+        location
+        for location in world.multiworld.get_locations(world.player)
+        if location.name not in world.options.exclude_locations
+    ]
+    num_items_left_to_place = len(nonexcluded_locations) - 1
+
+    # Account for the dungeon items that have already been created.
+    for dungeon in world.dungeons.values():
+        num_items_left_to_place -= len(dungeon.all_items)
+
+    # All progression items are added to the item pool.
+    if len(progression_pool) > num_items_left_to_place:
+        raise FillError(
+            "There are insufficient locations to place progression items! "
+            f"Trying to place {len(progression_pool)} items in only {num_items_left_to_place} locations."
+        )
+    pool.extend(progression_pool)
+    num_items_left_to_place -= len(progression_pool)
+
+    # If the player starts with a sword, add one to the precollected items list and remove one from the item pool.
+    if world.options.sword_mode == "start_with_sword":
+        precollected_items.append("Progressive Sword")
+        num_items_left_to_place += 1
+        pool.remove("Progressive Sword")
+    # Or, if it's swordless mode, remove all swords from the item pool.
+    elif world.options.sword_mode == "swordless":
+        while "Progressive Sword" in pool:
+            num_items_left_to_place += 1
+            pool.remove("Progressive Sword")
+
+    # Place useful items, then filler items to fill out the remaining locations.
+    pool.extend([world.get_filler_item_name(strict=False) for _ in range(num_items_left_to_place)])
+
+    return pool, precollected_items
+
+
+def handle_dungeon_items(world: "TWWWorld") -> None:
+    """
+    Handle the placement of dungeon items in the world.
+
+    :param world: The Wind Waker game world.
+    """
+    player = world.player
+    multiworld = world.multiworld
+    options = world.options
+
+    dungeon_items = [
+        item
+        for item in get_dungeon_item_pool_player(world)
+        if item.name not in multiworld.worlds[player].dungeon_local_item_names
+    ]
+
+    for x in range(len(dungeon_items) - 1, -1, -1):
+        item = dungeon_items[x]
+
+        # Consider dungeon items in non-required dungeons as filler.
+        if item.dungeon.name in world.boss_reqs.banned_dungeons:
+            item.classification = IC.filler
+
+        option: DungeonItem
+        if item.type == "Big Key":
+            option = options.randomize_bigkeys
+        elif item.type == "Small Key":
+            option = options.randomize_smallkeys
+        else:
+            option = options.randomize_mapcompass
+
+        if option == "startwith":
+            dungeon_items.pop(x)
+            multiworld.push_precollected(item)
+            multiworld.itempool.append(item_factory(world.get_filler_item_name(), world))
+        elif option == "vanilla":
+            for location_name in VANILLA_DUNGEON_ITEM_LOCATIONS[item.name]:
+                location = world.get_location(location_name)
+                if location.item is None:
+                    dungeon_items.pop(x)
+                    location.place_locked_item(item)
+                    break
+            else:
+                raise FillError(f"Could not place dungeon item in vanilla location: {item}")
+
+    multiworld.itempool.extend([item for item in dungeon_items])
diff --git a/worlds/tww/randomizers/RequiredBosses.py b/worlds/tww/randomizers/RequiredBosses.py
new file mode 100644
index 0000000000..04c4d7c5bb
--- /dev/null
+++ b/worlds/tww/randomizers/RequiredBosses.py
@@ -0,0 +1,121 @@
+from typing import TYPE_CHECKING
+
+from Options import OptionError
+
+from ..Locations import DUNGEON_NAMES, LOCATION_TABLE, TWWFlag, split_location_name_by_zone
+from ..Options import TWWOptions
+
+if TYPE_CHECKING:
+    from .. import TWWWorld
+
+
+class RequiredBossesRandomizer:
+    """
+    This class handles the randomization of the required bosses in The Wind Waker game based on user options.
+
+    If the option is on, the required bosses must be defeated as part of the unlock condition of Puppet Ganon's door.
+    The quadrants in which the bosses are located are marked on the player's Sea Chart.
+
+    :param world: The Wind Waker game world.
+    """
+
+    def __init__(self, world: "TWWWorld"):
+        self.world = world
+        self.multiworld = world.multiworld
+
+        self.required_boss_item_locations: list[str] = []
+        self.required_dungeons: set[str] = set()
+        self.required_bosses: list[str] = []
+        self.banned_locations: set[str] = set()
+        self.banned_dungeons: set[str] = set()
+        self.banned_bosses: list[str] = []
+
+    def validate_boss_options(self, options: TWWOptions) -> None:
+        """
+        Validate the user-defined boss options to ensure logical consistency.
+
+        :param options: The game options set by the user.
+        :raises OptionError: If the boss options are inconsistent.
+        """
+        if not options.progression_dungeons:
+            raise OptionError("You cannot make bosses required when progression dungeons are disabled.")
+
+        if len(options.included_dungeons.value & options.excluded_dungeons.value) != 0:
+            raise OptionError(
+                "A conflict was found in the lists of required and banned dungeons for required bosses mode."
+            )
+
+    def randomize_required_bosses(self) -> None:
+        """
+        Randomize the required bosses based on user-defined constraints and options.
+
+        :raises OptionError: If the randomization fails to meet user-defined constraints.
+        """
+        options = self.world.options
+
+        # Validate constraints on required bosses options.
+        self.validate_boss_options(options)
+
+        # If the user enforces a dungeon location to be priority, consider that when selecting required bosses.
+        dungeon_names = set(DUNGEON_NAMES)
+        required_dungeons = options.included_dungeons.value
+        for location_name in options.priority_locations.value:
+            dungeon_name, _ = split_location_name_by_zone(location_name)
+            if dungeon_name in dungeon_names:
+                required_dungeons.add(dungeon_name)
+
+        # Ensure we aren't prioritizing more dungeon locations than the requested number of required bosses.
+        num_required_bosses = options.num_required_bosses
+        if len(required_dungeons) > num_required_bosses:
+            raise OptionError(
+                "Could not select required bosses to satisfy options set by the user. "
+                "There are more dungeons with priority locations than the desired number of required bosses."
+            )
+
+        # Ensure that after removing excluded dungeons, we still have enough to satisfy user options.
+        num_remaining = num_required_bosses - len(required_dungeons)
+        remaining_dungeon_options = dungeon_names - required_dungeons - options.excluded_dungeons.value
+        if len(remaining_dungeon_options) < num_remaining:
+            raise OptionError(
+                "Could not select required bosses to satisfy options set by the user. "
+                "After removing the excluded dungeons, there are not enough to meet the desired number of required "
+                "bosses."
+            )
+
+        # Finish selecting required bosses.
+        required_dungeons.update(self.world.random.sample(sorted(remaining_dungeon_options), num_remaining))
+
+        # Exclude locations that are not in the dungeon of a required boss.
+        banned_dungeons = dungeon_names - required_dungeons
+        for location_name, location_data in LOCATION_TABLE.items():
+            dungeon_name, _ = split_location_name_by_zone(location_name)
+            if dungeon_name in banned_dungeons and TWWFlag.DUNGEON in location_data.flags:
+                self.banned_locations.add(location_name)
+            elif location_name == "Mailbox - Letter from Orca" and "Forbidden Woods" in banned_dungeons:
+                self.banned_locations.add(location_name)
+            elif location_name == "Mailbox - Letter from Baito" and "Earth Temple" in banned_dungeons:
+                self.banned_locations.add(location_name)
+            elif location_name == "Mailbox - Letter from Aryll" and "Forsaken Fortress" in banned_dungeons:
+                self.banned_locations.add(location_name)
+            elif location_name == "Mailbox - Letter from Tingle" and "Forsaken Fortress" in banned_dungeons:
+                self.banned_locations.add(location_name)
+        for location_name in self.banned_locations:
+            self.world.nonprogress_locations.add(location_name)
+
+        # Record the item location names for required bosses.
+        self.required_boss_item_locations = []
+        self.required_bosses = []
+        self.banned_bosses = []
+        possible_boss_item_locations = [loc for loc, data in LOCATION_TABLE.items() if TWWFlag.BOSS in data.flags]
+        for location_name in possible_boss_item_locations:
+            dungeon_name, specific_location_name = split_location_name_by_zone(location_name)
+            assert specific_location_name.endswith(" Heart Container")
+            boss_name = specific_location_name.removesuffix(" Heart Container")
+
+            if dungeon_name in required_dungeons:
+                self.required_boss_item_locations.append(location_name)
+                self.required_bosses.append(boss_name)
+            else:
+                self.banned_bosses.append(boss_name)
+        self.required_dungeons = required_dungeons
+        self.banned_dungeons = banned_dungeons
diff --git a/worlds/tww/requirements.txt b/worlds/tww/requirements.txt
new file mode 100644
index 0000000000..30a95d984f
--- /dev/null
+++ b/worlds/tww/requirements.txt
@@ -0,0 +1 @@
+dolphin-memory-engine>=1.3.0
diff --git a/worlds/witness/__init__.py b/worlds/witness/__init__.py
index 80ef996a0e..b2e91c7cf0 100644
--- a/worlds/witness/__init__.py
+++ b/worlds/witness/__init__.py
@@ -63,7 +63,7 @@ class WitnessWorld(World):
     item_name_groups = static_witness_items.ITEM_GROUPS
     location_name_groups = static_witness_locations.AREA_LOCATION_GROUPS
 
-    required_client_version = (0, 5, 1)
+    required_client_version = (0, 6, 0)
 
     player_logic: WitnessPlayerLogic
     player_locations: WitnessPlayerLocations
diff --git a/worlds/witness/data/definition_classes.py b/worlds/witness/data/definition_classes.py
new file mode 100644
index 0000000000..281fbfcdff
--- /dev/null
+++ b/worlds/witness/data/definition_classes.py
@@ -0,0 +1,33 @@
+from dataclasses import dataclass, field
+from typing import FrozenSet, List, NamedTuple
+
+# A WitnessRule is just an or-chain of and-conditions.
+# It represents the set of all options that could fulfill this requirement.
+# E.g. if something requires "Dots or (Shapers and Stars)", it'd be represented as: {{"Dots"}, {"Shapers, "Stars"}}
+# {} is an unusable requirement.
+# {{}} is an always usable requirement.
+WitnessRule = FrozenSet[FrozenSet[str]]
+
+
+@dataclass
+class AreaDefinition:
+    name: str
+    regions: List[str] = field(default_factory=list)
+
+
+@dataclass
+class RegionDefinition:
+    name: str
+    short_name: str
+    area: AreaDefinition
+    logical_entities: List[str] = field(default_factory=list)
+    physical_entities: List[str] = field(default_factory=list)
+
+
+class ConnectionDefinition(NamedTuple):
+    target_region: str
+    traversal_rule: WitnessRule
+
+    @property
+    def can_be_traversed(self) -> bool:
+        return bool(self.traversal_rule)
diff --git a/worlds/witness/data/static_locations.py b/worlds/witness/data/static_locations.py
index 5c5ad554dd..a5cfc3b49f 100644
--- a/worlds/witness/data/static_locations.py
+++ b/worlds/witness/data/static_locations.py
@@ -486,5 +486,5 @@ for key, item in ALL_LOCATIONS_TO_IDS.items():
     ALL_LOCATIONS_TO_ID[key] = item
 
 for loc in ALL_LOCATIONS_TO_IDS:
-    area = static_witness_logic.ENTITIES_BY_NAME[loc]["area"]["name"]
+    area = static_witness_logic.ENTITIES_BY_NAME[loc]["area"].name
     AREA_LOCATION_GROUPS.setdefault(area, set()).add(loc)
diff --git a/worlds/witness/data/static_logic.py b/worlds/witness/data/static_logic.py
index 4f4786a38b..bfe92467fb 100644
--- a/worlds/witness/data/static_logic.py
+++ b/worlds/witness/data/static_logic.py
@@ -1,8 +1,9 @@
 from collections import Counter, defaultdict
-from typing import Any, Dict, List, Optional, Set, Tuple
+from typing import Any, Dict, FrozenSet, List, Optional, Set
 
 from Utils import cache_argsless
 
+from .definition_classes import AreaDefinition, ConnectionDefinition, RegionDefinition, WitnessRule
 from .item_definition_classes import (
     CATEGORY_NAME_MAPPINGS,
     DoorItemDefinition,
@@ -13,7 +14,6 @@ from .item_definition_classes import (
 )
 from .settings.easter_eggs import EASTER_EGGS
 from .utils import (
-    WitnessRule,
     define_new_region,
     get_items,
     get_sigma_expert_logic,
@@ -21,7 +21,7 @@ from .utils import (
     get_umbra_variety_logic,
     get_vanilla_logic,
     logical_or_witness_rules,
-    parse_lambda,
+    parse_witness_rule,
 )
 
 
@@ -31,10 +31,10 @@ class StaticWitnessLogicObj:
             lines = get_sigma_normal_logic()
 
         # All regions with a list of panels in them and the connections to other regions, before logic adjustments
-        self.ALL_REGIONS_BY_NAME: Dict[str, Dict[str, Any]] = {}
-        self.ALL_AREAS_BY_NAME: Dict[str, Dict[str, Any]] = {}
-        self.CONNECTIONS_WITH_DUPLICATES: Dict[str, Dict[str, Set[WitnessRule]]] = defaultdict(lambda: defaultdict(set))
-        self.STATIC_CONNECTIONS_BY_REGION_NAME: Dict[str, Set[Tuple[str, WitnessRule]]] = {}
+        self.ALL_REGIONS_BY_NAME: Dict[str, RegionDefinition] = {}
+        self.ALL_AREAS_BY_NAME: Dict[str, AreaDefinition] = {}
+        self.CONNECTIONS_WITH_DUPLICATES: Dict[str, List[ConnectionDefinition]] = defaultdict(list)
+        self.STATIC_CONNECTIONS_BY_REGION_NAME: Dict[str, List[ConnectionDefinition]] = {}
 
         self.ENTITIES_BY_HEX: Dict[str, Dict[str, Any]] = {}
         self.ENTITIES_BY_NAME: Dict[str, Dict[str, Any]] = {}
@@ -55,15 +55,15 @@ class StaticWitnessLogicObj:
         area_counts: Dict[str, int] = Counter()
         for region_name, entity_amount in EASTER_EGGS.items():
             region_object = self.ALL_REGIONS_BY_NAME[region_name]
-            correct_area = region_object["area"]
+            correct_area = region_object.area
 
             for _ in range(entity_amount):
                 location_id = 160200 + egg_counter
                 entity_hex = hex(0xEE000 + egg_counter)
                 egg_counter += 1
 
-                area_counts[correct_area["name"]] += 1
-                full_entity_name = f"{correct_area['name']} Easter Egg {area_counts[correct_area['name']]}"
+                area_counts[correct_area.name] += 1
+                full_entity_name = f"{correct_area.name} Easter Egg {area_counts[correct_area.name]}"
 
                 self.ENTITIES_BY_HEX[entity_hex] = {
                     "checkName": full_entity_name,
@@ -81,11 +81,11 @@ class StaticWitnessLogicObj:
                 self.STATIC_DEPENDENT_REQUIREMENTS_BY_HEX[entity_hex] = {
                     "entities": frozenset({frozenset({})})
                 }
-                region_object["entities"].append(entity_hex)
-                region_object["physical_entities"].append(entity_hex)
+                region_object.logical_entities.append(entity_hex)
+                region_object.physical_entities.append(entity_hex)
 
         easter_egg_region = self.ALL_REGIONS_BY_NAME["Easter Eggs"]
-        easter_egg_area = easter_egg_region["area"]
+        easter_egg_area = easter_egg_region.area
         for i in range(sum(EASTER_EGGS.values())):
             location_id = 160000 + i
             entity_hex = hex(0xEE200 + i)
@@ -111,19 +111,15 @@ class StaticWitnessLogicObj:
             self.STATIC_DEPENDENT_REQUIREMENTS_BY_HEX[entity_hex] = {
                 "entities": frozenset({frozenset({})})
             }
-            easter_egg_region["entities"].append(entity_hex)
-            easter_egg_region["physical_entities"].append(entity_hex)
+            easter_egg_region.logical_entities.append(entity_hex)
+            easter_egg_region.physical_entities.append(entity_hex)
 
     def read_logic_file(self, lines: List[str]) -> None:
         """
         Reads the logic file and does the initial population of data structures
         """
-
-        current_region = {}
-        current_area: Dict[str, Any] = {
-            "name": "Misc",
-            "regions": [],
-        }
+        current_area = AreaDefinition("Misc")
+        current_region = RegionDefinition("Fake", "Fake", current_area)  # Unused, but makes PyCharm & mypy shut up
         self.ALL_AREAS_BY_NAME["Misc"] = current_area
 
         for line in lines:
@@ -133,19 +129,16 @@ class StaticWitnessLogicObj:
             if line[-1] == ":":
                 new_region_and_connections = define_new_region(line, current_area)
                 current_region = new_region_and_connections[0]
-                region_name = current_region["name"]
+                region_name = current_region.name
                 self.ALL_REGIONS_BY_NAME[region_name] = current_region
                 for connection in new_region_and_connections[1]:
-                    self.CONNECTIONS_WITH_DUPLICATES[region_name][connection[0]].add(connection[1])
-                current_area["regions"].append(region_name)
+                    self.CONNECTIONS_WITH_DUPLICATES[region_name].append(connection)
+                current_area.regions.append(region_name)
                 continue
 
             if line[0] == "=":
                 area_name = line[2:-2]
-                current_area = {
-                    "name": area_name,
-                    "regions": [],
-                }
+                current_area = AreaDefinition(area_name, [])
                 self.ALL_AREAS_BY_NAME[area_name] = current_area
                 continue
 
@@ -158,9 +151,9 @@ class StaticWitnessLogicObj:
             entity_hex = entity_name_full[0:7]
             entity_name = entity_name_full[9:-1]
 
-            required_panel_lambda = line_split.pop(0)
+            entity_requirement_string = line_split.pop(0)
 
-            full_entity_name = current_region["shortName"] + " " + entity_name
+            full_entity_name = current_region.short_name + " " + entity_name
 
             if location_id == "Door" or location_id == "Laser":
                 self.ENTITIES_BY_HEX[entity_hex] = {
@@ -177,18 +170,18 @@ class StaticWitnessLogicObj:
                 self.ENTITIES_BY_NAME[self.ENTITIES_BY_HEX[entity_hex]["checkName"]] = self.ENTITIES_BY_HEX[entity_hex]
 
                 self.STATIC_DEPENDENT_REQUIREMENTS_BY_HEX[entity_hex] = {
-                    "entities": parse_lambda(required_panel_lambda)
+                    "entities": parse_witness_rule(entity_requirement_string)
                 }
 
                 # Lasers and Doors exist in a region, but don't have a regional *requirement*
                 # If a laser is activated, you don't need to physically walk up to it for it to count
                 # As such, logically, they behave more as if they were part of the "Entry" region
-                self.ALL_REGIONS_BY_NAME["Entry"]["entities"].append(entity_hex)
+                self.ALL_REGIONS_BY_NAME["Entry"].logical_entities.append(entity_hex)
                 # However, it will also be important to keep track of their physical location for postgame purposes.
-                current_region["physical_entities"].append(entity_hex)
+                current_region.physical_entities.append(entity_hex)
                 continue
 
-            required_item_lambda = line_split.pop(0)
+            item_requirement_string = line_split.pop(0)
 
             laser_names = {
                 "Laser",
@@ -224,18 +217,18 @@ class StaticWitnessLogicObj:
                 entity_type = "Panel"
                 location_type = "General"
 
-            required_items = parse_lambda(required_item_lambda)
-            required_panels = parse_lambda(required_panel_lambda)
+            required_items = parse_witness_rule(item_requirement_string)
+            required_entities = parse_witness_rule(entity_requirement_string)
 
             required_items = frozenset(required_items)
 
             requirement = {
-                "entities": required_panels,
+                "entities": required_entities,
                 "items": required_items
             }
 
             if entity_type == "Obelisk Side":
-                eps = set(next(iter(required_panels)))
+                eps = set(next(iter(required_entities)))
                 eps -= {"Theater to Tunnels"}
 
                 eps_ints = {int(h, 16) for h in eps}
@@ -260,39 +253,43 @@ class StaticWitnessLogicObj:
             self.ENTITIES_BY_NAME[self.ENTITIES_BY_HEX[entity_hex]["checkName"]] = self.ENTITIES_BY_HEX[entity_hex]
             self.STATIC_DEPENDENT_REQUIREMENTS_BY_HEX[entity_hex] = requirement
 
-            current_region["entities"].append(entity_hex)
-            current_region["physical_entities"].append(entity_hex)
+            current_region.logical_entities.append(entity_hex)
+            current_region.physical_entities.append(entity_hex)
 
         self.add_easter_eggs()
 
-    def reverse_connection(self, source_region: str, connection: Tuple[str, Set[WitnessRule]]) -> None:
-        target = connection[0]
-        traversal_options = connection[1]
-
+    def reverse_connection(self, source_region: str, connection: ConnectionDefinition) -> None:
         # Reverse this connection with all its possibilities, except the ones marked as "OneWay".
-        for requirement in traversal_options:
-            remaining_options = set()
-            for option in requirement:
-                if not any(req == "TrueOneWay" for req in option):
-                    remaining_options.add(option)
+        remaining_options: Set[FrozenSet[str]] = set()
+        for sub_option in connection.traversal_rule:
+            if not any(req == "TrueOneWay" for req in sub_option):
+                remaining_options.add(sub_option)
 
-            if remaining_options:
-                self.CONNECTIONS_WITH_DUPLICATES[target][source_region].add(frozenset(remaining_options))
+        reversed_connection = ConnectionDefinition(source_region, frozenset(remaining_options))
+        if reversed_connection.can_be_traversed:
+            self.CONNECTIONS_WITH_DUPLICATES[connection.target_region].append(reversed_connection)
 
     def reverse_connections(self) -> None:
         # Iterate all connections
         for region_name, connections in list(self.CONNECTIONS_WITH_DUPLICATES.items()):
-            for connection in connections.items():
+            for connection in connections:
                 self.reverse_connection(region_name, connection)
 
     def combine_connections(self) -> None:
         # All regions need to be present, and this dict is copied later - Thus, defaultdict is not the correct choice.
-        self.STATIC_CONNECTIONS_BY_REGION_NAME = {region_name: set() for region_name in self.ALL_REGIONS_BY_NAME}
+        self.STATIC_CONNECTIONS_BY_REGION_NAME = {region_name: [] for region_name in self.ALL_REGIONS_BY_NAME}
 
         for source, connections in self.CONNECTIONS_WITH_DUPLICATES.items():
-            for target, requirement in connections.items():
-                combined_req = logical_or_witness_rules(requirement)
-                self.STATIC_CONNECTIONS_BY_REGION_NAME[source].add((target, combined_req))
+            # Organize rules by target region
+            traversal_options_by_target_region = defaultdict(list)
+            for target_region, traversal_option in connections:
+                traversal_options_by_target_region[target_region].append(traversal_option)
+
+            # Combine connections to the same target region into one connection
+            for target, traversal_rules in traversal_options_by_target_region.items():
+                combined_rule = logical_or_witness_rules(traversal_rules)
+                combined_connection = ConnectionDefinition(target, combined_rule)
+                self.STATIC_CONNECTIONS_BY_REGION_NAME[source].append(combined_connection)
 
 
 # Item data parsed from WitnessItems.txt
diff --git a/worlds/witness/data/utils.py b/worlds/witness/data/utils.py
index aca4573806..2de2e5c919 100644
--- a/worlds/witness/data/utils.py
+++ b/worlds/witness/data/utils.py
@@ -2,17 +2,12 @@ from datetime import date
 from math import floor
 from pkgutil import get_data
 from random import Random
-from typing import Any, Collection, Dict, FrozenSet, Iterable, List, Optional, Set, Tuple, TypeVar
+from typing import Collection, FrozenSet, Iterable, List, Optional, Set, Tuple, TypeVar
+
+from .definition_classes import AreaDefinition, ConnectionDefinition, RegionDefinition, WitnessRule
 
 T = TypeVar("T")
 
-# A WitnessRule is just an or-chain of and-conditions.
-# It represents the set of all options that could fulfill this requirement.
-# E.g. if something requires "Dots or (Shapers and Stars)", it'd be represented as: {{"Dots"}, {"Shapers, "Stars"}}
-# {} is an unusable requirement.
-# {{}} is an always usable requirement.
-WitnessRule = FrozenSet[FrozenSet[str]]
-
 
 def cast_not_none(value: Optional[T]) -> T:
     assert value is not None
@@ -62,7 +57,7 @@ def build_weighted_int_list(inputs: Collection[float], total: int) -> List[int]:
     return rounded_output
 
 
-def define_new_region(region_string: str, area: dict[str, Any]) -> Tuple[Dict[str, Any], Set[Tuple[str, WitnessRule]]]:
+def define_new_region(region_string: str, area: AreaDefinition) -> Tuple[RegionDefinition, List[ConnectionDefinition]]:
     """
     Returns a region object by parsing a line in the logic file
     """
@@ -77,35 +72,28 @@ def define_new_region(region_string: str, area: dict[str, Any]) -> Tuple[Dict[st
     region_name = region_name_split[0]
     region_name_simple = region_name_split[1][:-1]
 
-    options = set()
+    options = []
 
     for _ in range(len(line_split) // 2):
         connected_region = line_split.pop(0)
-        corresponding_lambda = line_split.pop(0)
+        traversal_rule_string = line_split.pop(0)
 
-        options.add(
-            (connected_region, parse_lambda(corresponding_lambda))
-        )
+        options.append(ConnectionDefinition(connected_region, parse_witness_rule(traversal_rule_string)))
+
+    region_obj = RegionDefinition(region_name, region_name_simple, area)
 
-    region_obj = {
-        "name": region_name,
-        "shortName": region_name_simple,
-        "entities": [],
-        "physical_entities": [],
-        "area": area,
-    }
     return region_obj, options
 
 
-def parse_lambda(lambda_string: str) -> WitnessRule:
+def parse_witness_rule(rule_string: str) -> WitnessRule:
     """
-    Turns a lambda String literal like this: a | b & c
-    into a set of sets like this: {{a}, {b, c}}
-    The lambda has to be in DNF.
+    Turns a rule string literal like this: a | b & c
+    into a set of sets (called "WitnessRule") like this: {{a}, {b, c}}
+    The rule string has to be in DNF.
     """
-    if lambda_string == "True":
+    if rule_string == "True":
         return frozenset([frozenset()])
-    split_ands = set(lambda_string.split(" | "))
+    split_ands = set(rule_string.split(" | "))
     return frozenset({frozenset(a.split(" & ")) for a in split_ands})
 
 
@@ -274,6 +262,10 @@ def is_easter_time() -> bool:
     # Thus, we just take a range from the earliest to latest possible easter dates.
 
     today = date.today()
+
+    if today < date(2025, 3, 31): # Don't go live early if 0.6.0 RC3 happens, with a little leeway
+        return False
+
     earliest_easter_day = date(today.year, 3, 20)  # Earliest possible is 3/22 + 2 day buffer for Good Friday
     last_easter_day = date(today.year, 4, 26)  # Latest possible is 4/25 + 1 day buffer for Easter Monday
 
diff --git a/worlds/witness/entity_hunt.py b/worlds/witness/entity_hunt.py
index 9549246ce4..de2f7dd68d 100644
--- a/worlds/witness/entity_hunt.py
+++ b/worlds/witness/entity_hunt.py
@@ -129,7 +129,7 @@ class EntityHuntPicker:
 
         eligible_panels_by_area = defaultdict(set)
         for eligible_panel in all_eligible_panels:
-            associated_area = static_witness_logic.ENTITIES_BY_HEX[eligible_panel]["area"]["name"]
+            associated_area = static_witness_logic.ENTITIES_BY_HEX[eligible_panel]["area"].name
             eligible_panels_by_area[associated_area].add(eligible_panel)
 
         return all_eligible_panels, eligible_panels_by_area
diff --git a/worlds/witness/generate_data_file.py b/worlds/witness/generate_data_file.py
index cc05015cd8..679aa80b28 100644
--- a/worlds/witness/generate_data_file.py
+++ b/worlds/witness/generate_data_file.py
@@ -18,7 +18,7 @@ if __name__ == "__main__":
         for entity_id, entity_object in static_witness_logic.ENTITIES_BY_HEX.items():
             location_id = entity_object["id"]
 
-            area = entity_object["area"]["name"]
+            area = entity_object["area"].name
             area_to_entity_ids[area].append(entity_id)
 
             if location_id is None:
diff --git a/worlds/witness/hints.py b/worlds/witness/hints.py
index 6f274f5e2c..c82024cc12 100644
--- a/worlds/witness/hints.py
+++ b/worlds/witness/hints.py
@@ -464,7 +464,7 @@ def choose_areas(world: "WitnessWorld", amount: int, locations_per_area: Dict[st
 
 
 def get_hintable_areas(world: "WitnessWorld") -> Tuple[Dict[str, List[Location]], Dict[str, List[Item]]]:
-    potential_areas = list(static_witness_logic.ALL_AREAS_BY_NAME.keys())
+    potential_areas = list(static_witness_logic.ALL_AREAS_BY_NAME.values())
 
     locations_per_area = {}
     items_per_area = {}
@@ -472,14 +472,14 @@ def get_hintable_areas(world: "WitnessWorld") -> Tuple[Dict[str, List[Location]]
     for area in potential_areas:
         regions = [
             world.get_region(region)
-            for region in static_witness_logic.ALL_AREAS_BY_NAME[area]["regions"]
+            for region in area.regions
             if region in world.player_regions.created_region_names
         ]
         locations = [location for region in regions for location in region.get_locations() if not location.is_event]
 
         if locations:
-            locations_per_area[area] = locations
-            items_per_area[area] = [location.item for location in locations]
+            locations_per_area[area.name] = locations
+            items_per_area[area.name] = [location.item for location in locations]
 
     return locations_per_area, items_per_area
 
@@ -516,7 +516,7 @@ def word_area_hint(world: "WitnessWorld", hinted_area: str, area_items: List[Ite
     hunt_panels = None
     if world.options.victory_condition == "panel_hunt" and hinted_area != "Easter Eggs":
         hunt_panels = sum(
-            static_witness_logic.ENTITIES_BY_HEX[hunt_entity]["area"]["name"] == hinted_area
+            static_witness_logic.ENTITIES_BY_HEX[hunt_entity]["area"].name == hinted_area
             for hunt_entity in world.player_logic.HUNT_ENTITIES
         )
 
@@ -620,7 +620,7 @@ def create_all_hints(world: "WitnessWorld", hint_amount: int, area_hints: int,
 
     already_hinted_locations |= {
         loc for loc in world.multiworld.get_reachable_locations(state, world.player)
-        if loc.address and static_witness_logic.ENTITIES_BY_NAME[loc.name]["area"]["name"] == "Tutorial (Inside)"
+        if loc.address and static_witness_logic.ENTITIES_BY_NAME[loc.name]["area"].name == "Tutorial (Inside)"
     }
 
     intended_location_hints = hint_amount - area_hints
diff --git a/worlds/witness/options.py b/worlds/witness/options.py
index c56209b226..1c2bc9324f 100644
--- a/worlds/witness/options.py
+++ b/worlds/witness/options.py
@@ -1,5 +1,4 @@
 from dataclasses import dataclass
-from datetime import datetime
 from typing import Tuple
 
 from schema import And, Schema
diff --git a/worlds/witness/player_logic.py b/worlds/witness/player_logic.py
index 1276d55dce..52bddde17e 100644
--- a/worlds/witness/player_logic.py
+++ b/worlds/witness/player_logic.py
@@ -20,10 +20,10 @@ from collections import defaultdict
 from typing import TYPE_CHECKING, Dict, List, Set, Tuple, cast
 
 from .data import static_logic as static_witness_logic
+from .data.definition_classes import ConnectionDefinition, WitnessRule
 from .data.item_definition_classes import DoorItemDefinition, ItemCategory, ProgressiveItemDefinition
 from .data.static_logic import StaticWitnessLogicObj
 from .data.utils import (
-    WitnessRule,
     get_boat,
     get_caves_except_path_to_challenge_exclusion_list,
     get_complex_additional_panels,
@@ -47,7 +47,7 @@ from .data.utils import (
     get_vault_exclusion_list,
     logical_and_witness_rules,
     logical_or_witness_rules,
-    parse_lambda,
+    parse_witness_rule,
 )
 from .entity_hunt import EntityHuntPicker
 
@@ -97,10 +97,10 @@ class WitnessPlayerLogic:
         elif self.DIFFICULTY == "none":
             self.REFERENCE_LOGIC = static_witness_logic.vanilla
 
-        self.CONNECTIONS_BY_REGION_NAME_THEORETICAL: Dict[str, Set[Tuple[str, WitnessRule]]] = copy.deepcopy(
+        self.CONNECTIONS_BY_REGION_NAME_THEORETICAL: Dict[str, List[ConnectionDefinition]] = copy.deepcopy(
             self.REFERENCE_LOGIC.STATIC_CONNECTIONS_BY_REGION_NAME
         )
-        self.CONNECTIONS_BY_REGION_NAME: Dict[str, Set[Tuple[str, WitnessRule]]] = copy.deepcopy(
+        self.CONNECTIONS_BY_REGION_NAME: Dict[str, List[ConnectionDefinition]] = copy.deepcopy(
             self.REFERENCE_LOGIC.STATIC_CONNECTIONS_BY_REGION_NAME
         )
         self.DEPENDENT_REQUIREMENTS_BY_HEX: Dict[str, Dict[str, WitnessRule]] = copy.deepcopy(
@@ -178,7 +178,7 @@ class WitnessPlayerLogic:
 
         entity_obj = self.REFERENCE_LOGIC.ENTITIES_BY_HEX[entity_hex]
 
-        if entity_obj["region"] is not None and entity_obj["region"]["name"] in self.UNREACHABLE_REGIONS:
+        if entity_obj["region"] is not None and entity_obj["region"].name in self.UNREACHABLE_REGIONS:
             return frozenset()
 
         # For the requirement of an entity, we consider two things:
@@ -270,7 +270,7 @@ class WitnessPlayerLogic:
                         new_items = theoretical_new_items
                         if dep_obj["region"] and entity_obj["region"] != dep_obj["region"]:
                             new_items = frozenset(
-                                frozenset(possibility | {dep_obj["region"]["name"]})
+                                frozenset(possibility | {dep_obj["region"].name})
                                 for possibility in new_items
                             )
 
@@ -359,11 +359,11 @@ class WitnessPlayerLogic:
             line_split = line.split(" - ")
 
             requirement = {
-                "entities": parse_lambda(line_split[1]),
+                "entities": parse_witness_rule(line_split[1]),
             }
 
             if len(line_split) > 2:
-                required_items = parse_lambda(line_split[2])
+                required_items = parse_witness_rule(line_split[2])
                 items_actually_in_the_game = [
                     item_name for item_name, item_definition in static_witness_logic.ALL_ITEMS.items()
                     if item_definition.category is ItemCategory.SYMBOL
@@ -394,26 +394,31 @@ class WitnessPlayerLogic:
             return
 
         if adj_type == "New Connections":
+            # This adjustment type does not actually reverse the connection if it could be reversed.
+            # If needed, this might be added later
             line_split = line.split(" - ")
             source_region = line_split[0]
             target_region = line_split[1]
             panel_set_string = line_split[2]
 
             for connection in self.CONNECTIONS_BY_REGION_NAME_THEORETICAL[source_region]:
-                if connection[0] == target_region:
+                if connection.target_region == target_region:
                     self.CONNECTIONS_BY_REGION_NAME_THEORETICAL[source_region].remove(connection)
 
                     if panel_set_string == "TrueOneWay":
-                        self.CONNECTIONS_BY_REGION_NAME_THEORETICAL[source_region].add(
-                            (target_region, frozenset({frozenset(["TrueOneWay"])}))
-                        )
+                        # This means the connection can be completely replaced
+                        only_connection = ConnectionDefinition(target_region, frozenset({frozenset(["TrueOneWay"])}))
+                        self.CONNECTIONS_BY_REGION_NAME_THEORETICAL[source_region].append(only_connection)
                     else:
-                        new_lambda = logical_or_witness_rules([connection[1], parse_lambda(panel_set_string)])
-                        self.CONNECTIONS_BY_REGION_NAME_THEORETICAL[source_region].add((target_region, new_lambda))
+                        combined_rule = logical_or_witness_rules(
+                            [connection.traversal_rule, parse_witness_rule(panel_set_string)]
+                        )
+                        combined_connection = ConnectionDefinition(target_region, combined_rule)
+                        self.CONNECTIONS_BY_REGION_NAME_THEORETICAL[source_region].append(combined_connection)
                     break
             else:
-                new_conn = (target_region, parse_lambda(panel_set_string))
-                self.CONNECTIONS_BY_REGION_NAME_THEORETICAL[source_region].add(new_conn)
+                new_connection = ConnectionDefinition(target_region, parse_witness_rule(panel_set_string))
+                self.CONNECTIONS_BY_REGION_NAME_THEORETICAL[source_region].append(new_connection)
 
         if adj_type == "Added Locations":
             if "0x" in line:
@@ -558,7 +563,7 @@ class WitnessPlayerLogic:
 
         self.AVAILABLE_EASTER_EGGS_PER_REGION = defaultdict(int)
         for entity_hex in self.AVAILABLE_EASTER_EGGS:
-            region_name = static_witness_logic.ENTITIES_BY_HEX[entity_hex]["region"]["name"]
+            region_name = static_witness_logic.ENTITIES_BY_HEX[entity_hex]["region"].name
             self.AVAILABLE_EASTER_EGGS_PER_REGION[region_name] += 1
 
         eggs_per_check, logically_required_eggs_per_check = world.options.easter_egg_hunt.get_step_and_logical_step()
@@ -796,7 +801,7 @@ class WitnessPlayerLogic:
                 next_region = regions_to_check.pop()
 
                 for region_exit in self.CONNECTIONS_BY_REGION_NAME[next_region]:
-                    target = region_exit[0]
+                    target = region_exit.target_region
 
                     if target in reachable_regions:
                         continue
@@ -844,7 +849,7 @@ class WitnessPlayerLogic:
 
             # First, entities in unreachable regions are obviously themselves unreachable.
             for region in new_unreachable_regions:
-                for entity in static_witness_logic.ALL_REGIONS_BY_NAME[region]["physical_entities"]:
+                for entity in static_witness_logic.ALL_REGIONS_BY_NAME[region].physical_entities:
                     # Never disable the Victory Location.
                     if entity == self.VICTORY_LOCATION:
                         continue
@@ -879,11 +884,11 @@ class WitnessPlayerLogic:
             if not new_unreachable_regions and not newly_discovered_disabled_entities:
                 return
 
-    def reduce_connection_requirement(self, connection: Tuple[str, WitnessRule]) -> WitnessRule:
+    def reduce_connection_requirement(self, connection: ConnectionDefinition) -> ConnectionDefinition:
         all_possibilities = []
 
         # Check each traversal option individually
-        for option in connection[1]:
+        for option in connection.traversal_rule:
             individual_entity_requirements: List[WitnessRule] = []
             for entity in option:
                 # If a connection requires solving a disabled entity, it is not valid.
@@ -901,7 +906,7 @@ class WitnessPlayerLogic:
                     entity_req = self.get_entity_requirement(entity)
 
                     if self.REFERENCE_LOGIC.ENTITIES_BY_HEX[entity]["region"]:
-                        region_name = self.REFERENCE_LOGIC.ENTITIES_BY_HEX[entity]["region"]["name"]
+                        region_name = self.REFERENCE_LOGIC.ENTITIES_BY_HEX[entity]["region"].name
                         entity_req = logical_and_witness_rules([entity_req, frozenset({frozenset({region_name})})])
 
                     individual_entity_requirements.append(entity_req)
@@ -909,7 +914,7 @@ class WitnessPlayerLogic:
             # Merge all possible requirements into one DNF condition.
             all_possibilities.append(logical_and_witness_rules(individual_entity_requirements))
 
-        return logical_or_witness_rules(all_possibilities)
+        return ConnectionDefinition(connection.target_region, logical_or_witness_rules(all_possibilities))
 
     def make_dependency_reduced_checklist(self) -> None:
         """
@@ -942,14 +947,14 @@ class WitnessPlayerLogic:
 
         # Make independent region connection requirements based on the entities they require
         for region, connections in self.CONNECTIONS_BY_REGION_NAME_THEORETICAL.items():
-            new_connections = set()
+            new_connections = []
 
             for connection in connections:
-                overall_requirement = self.reduce_connection_requirement(connection)
+                reduced_connection = self.reduce_connection_requirement(connection)
 
                 # If there is a way to use this connection, add it.
-                if overall_requirement:
-                    new_connections.add((connection[0], overall_requirement))
+                if reduced_connection.can_be_traversed:
+                    new_connections.append(reduced_connection)
 
             self.CONNECTIONS_BY_REGION_NAME[region] = new_connections
 
diff --git a/worlds/witness/regions.py b/worlds/witness/regions.py
index 8cb3678ab6..c057134adb 100644
--- a/worlds/witness/regions.py
+++ b/worlds/witness/regions.py
@@ -10,8 +10,9 @@ from BaseClasses import Entrance, Region
 from worlds.generic.Rules import CollectionRule
 
 from .data import static_logic as static_witness_logic
+from .data.definition_classes import WitnessRule
 from .data.static_logic import StaticWitnessLogicObj
-from .data.utils import WitnessRule, optimize_witness_rule
+from .data.utils import optimize_witness_rule
 from .locations import WitnessPlayerLocations
 from .player_logic import WitnessPlayerLogic
 
@@ -114,7 +115,7 @@ class WitnessPlayerRegions:
             if k not in player_logic.UNREACHABLE_REGIONS
         }
 
-        event_locations_per_region = defaultdict(dict)
+        event_locations_per_region: Dict[str, Dict[str, int]] = defaultdict(dict)
 
         for event_location, event_item_and_entity in player_logic.EVENT_ITEM_PAIRS.items():
             entity_or_region = event_item_and_entity[1]
@@ -126,13 +127,13 @@ class WitnessPlayerRegions:
                 if region is None:
                     region_name = "Entry"
                 else:
-                    region_name = region["name"]
+                    region_name = region.name
                 order = self.reference_logic.ENTITIES_BY_HEX[entity_or_region]["order"]
             event_locations_per_region[region_name][event_location] = order
 
         for region_name, region in regions_to_create.items():
             location_entities_for_this_region = [
-                self.reference_logic.ENTITIES_BY_HEX[entity] for entity in region["entities"]
+                self.reference_logic.ENTITIES_BY_HEX[entity] for entity in region.logical_entities
             ]
             locations_for_this_region = {
                 entity["checkName"]: entity["order"] for entity in location_entities_for_this_region
diff --git a/worlds/witness/rules.py b/worlds/witness/rules.py
index 866f4690f5..545c3e7dd0 100644
--- a/worlds/witness/rules.py
+++ b/worlds/witness/rules.py
@@ -10,7 +10,7 @@ from BaseClasses import CollectionState
 from worlds.generic.Rules import CollectionRule, set_rule
 
 from .data import static_logic as static_witness_logic
-from .data.utils import WitnessRule
+from .data.definition_classes import WitnessRule
 from .player_logic import WitnessPlayerLogic
 
 if TYPE_CHECKING:
diff --git a/worlds/zillion/client.py b/worlds/zillion/client.py
index d629df583a..71f0615d32 100644
--- a/worlds/zillion/client.py
+++ b/worlds/zillion/client.py
@@ -516,6 +516,6 @@ async def main() -> None:
 
 
 def launch() -> None:
-    colorama.init()
+    colorama.just_fix_windows_console()
     asyncio.run(main())
     colorama.deinit()
diff --git a/worlds/zork_grand_inquisitor/client.py b/worlds/zork_grand_inquisitor/client.py
index 11d6b7f8f1..8b8d7d3ebf 100644
--- a/worlds/zork_grand_inquisitor/client.py
+++ b/worlds/zork_grand_inquisitor/client.py
@@ -177,7 +177,7 @@ def main() -> None:
 
     import colorama
 
-    colorama.init()
+    colorama.just_fix_windows_console()
 
     asyncio.run(_main())